You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by bu...@apache.org on 2014/07/05 17:26:03 UTC

svn commit: r915100 - in /websites/staging/jena/trunk/content: ./ documentation/notes/ documentation/query/ documentation/sdb/ documentation/tdb/

Author: buildbot
Date: Sat Jul  5 15:26:02 2014
New Revision: 915100

Log:
Staging update by buildbot for jena

Modified:
    websites/staging/jena/trunk/content/   (props changed)
    websites/staging/jena/trunk/content/documentation/notes/concurrency-howto.html
    websites/staging/jena/trunk/content/documentation/query/app_api.html
    websites/staging/jena/trunk/content/documentation/query/explain.html
    websites/staging/jena/trunk/content/documentation/query/extension.html
    websites/staging/jena/trunk/content/documentation/query/http-auth.html
    websites/staging/jena/trunk/content/documentation/query/logging.html
    websites/staging/jena/trunk/content/documentation/sdb/javaapi.html
    websites/staging/jena/trunk/content/documentation/tdb/configuration.html
    websites/staging/jena/trunk/content/documentation/tdb/datasets.html
    websites/staging/jena/trunk/content/documentation/tdb/optimizer.html
    websites/staging/jena/trunk/content/documentation/tdb/quadfilter.html
    websites/staging/jena/trunk/content/documentation/tdb/tdb_transactions.html

Propchange: websites/staging/jena/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jul  5 15:26:02 2014
@@ -1 +1 @@
-1608029
+1608034

Modified: websites/staging/jena/trunk/content/documentation/notes/concurrency-howto.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/notes/concurrency-howto.html (original)
+++ websites/staging/jena/trunk/content/documentation/notes/concurrency-howto.html Sat Jul  5 15:26:02 2014
@@ -214,15 +214,14 @@ with a read lock.</p>
   <span class="n">Query</span> <span class="n">query</span> <span class="p">=</span> <span class="n">QueryFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">queryString</span><span class="p">)</span> <span class="p">;</span>
   <span class="n">model</span><span class="p">.</span><span class="n">enterCriticalSection</span><span class="p">(</span><span class="n">Lock</span><span class="p">.</span><span class="n">READ</span><span class="p">)</span> <span class="p">;</span>
   <span class="k">try</span> <span class="p">{</span>
-    <span class="n">QueryExecution</span> <span class="n">qexec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">query</span><span class="p">,</span> <span class="n">model</span><span class="p">)</span> <span class="p">;</span>
-    <span class="n">ResultSet</span> <span class="n">results</span> <span class="p">=</span> <span class="n">qexec</span><span class="p">.</span><span class="n">execSelect</span><span class="p">()</span> <span class="p">;</span>
-   <span class="k">try</span> <span class="p">{</span>
-      <span class="k">for</span> <span class="p">(</span> <span class="p">;</span> <span class="n">results</span><span class="p">.</span><span class="n">hasNext</span><span class="p">()</span> <span class="p">;</span> <span class="p">)</span>
-      <span class="p">{</span>
-          <span class="n">QuerySolution</span> <span class="n">soln</span> <span class="p">=</span> <span class="n">results</span><span class="p">.</span><span class="n">nextSolution</span><span class="p">()</span> <span class="p">;</span>
-          <span class="n">RDFNode</span> <span class="n">x</span> <span class="p">=</span> <span class="n">soln</span><span class="p">.</span><span class="n">get</span><span class="p">(</span>&quot;<span class="p">..</span><span class="n">var</span> <span class="n">name</span><span class="p">..</span>&quot;<span class="p">)</span> <span class="p">;</span>
-      <span class="p">}</span>
-    <span class="p">}</span> <span class="n">finally</span> <span class="p">{</span> <span class="n">qexec</span><span class="p">.</span><span class="n">close</span><span class="p">()</span> <span class="p">;</span> <span class="p">}</span>
+    <span class="k">try</span><span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qexec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">query</span><span class="p">,</span> <span class="n">model</span><span class="p">))</span> <span class="p">{</span>
+        <span class="n">ResultSet</span> <span class="n">results</span> <span class="p">=</span> <span class="n">qexec</span><span class="p">.</span><span class="n">execSelect</span><span class="p">()</span> <span class="p">;</span>
+        <span class="k">for</span> <span class="p">(</span> <span class="p">;</span> <span class="n">results</span><span class="p">.</span><span class="n">hasNext</span><span class="p">()</span> <span class="p">;</span> <span class="p">)</span>
+        <span class="p">{</span>
+            <span class="n">QuerySolution</span> <span class="n">soln</span> <span class="p">=</span> <span class="n">results</span><span class="p">.</span><span class="n">nextSolution</span><span class="p">()</span> <span class="p">;</span>
+            <span class="n">RDFNode</span> <span class="n">x</span> <span class="p">=</span> <span class="n">soln</span><span class="p">.</span><span class="n">get</span><span class="p">(</span>&quot;<span class="p">..</span><span class="n">var</span> <span class="n">name</span><span class="p">..</span>&quot;<span class="p">)</span> <span class="p">;</span>
+        <span class="p">}</span>
+    <span class="p">}</span>
   <span class="p">}</span> <span class="n">finally</span> <span class="p">{</span> <span class="n">model</span><span class="p">.</span><span class="n">leaveCriticalSection</span><span class="p">()</span> <span class="p">;</span> <span class="p">}</span>
 </pre></div>
 

Modified: websites/staging/jena/trunk/content/documentation/query/app_api.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/query/app_api.html (original)
+++ websites/staging/jena/trunk/content/documentation/query/app_api.html Sat Jul  5 15:26:02 2014
@@ -183,7 +183,7 @@ query execution is closed.</p>
   <span class="n">Model</span> <span class="n">model</span> <span class="p">=</span> <span class="p">...</span> <span class="p">;</span>
   <span class="n">String</span> <span class="n">queryString</span> <span class="p">=</span> &quot; <span class="p">....</span> &quot; <span class="p">;</span>
   <span class="n">Query</span> <span class="n">query</span> <span class="p">=</span> <span class="n">QueryFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">queryString</span><span class="p">)</span> <span class="p">;</span>
-  <span class="k">try</span> <span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qexec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">query</span><span class="p">,</span> <span class="n">model</span><span class="p">)</span> <span class="p">)</span>
+  <span class="k">try</span> <span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qexec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">query</span><span class="p">,</span> <span class="n">model</span><span class="p">))</span>
     <span class="n">ResultSet</span> <span class="n">results</span> <span class="p">=</span> <span class="n">qexec</span><span class="p">.</span><span class="n">execSelect</span><span class="p">()</span> <span class="p">;</span>
     <span class="k">for</span> <span class="p">(</span> <span class="p">;</span> <span class="n">results</span><span class="p">.</span><span class="n">hasNext</span><span class="p">()</span> <span class="p">;</span> <span class="p">)</span>
     <span class="p">{</span>
@@ -331,9 +331,9 @@ more named graphs. Datasets can be const
 <span class="n">Query</span> <span class="n">query</span> <span class="p">=</span> <span class="n">QueryFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">queryString</span><span class="p">)</span> <span class="p">;</span>
 
 <span class="n">Dataset</span> <span class="n">dataset</span> <span class="p">=</span> <span class="n">DatasetFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">dftGraphURI</span><span class="p">,</span> <span class="n">namedGraphURIs</span><span class="p">)</span> <span class="p">;</span>
-<span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">query</span><span class="p">,</span> <span class="n">dataset</span><span class="p">)</span> <span class="p">;</span>
-<span class="k">try</span> <span class="p">{</span> <span class="p">...</span> <span class="p">}</span>
-<span class="n">finally</span> <span class="p">{</span> <span class="n">qExec</span><span class="p">.</span><span class="n">close</span><span class="p">()</span> <span class="p">;</span> <span class="p">}</span>
+<span class="k">try</span><span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">query</span><span class="p">,</span> <span class="n">dataset</span><span class="p">))</span> <span class="p">{</span>
+    <span class="p">...</span>
+<span class="p">}</span>
 </pre></div>
 
 
@@ -342,7 +342,9 @@ more named graphs. Datasets can be const
 <span class="n">dataset</span><span class="p">.</span><span class="n">setDefaultModel</span><span class="p">(</span><span class="n">model</span><span class="p">)</span> <span class="p">;</span>
 <span class="n">dataset</span><span class="p">.</span><span class="n">addNamedModel</span><span class="p">(</span>&quot;<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">example</span><span class="o">/</span><span class="n">named</span><span class="o">-</span>1&quot;<span class="p">,</span> <span class="n">modelX</span><span class="p">)</span> <span class="p">;</span>
 <span class="n">dataset</span><span class="p">.</span><span class="n">addNamedModel</span><span class="p">(</span>&quot;<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">example</span><span class="o">/</span><span class="n">named</span><span class="o">-</span>2&quot;<span class="p">,</span> <span class="n">modelY</span><span class="p">)</span> <span class="p">;</span>
-<span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">query</span><span class="p">,</span> <span class="n">dataset</span><span class="p">)</span> <span class="p">;</span>
+ <span class="k">try</span><span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">query</span><span class="p">,</span> <span class="n">dataset</span><span class="p">))</span> <span class="p">{</span>
+    <span class="p">...</span>
+<span class="p">}</span>
 </pre></div>
 
 

Modified: websites/staging/jena/trunk/content/documentation/query/explain.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/query/explain.html (original)
+++ websites/staging/jena/trunk/content/documentation/query/explain.html Sat Jul  5 15:26:02 2014
@@ -234,8 +234,11 @@ globally:</p>
 
 <p>and it may also be set on an individual query execution using it's local
 context.</p>
-<div class="codehilite"><pre> <span class="n">QueryExecutiuon</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(...)</span> <span class="p">;</span>
- <span class="n">qExec</span><span class="p">.</span><span class="n">getContext</span><span class="p">().</span><span class="n">set</span><span class="p">(</span><span class="n">ARQ</span><span class="p">.</span><span class="n">symLogExec</span><span class="p">,</span> <span class="n">Explain</span><span class="p">.</span><span class="n">InfoLevel</span><span class="p">.</span><span class="n">ALL</span><span class="p">)</span> <span class="p">;</span>
+<div class="codehilite"><pre> <span class="k">try</span><span class="p">(</span><span class="n">QueryExecutiuon</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(...))</span> <span class="p">{</span>
+     <span class="n">qExec</span><span class="p">.</span><span class="n">getContext</span><span class="p">().</span><span class="n">set</span><span class="p">(</span><span class="n">ARQ</span><span class="p">.</span><span class="n">symLogExec</span><span class="p">,</span> <span class="n">Explain</span><span class="p">.</span><span class="n">InfoLevel</span><span class="p">.</span><span class="n">ALL</span><span class="p">)</span> <span class="p">;</span>
+     <span class="n">ResultSet</span> <span class="n">rs</span> <span class="p">=</span> <span class="n">qExec</span><span class="p">.</span><span class="n">execSelect</span><span class="p">()</span> <span class="p">;</span>
+     <span class="p">...</span>
+ <span class="p">}</span>
 </pre></div>
 
 

Modified: websites/staging/jena/trunk/content/documentation/query/extension.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/query/extension.html (original)
+++ websites/staging/jena/trunk/content/documentation/query/extension.html Sat Jul  5 15:26:02 2014
@@ -244,7 +244,10 @@ be turned off by the Java code:</p>
 
 
 <p>or on a per instance basis:</p>
-<div class="codehilite"><pre> <span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="p">.</span> <span class="p">.</span> <span class="p">.</span> <span class="p">;</span> <span class="n">qExec</span><span class="p">.</span><span class="n">getContext</span><span class="p">().</span><span class="n">setFalse</span><span class="p">(</span><span class="n">ARQ</span><span class="p">.</span><span class="n">enablePropertyFunctions</span><span class="p">)</span> <span class="p">;</span>
+<div class="codehilite"><pre> <span class="k">try</span><span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="p">...</span> <span class="p">)</span> <span class="p">{</span>
+     <span class="n">qExec</span><span class="p">.</span><span class="n">getContext</span><span class="p">().</span><span class="n">setFalse</span><span class="p">(</span><span class="n">ARQ</span><span class="p">.</span><span class="n">enablePropertyFunctions</span><span class="p">)</span> <span class="p">;</span>
+     <span class="p">...</span>
+ <span class="p">}</span>
 </pre></div>
 
 

Modified: websites/staging/jena/trunk/content/documentation/query/http-auth.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/query/http-auth.html (original)
+++ websites/staging/jena/trunk/content/documentation/query/http-auth.html Sat Jul  5 15:26:02 2014
@@ -160,7 +160,11 @@ that allows you to configure an arbitrar
 <p>From 2.11.0 onwards the relevant factory methods include overloads that allow providing a <code>HttpAuthenticator</code> at creation time which
 avoids the needs to cast and manually set the authenticator afterwards e.g.</p>
 <div class="codehilite"><pre><span class="n">HttpAuthenticator</span> <span class="n">authenticator</span> <span class="p">=</span> <span class="n">new</span> <span class="n">SimpleAuthenticator</span><span class="p">(</span>&quot;<span class="n">user</span>&quot;<span class="p">,</span> &quot;<span class="n">password</span>&quot;<span class="p">.</span><span class="n">toCharArray</span><span class="p">());</span>
-<span class="n">QueryExecution</span> <span class="n">qe</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">sparqlService</span><span class="p">(</span>&quot;<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">example</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">sparql</span>&quot;<span class="p">,</span> &quot;<span class="n">SELECT</span> <span class="o">*</span> <span class="n">WHERE</span> <span class="p">{</span> ?<span class="n">s</span> <span class="n">a</span> ?<span class="n">type</span> <span class="p">}</span>&quot;<span class="p">,</span> <span class="n">authenticator</span><span class="p">);</span>
+<span class="k">try</span><span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qe</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">sparqlService</span><span class="p">(</span>&quot;<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">example</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">sparql</span>&quot;<span class="p">,</span>
+                                                            &quot;<span class="n">SELECT</span> <span class="o">*</span> <span class="n">WHERE</span> <span class="p">{</span> ?<span class="n">s</span> <span class="n">a</span> ?<span class="n">type</span> <span class="p">}</span>&quot;<span class="p">,</span> 
+                                                            <span class="n">authenticator</span><span class="p">))</span> <span class="p">{</span>
+    <span class="p">...</span>
+<span class="p">}</span>
 </pre></div>
 
 

Modified: websites/staging/jena/trunk/content/documentation/query/logging.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/query/logging.html (original)
+++ websites/staging/jena/trunk/content/documentation/query/logging.html Sat Jul  5 15:26:02 2014
@@ -242,8 +242,10 @@ globally:</p>
 
 <p>and it may also be set on an individual query execution using its local
 context.</p>
-<div class="codehilite"><pre> <span class="n">QueryExecutiuon</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(...)</span> <span class="p">;</span>
- <span class="n">qExec</span><span class="p">.</span><span class="n">getContext</span><span class="p">().</span><span class="n">set</span><span class="p">(</span><span class="n">ARQ</span><span class="p">.</span><span class="n">symLogExec</span><span class="p">,</span> <span class="n">Explain</span><span class="p">.</span><span class="n">InfoLevel</span><span class="p">.</span><span class="n">ALL</span><span class="p">)</span> <span class="p">;</span>
+<div class="codehilite"><pre> <span class="k">try</span><span class="p">(</span><span class="n">QueryExecutiuon</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(...))</span> <span class="p">{</span>
+    <span class="n">qExec</span><span class="p">.</span><span class="n">getContext</span><span class="p">().</span><span class="n">set</span><span class="p">(</span><span class="n">ARQ</span><span class="p">.</span><span class="n">symLogExec</span><span class="p">,</span> <span class="n">Explain</span><span class="p">.</span><span class="n">InfoLevel</span><span class="p">.</span><span class="n">ALL</span><span class="p">)</span> <span class="p">;</span>
+    <span class="p">...</span>
+ <span class="p">}</span>
 </pre></div>
 
 

Modified: websites/staging/jena/trunk/content/documentation/sdb/javaapi.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/sdb/javaapi.html (original)
+++ websites/staging/jena/trunk/content/documentation/sdb/javaapi.html Sat Jul  5 15:26:02 2014
@@ -288,11 +288,10 @@ container:</p>
         <span class="n">Store</span> <span class="n">store</span> <span class="p">=</span> <span class="n">SDBFactory</span><span class="p">.</span><span class="n">connectStore</span><span class="p">(</span><span class="n">conn</span><span class="p">,</span> <span class="n">storeDesc</span><span class="p">)</span> <span class="p">;</span>
 
         <span class="n">Dataset</span> <span class="n">ds</span> <span class="p">=</span> <span class="n">SDBFactory</span><span class="p">.</span><span class="n">connectDataset</span><span class="p">(</span><span class="n">store</span><span class="p">)</span> <span class="p">;</span>
-        <span class="n">QueryExecution</span> <span class="n">qe</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">query</span><span class="p">,</span> <span class="n">ds</span><span class="p">)</span> <span class="p">;</span>
-        <span class="k">try</span> <span class="p">{</span>
+        <span class="k">try</span><span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qe</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">query</span><span class="p">,</span> <span class="n">ds</span><span class="p">))</span> <span class="p">{</span>
             <span class="n">ResultSet</span> <span class="n">rs</span> <span class="p">=</span> <span class="n">qe</span><span class="p">.</span><span class="n">execSelect</span><span class="p">()</span> <span class="p">;</span>
             <span class="n">ResultSetFormatter</span><span class="p">.</span><span class="n">out</span><span class="p">(</span><span class="n">rs</span><span class="p">)</span> <span class="p">;</span>
-        <span class="p">}</span> <span class="n">finally</span> <span class="p">{</span> <span class="n">qe</span><span class="p">.</span><span class="n">close</span><span class="p">()</span> <span class="p">;</span> <span class="p">}</span>
+        <span class="p">}</span>
         <span class="n">store</span><span class="p">.</span><span class="n">close</span><span class="p">()</span> <span class="p">;</span>
     <span class="p">}</span>
 </pre></div>
@@ -334,11 +333,10 @@ dataset which is of the SDB class <code>
 
 <p>This is then used as normal with ARQ:</p>
 <div class="codehilite"><pre>   <span class="n">Dataset</span> <span class="n">ds</span> <span class="p">=</span> <span class="n">DatasetStore</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">store</span><span class="p">)</span> <span class="p">;</span>
-   <span class="n">QueryExecution</span> <span class="n">qe</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">query</span><span class="p">,</span> <span class="n">ds</span><span class="p">)</span> <span class="p">;</span>
-   <span class="k">try</span> <span class="p">{</span>
+   <span class="k">try</span><span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qe</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">query</span><span class="p">,</span> <span class="n">ds</span><span class="p">))</span> <span class="p">{</span>
        <span class="n">ResultSet</span> <span class="n">rs</span> <span class="p">=</span> <span class="n">qe</span><span class="p">.</span><span class="n">execSelect</span><span class="p">()</span> <span class="p">;</span>
        <span class="n">ResultSetFormatter</span><span class="p">.</span><span class="n">out</span><span class="p">(</span><span class="n">rs</span><span class="p">)</span> <span class="p">;</span>
-   <span class="p">}</span> <span class="n">finally</span> <span class="p">{</span> <span class="n">qe</span><span class="p">.</span><span class="n">close</span><span class="p">()</span> <span class="p">;</span> <span class="p">}</span>
+   <span class="p">}</span>
 </pre></div>
 
 

Modified: websites/staging/jena/trunk/content/documentation/tdb/configuration.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/tdb/configuration.html (original)
+++ websites/staging/jena/trunk/content/documentation/tdb/configuration.html Sat Jul  5 15:26:02 2014
@@ -179,8 +179,10 @@ are short for the constants of class <co
 
 
 <p>Per query execution:</p>
-<div class="codehilite"><pre> <span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(...)</span> <span class="p">;</span>
- <span class="n">qExec</span><span class="p">.</span><span class="n">getContext</span><span class="p">().</span><span class="n">set</span><span class="p">(</span><span class="n">symbol</span><span class="p">,</span> <span class="n">value</span><span class="p">)</span> <span class="p">;</span>
+<div class="codehilite"><pre> <span class="k">try</span><span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(...))</span> <span class="p">{</span>
+     <span class="n">qExec</span><span class="p">.</span><span class="n">getContext</span><span class="p">().</span><span class="n">set</span><span class="p">(</span><span class="n">symbol</span><span class="p">,</span> <span class="n">value</span><span class="p">)</span> <span class="p">;</span>
+     <span class="p">...</span>
+ <span class="p">}</span>
 </pre></div>
 
 

Modified: websites/staging/jena/trunk/content/documentation/tdb/datasets.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/tdb/datasets.html (original)
+++ websites/staging/jena/trunk/content/documentation/tdb/datasets.html Sat Jul  5 15:26:02 2014
@@ -182,8 +182,10 @@ pattern.</p>
 
 
 <p>or set on a per query basis:</p>
-<div class="codehilite"><pre><span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(...)</span> <span class="p">;</span>
-<span class="n">qExec</span><span class="p">.</span><span class="n">getContext</span><span class="p">().</span><span class="n">set</span><span class="p">(</span><span class="n">TDB</span><span class="p">.</span><span class="n">symUnionDefaultGraph</span><span class="p">,</span> <span class="n">true</span><span class="p">)</span> <span class="p">;</span>
+<div class="codehilite"><pre><span class="k">try</span><span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(...))</span> <span class="p">{</span>
+    <span class="n">qExec</span><span class="p">.</span><span class="n">getContext</span><span class="p">().</span><span class="n">set</span><span class="p">(</span><span class="n">TDB</span><span class="p">.</span><span class="n">symUnionDefaultGraph</span><span class="p">,</span> <span class="n">true</span><span class="p">)</span> <span class="p">;</span>
+    <span class="p">...</span>
+<span class="p">}</span>
 </pre></div>
 
 

Modified: websites/staging/jena/trunk/content/documentation/tdb/optimizer.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/tdb/optimizer.html (original)
+++ websites/staging/jena/trunk/content/documentation/tdb/optimizer.html Sat Jul  5 15:26:02 2014
@@ -260,8 +260,10 @@ set globally:</p>
 
 <p>and it may also be set on an individual query execution using it's
 local context.</p>
-<div class="codehilite"><pre> <span class="n">QueryExecutiuon</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(...)</span> <span class="p">;</span>
- <span class="n">qExec</span><span class="p">.</span><span class="n">getContext</span><span class="p">().</span><span class="n">set</span><span class="p">(</span><span class="n">ARQ</span><span class="p">.</span><span class="n">symLogExec</span><span class="p">,</span><span class="n">true</span><span class="p">)</span> <span class="p">;</span>
+<div class="codehilite"><pre> <span class="k">try</span><span class="p">(</span><span class="n">QueryExecutiuon</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(...))</span> <span class="p">{</span>
+    <span class="n">qExec</span><span class="p">.</span><span class="n">getContext</span><span class="p">().</span><span class="n">set</span><span class="p">(</span><span class="n">ARQ</span><span class="p">.</span><span class="n">symLogExec</span><span class="p">,</span><span class="n">true</span><span class="p">)</span> <span class="p">;</span>
+    <span class="n">ResultSet</span> <span class="n">rs</span> <span class="p">=</span> <span class="n">qExec</span><span class="p">.</span><span class="n">execSelect</span><span class="p">()</span> <span class="p">;</span>
+ <span class="p">}</span>
 </pre></div>
 
 

Modified: websites/staging/jena/trunk/content/documentation/tdb/quadfilter.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/tdb/quadfilter.html (original)
+++ websites/staging/jena/trunk/content/documentation/tdb/quadfilter.html Sat Jul  5 15:26:02 2014
@@ -202,16 +202,16 @@ a immutable tuples of values of the same
 
 
 <p>To install a filter, put it in the context of a query execution
-under the symbol <code>SystemTDB.symTupleFilter</code></p>
+under the symbol <code>SystemTDB.symTupleFilter</code> then execute the query as normal.</p>
 <div class="codehilite"><pre>    <span class="n">Dataset</span> <span class="n">ds</span> <span class="p">=</span> <span class="p">...</span> <span class="p">;</span>
     <span class="n">Filter</span><span class="o">&lt;</span><span class="n">Tuple</span><span class="o">&lt;</span><span class="n">NodeId</span><span class="o">&gt;&gt;</span> <span class="n">filter</span> <span class="p">=</span> <span class="n">createFilter</span><span class="p">(</span><span class="n">ds</span><span class="p">)</span> <span class="p">;</span>
     <span class="n">Query</span> <span class="n">query</span> <span class="p">=</span> <span class="p">...</span> <span class="p">;</span>
-    <span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">query</span><span class="p">,</span> <span class="n">ds</span><span class="p">)</span> <span class="p">;</span>
-    <span class="n">qExec</span><span class="p">.</span><span class="n">getContext</span><span class="p">().</span><span class="n">set</span><span class="p">(</span><span class="n">SystemTDB</span><span class="p">.</span><span class="n">symTupleFilter</span><span class="p">,</span> <span class="n">filter</span><span class="p">)</span> <span class="p">;</span>
+    <span class="k">try</span> <span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">query</span><span class="p">,</span> <span class="n">ds</span><span class="p">))</span> <span class="p">{</span>
+        <span class="n">qExec</span><span class="p">.</span><span class="n">getContext</span><span class="p">().</span><span class="n">set</span><span class="p">(</span><span class="n">SystemTDB</span><span class="p">.</span><span class="n">symTupleFilter</span><span class="p">,</span> <span class="n">filter</span><span class="p">)</span> <span class="p">;</span>
+        <span class="n">ResultSet</span> <span class="n">rs</span> <span class="p">=</span> <span class="n">qExec</span><span class="p">.</span><span class="n">execSelect</span><span class="p">()</span> <span class="p">;</span>
+        <span class="p">...</span>
+    <span class="p">}</span>
 </pre></div>
-
-
-<p>then execute the query as normal.</p>
   </div>
 </div>
 

Modified: websites/staging/jena/trunk/content/documentation/tdb/tdb_transactions.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/tdb/tdb_transactions.html (original)
+++ websites/staging/jena/trunk/content/documentation/tdb/tdb_transactions.html Sat Jul  5 15:26:02 2014
@@ -227,21 +227,18 @@ actions that do not change the data.  Th
 <div class="codehilite"><pre> <span class="n">Location</span> <span class="n">location</span> <span class="p">=</span> <span class="p">...</span> <span class="p">;</span>
  <span class="n">Dataset</span> <span class="n">dataset</span> <span class="p">=</span> <span class="p">...</span> <span class="p">;</span>
  <span class="n">dataset</span><span class="p">.</span><span class="n">begin</span><span class="p">(</span><span class="n">ReadWrite</span><span class="p">.</span><span class="n">READ</span><span class="p">)</span> <span class="p">;</span>
+ <span class="n">String</span> <span class="n">qs1</span> <span class="p">=</span> &quot;<span class="n">SELECT</span> <span class="o">*</span> <span class="p">{</span>?<span class="n">s</span> ?<span class="n">p</span> ?<span class="n">o</span><span class="p">}</span> <span class="n">LIMIT</span> 10&quot; <span class="p">;</span>
 
- <span class="k">try</span> <span class="p">{</span>
-     <span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span>&quot;<span class="n">SELECT</span> <span class="o">*</span> <span class="p">{</span>?<span class="n">s</span> ?<span class="n">p</span> ?<span class="n">o</span><span class="p">}</span> <span class="n">LIMIT</span> 10&quot;<span class="p">,</span> <span class="n">dataset</span><span class="p">)</span> <span class="p">;</span>
+ <span class="k">try</span><span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">qs1</span><span class="p">,</span> <span class="n">dataset</span><span class="p">))</span> <span class="p">{</span>
      <span class="n">ResultSet</span> <span class="n">rs</span> <span class="p">=</span> <span class="n">qExec</span><span class="p">.</span><span class="n">execSelect</span><span class="p">()</span> <span class="p">;</span>
-     <span class="k">try</span> <span class="p">{</span>
-         <span class="n">ResultSetFormatter</span><span class="p">.</span><span class="n">out</span><span class="p">(</span><span class="n">rs</span><span class="p">)</span> <span class="p">;</span>
-     <span class="p">}</span> <span class="n">finally</span> <span class="p">{</span> <span class="n">qExec</span><span class="p">.</span><span class="n">close</span><span class="p">()</span> <span class="p">;</span> <span class="p">}</span>
+     <span class="n">ResultSetFormatter</span><span class="p">.</span><span class="n">out</span><span class="p">(</span><span class="n">rs</span><span class="p">)</span> <span class="p">;</span>
+ <span class="p">}</span>
 
-     <span class="o">//</span> <span class="n">Another</span> <span class="n">query</span> <span class="o">-</span> <span class="n">same</span> <span class="n">view</span> <span class="n">of</span> <span class="n">the</span> <span class="n">data</span><span class="p">.</span>
-     <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span>&quot;<span class="n">SELECT</span> <span class="o">*</span> <span class="p">{</span>?<span class="n">s</span> ?<span class="n">p</span> ?<span class="n">o</span><span class="p">}</span> <span class="n">OFFSET</span> 10 <span class="n">LIMIT</span> 10&quot;<span class="p">,</span> <span class="n">dataset</span><span class="p">)</span> <span class="p">;</span>
+ <span class="n">String</span> <span class="n">qs2</span> <span class="p">=</span> &quot;<span class="n">SELECT</span> <span class="o">*</span> <span class="p">{</span>?<span class="n">s</span> ?<span class="n">p</span> ?<span class="n">o</span><span class="p">}</span> <span class="n">OFFSET</span> 10 <span class="n">LIMIT</span> 10&quot; <span class="p">;</span>  
+ <span class="k">try</span><span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">qs2</span><span class="p">,</span> <span class="n">dataset</span><span class="p">))</span> <span class="p">{</span>
      <span class="n">rs</span> <span class="p">=</span> <span class="n">qExec</span><span class="p">.</span><span class="n">execSelect</span><span class="p">()</span> <span class="p">;</span>
-     <span class="k">try</span> <span class="p">{</span>
-         <span class="n">ResultSetFormatter</span><span class="p">.</span><span class="n">out</span><span class="p">(</span><span class="n">rs</span><span class="p">)</span> <span class="p">;</span>
-     <span class="p">}</span> <span class="n">finally</span> <span class="p">{</span> <span class="n">qExec</span><span class="p">.</span><span class="n">close</span><span class="p">()</span> <span class="p">;</span> <span class="p">}</span>
- <span class="p">}</span> <span class="n">finally</span> <span class="p">{</span> <span class="n">dataset</span><span class="p">.</span><span class="k">end</span><span class="p">()</span> <span class="p">;</span> <span class="p">}</span>
+     <span class="n">ResultSetFormatter</span><span class="p">.</span><span class="n">out</span><span class="p">(</span><span class="n">rs</span><span class="p">)</span> <span class="p">;</span>
+ <span class="p">}</span>
 </pre></div>
 
 
@@ -276,13 +273,12 @@ dataset.</p>
      <span class="n">model</span><span class="p">.</span><span class="n">add</span><span class="p">(</span> <span class="p">...</span> <span class="p">)</span>
 
      <span class="o">//</span> <span class="n">A</span> <span class="n">SPARQL</span> <span class="n">query</span> <span class="n">will</span> <span class="n">see</span> <span class="n">the</span> <span class="n">new</span> <span class="n">statement</span> <span class="n">added</span><span class="p">.</span>
-     <span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span>
-           &quot;<span class="n">SELECT</span> <span class="p">(</span><span class="n">count</span><span class="p">(</span><span class="o">*</span><span class="p">)</span> <span class="n">AS</span> ?<span class="n">count</span><span class="p">)</span> <span class="p">{</span> ?<span class="n">s</span> ?<span class="n">p</span> ?<span class="n">o</span><span class="p">}</span> <span class="n">LIMIT</span> 10&quot;<span class="p">,</span> 
-           <span class="n">dataset</span><span class="p">)</span> <span class="p">;</span>
-     <span class="n">ResultSet</span> <span class="n">rs</span> <span class="p">=</span> <span class="n">qExec</span><span class="p">.</span><span class="n">execSelect</span><span class="p">()</span> <span class="p">;</span>
-     <span class="k">try</span> <span class="p">{</span>
+     <span class="k">try</span> <span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="p">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span>
+             &quot;<span class="n">SELECT</span> <span class="p">(</span><span class="n">count</span><span class="p">(</span><span class="o">*</span><span class="p">)</span> <span class="n">AS</span> ?<span class="n">count</span><span class="p">)</span> <span class="p">{</span> ?<span class="n">s</span> ?<span class="n">p</span> ?<span class="n">o</span><span class="p">}</span> <span class="n">LIMIT</span> 10&quot;<span class="p">,</span> 
+           <span class="n">dataset</span><span class="p">))</span> <span class="p">{</span>
+         <span class="n">ResultSet</span> <span class="n">rs</span> <span class="p">=</span> <span class="n">qExec</span><span class="p">.</span><span class="n">execSelect</span><span class="p">()</span> <span class="p">;</span>
          <span class="n">ResultSetFormatter</span><span class="p">.</span><span class="n">out</span><span class="p">(</span><span class="n">rs</span><span class="p">)</span> <span class="p">;</span>
-     <span class="p">}</span> <span class="n">finally</span> <span class="p">{</span> <span class="n">qExec</span><span class="p">.</span><span class="n">close</span><span class="p">()</span> <span class="p">;</span> <span class="p">}</span>
+     <span class="p">}</span>
 
      <span class="o">//</span> <span class="p">...</span> <span class="n">perform</span> <span class="n">a</span> <span class="n">SPARQL</span> <span class="n">Update</span>
      <span class="n">GraphStore</span> <span class="n">graphStore</span> <span class="p">=</span> <span class="n">GraphStoreFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="n">dataset</span><span class="p">)</span> <span class="p">;</span>