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 2016/08/12 09:29:06 UTC

svn commit: r994980 - in /websites/staging/jena/trunk/content: ./ documentation/fuseki2/

Author: buildbot
Date: Fri Aug 12 09:29:04 2016
New Revision: 994980

Log:
Staging update by buildbot for jena

Added:
    websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-embedded.html
Removed:
    websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-java.html
Modified:
    websites/staging/jena/trunk/content/   (props changed)
    websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-configuration.html
    websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-data-services.html
    websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-layout.html
    websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-logging.html
    websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-quick-start.html
    websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-run.html
    websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-server-protocol.html
    websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-stats.html
    websites/staging/jena/trunk/content/documentation/fuseki2/index.html
    websites/staging/jena/trunk/content/documentation/fuseki2/rdf-sparql-standards.html
    websites/staging/jena/trunk/content/documentation/fuseki2/soh.html

Propchange: websites/staging/jena/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Aug 12 09:29:04 2016
@@ -1 +1 @@
-1755585
+1756134

Modified: websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-configuration.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-configuration.html (original)
+++ websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-configuration.html Fri Aug 12 09:29:04 2016
@@ -19,7 +19,7 @@
     limitations under the License.
 -->
 
-  <title>Apache Jena - </title>
+  <title>Apache Jena - Fuseki: Configuring Fuseki</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -143,7 +143,7 @@
     <div class="row">
     <div class="col-md-12">
     <div id="breadcrumbs"></div>
-    <h1 class="title"></h1>
+    <h1 class="title">Fuseki: Configuring Fuseki</h1>
   <style type="text/css">
 /* The following code is added by mdx_elementid.py
    It was originally lifted from http://subversion.apache.org/style/site.css */
@@ -155,7 +155,6 @@
   visibility: hidden;
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
-<h1 id="configuring-fuseki">Configuring Fuseki<a class="headerlink" href="#configuring-fuseki" title="Permanent link">&para;</a></h1>
 <p>Configuration consists of defining the data services (data and actions available on the data) together with configuring the server.  Explicitly configuring the server is often unnecessary.</p>
 <p>The data services configuration can come from:</p>
 <ol>

Modified: websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-data-services.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-data-services.html (original)
+++ websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-data-services.html Fri Aug 12 09:29:04 2016
@@ -19,7 +19,7 @@
     limitations under the License.
 -->
 
-  <title>Apache Jena - </title>
+  <title>Apache Jena - Fuseki : Data Services</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -143,7 +143,7 @@
     <div class="row">
     <div class="col-md-12">
     <div id="breadcrumbs"></div>
-    <h1 class="title"></h1>
+    <h1 class="title">Fuseki : Data Services</h1>
   <style type="text/css">
 /* The following code is added by mdx_elementid.py
    It was originally lifted from http://subversion.apache.org/style/site.css */
@@ -155,7 +155,6 @@
   visibility: hidden;
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
-<h1 id="fuseki-data-services">Fuseki : Data Services<a class="headerlink" href="#fuseki-data-services" title="Permanent link">&para;</a></h1>
 <p>Fuseki provides a number of "data services" - each data service is an RDF datasets
 and a configurable set of endpoints for various operations such as SPARQL query,
 SPARQL update and file upload.</p>

Added: websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-embedded.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-embedded.html (added)
+++ websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-embedded.html Fri Aug 12 09:29:04 2016
@@ -0,0 +1,437 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+  <title>Apache Jena - Fuseki : Embedded Server</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
+  <link href="/css/bootstrap-extension.css" rel="stylesheet" type="text/css">
+  <link href="/css/jena.css" rel="stylesheet" type="text/css">
+  <link rel="shortcut icon" href="/images/favicon.ico" />
+  
+  <script src="https://code.jquery.com/jquery-2.0.3.min.js"></script>
+  <script src="/js/jena-navigation.js" type="text/javascript"></script>
+  <script src="/js/bootstrap.min.js" type="text/javascript"></script>
+  <script src="/js/breadcrumbs.js" type="text/javascript"></script>
+
+  <script src="/js/improve.js" type="text/javascript"></script>
+
+  
+  <!-- Uncomment to enable code coloring <link href="/css/codehilite.css" rel="stylesheet" type="text/css"> -->
+
+</head>
+
+<body>
+
+
+
+<nav class="navbar navbar-default" role="navigation">
+<div class="container">
+  <div class="navbar-header">
+  
+    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    <a class="navbar-brand" href="/index.html">
+    <img class="logo-menu" src="/images/jena-logo/jena-logo-notext-small.png" alt="jena logo">Apache Jena</a>
+  </div>
+ 
+  <div class="collapse navbar-collapse navbar-ex1-collapse">
+    <ul class="nav navbar-nav">
+              <li id="homepage"><a href="/index.html"><span class="glyphicon glyphicon-home"></span> Home</a></li>
+              <li id="download"><a href="/download/index.cgi"><span class="glyphicon glyphicon-download-alt"></span> Download</a></li>
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Learn <b class="caret"></b></a>
+                <ul class="dropdown-menu">
+                  <li class="dropdown-header">Tutorials</li>
+                  <li><a href="/tutorials/index.html">Overview</a></li>
+                  <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
+                  <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
+                  <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
+                  <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
+                  <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                  <li class="divider"></li>
+                  <li class="dropdown-header">References</li>
+                  <li><a href="/documentation/index.html">Overview</a></li>
+                  <li><a href="/documentation/javadoc/">Javadoc</a></li>
+                  <li><a href="/documentation/rdf/index.html">RDF API</a></li>
+                  <li><a href="/documentation/io/">RDF I/O</a></li>
+                  <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                  <li><a href="/documentation/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
+                  <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                  <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                  <li><a href="/documentation/sdb/index.html">SDB</a></li>
+                  <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
+                  <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
+                  <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                  <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                  <li><a href="/documentation/ontology/">Ontology API</a></li>
+                  <li><a href="/documentation/inference/index.html">Inference API</a></li>
+                  <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                  <li><a href="/documentation/extras/index.html">Extras</a></li>
+                </ul>
+              </li>
+
+              <li class="drop down">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
+                <ul class="dropdown-menu">
+                  <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                  <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
+                  <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                  <li><a href="/documentation/javadoc/elephas/">Elephas</a></li>
+                  <li><a href="/documentation/javadoc/text/">Text Search</a></li>
+                  <li><a href="/documentation/javadoc/spatial/">Spatial Search</a></li>
+                  <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
+                  <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                  <li><a href="/documentation/javadoc/">All Javadoc</a></li>
+                </ul>
+              </li>
+
+              <li id="ask"><a href="/help_and_support/index.html"><span class="glyphicon glyphicon-question-sign"></span> Ask</a></li>
+              
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-bullhorn"></span> Get involved <b class="caret"></b></a>
+                <ul class="dropdown-menu">
+                  <li><a href="/getting_involved/index.html">Contribute</a></li>
+                  <li><a href="/help_and_support/bugs_and_suggestions.html">Report a bug</a></li>
+                  <li class="divider"></li>
+                  <li class="dropdown-header">Project</li>
+                  <li><a href="/about_jena/about.html">About Jena</a></li>
+                  <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
+                  <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                  <li><a href="/about_jena/team.html">Project team</a></li>
+                  <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                  <li class="divider"></li>
+                  <li class="dropdown-header">ASF</li>
+                  <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
+                  <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
+                  <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+                  <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                  <li><a href="http://www.apache.org/security/">Security</a></li>
+                </ul>
+              </li>
+
+              <li id="edit"><a href="javascript:improveThisPage(location.href);" title="Improve this Page (Use username anonymous and empty password)"><span class="glyphicon glyphicon-pencil"></span> Improve this Page</a></li>   
+    </ul>
+  </div>
+</div>
+</nav>
+
+
+<div class="container">
+    <div class="row">
+    <div class="col-md-12">
+    <div id="breadcrumbs"></div>
+    <h1 class="title">Fuseki : Embedded Server</h1>
+  <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<p>Fuseki can be run in the background by an application as an embedded server.  The
+application can safely work with the dataset directly from java while having Fuseki
+provide SPARQL access over HTTP.  An embedded server is also useful for development
+and testing.</p>
+<ul>
+<li><a href="#usage">Application Use</a></li>
+<li><a href="#dependencies">Dependencies and Setup</a></li>
+<li><a href="#logging">Logging</a></li>
+<li><a href="#build">Building a Server</a></li>
+</ul>
+<p>The embedded server does not depend on any files on disk (other than for
+databases provided by the application), and does not provide
+the Fuseki UI or admins functions to create dataset via HTTP.</p>
+<h2 id="usage">Application Use<a class="headerlink" href="#usage" title="Permanent link">&para;</a></h2>
+<p>The application can safely access and modify the data published by the server if it does
+so inside a <a href="/documentation/txn/">transaction</a> using an appropriate
+storage choice. <code>DatasetFactory.createTxnMem()</code> is a good choice for in-memory use;
+<a href="/documentation/tdb/">TDB</a> is a good choice for a persistent database.</p>
+<p>To build and start the server:</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="n">FusekiEmbeddedServer</span> <span class="n">server</span> <span class="p">=</span> <span class="n">FusekiEmbeddedServer</span><span class="p">.</span><span class="n">create</span><span class="p">()</span>
+  <span class="p">.</span><span class="n">add</span><span class="p">(</span>&quot;<span class="o">/</span><span class="n">rdf</span>&quot;<span class="p">,</span> <span class="n">ds</span><span class="p">)</span>
+  <span class="p">.</span><span class="n">build</span><span class="p">()</span> <span class="p">;</span>
+<span class="n">server</span><span class="p">.</span><span class="n">start</span><span class="p">()</span> <span class="p">;</span>
+</pre></div>
+
+
+<p>then the application can modify the dataset:</p>
+<div class="codehilite"><pre><span class="c1">// Add some data while live.</span>
+<span class="c1">// Write trasnaction.</span>
+<span class="n">Txn</span><span class="p">.</span><span class="n">execWrite</span><span class="p">(</span><span class="n">dsg</span><span class="p">,</span> <span class="p">()</span><span class="o">-&gt;</span><span class="n">RDFDataMgr</span><span class="p">.</span><span class="n">read</span><span class="p">(</span><span class="n">dsg</span><span class="p">,</span> <span class="s">&quot;D.trig&quot;</span><span class="p">))</span> <span class="p">;</span>
+</pre></div>
+
+
+<p>or read the dataset and see any updates made by remote systems:</p>
+<div class="codehilite"><pre><span class="c1">// Query data while live</span>
+<span class="c1">// Read transaction.</span>
+<span class="n">Txn</span><span class="p">.</span><span class="n">execRead</span><span class="p">(</span><span class="n">dsg</span><span class="p">,</span> <span class="p">()</span><span class="o">-&gt;</span><span class="p">{</span>
+<span class="n">Dataset</span> <span class="n">ds</span> <span class="o">=</span> <span class="n">DatasetFactory</span><span class="p">.</span><span class="n">wrap</span><span class="p">(</span><span class="n">dsg</span><span class="p">)</span> <span class="p">;</span>
+<span class="n">try</span> <span class="p">(</span><span class="n">QueryExecution</span> <span class="n">qExec</span> <span class="o">=</span> <span class="n">QueryExecutionFactory</span><span class="p">.</span><span class="n">create</span><span class="p">(</span><span class="s">&quot;SELECT * { ?s  ?o}&quot;</span><span class="p">,</span> <span class="n">ds</span><span class="p">)</span> <span class="p">)</span> <span class="p">{</span>
+    <span class="n">ResultSet</span> <span class="n">rs</span> <span class="o">=</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="p">})</span> <span class="p">;</span>
+</pre></div>
+
+
+<p>The full Jena API can be used provided operations (read and write) are inside
+a transaction.</p>
+<h2 id="dependencies">Dependencies and Setup<a class="headerlink" href="#dependencies" title="Permanent link">&para;</a></h2>
+<p>To include an embedded Fuseki server in the application:</p>
+<div class="codehilite"><pre><span class="nt">&lt;dependency&gt;</span>
+  <span class="nt">&lt;groupId&gt;</span>org.apache.jena<span class="nt">&lt;/groupId&gt;</span>
+  <span class="nt">&lt;artifactId&gt;</span>jena-fuseki-embedded<span class="nt">&lt;/artifactId&gt;</span>
+  <span class="nt">&lt;version&gt;</span>2.x.y<span class="nt">&lt;/version&gt;</span> <span class="c">&lt;!-- Set the version --&gt;</span>
+<span class="nt">&lt;/dependency&gt;</span>
+</pre></div>
+
+
+<p>This brings in enough dependencies to run Fuseki. Applicartion writers are strongly
+encouraged to use a dependency manager because the numbe rof Jetty and other dependencies
+is quite large and difficult to set manually.</p>
+<p>This dependency does not include a logging setting. Fusek uses <a href="http://slf4j.org/">slf4j</a>.
+See section "<a href="#logging">Logging</a>" for details.</p>
+<p>If the application wishes to use a dataset with a <a href="http://jena.apache.org/documentation/query/text-query.html">text-index</a>
+then the application wil also need to include jena-text in its dependencies.</p>
+<h2 id="logging">Logging<a class="headerlink" href="#logging" title="Permanent link">&para;</a></h2>
+<p>The application must set the logging provided for <a href="http://slf4j.org/">slf4j</a>.
+Apache jena provides helpers for the JDK-provided java logging and for Apache Log4j v1.</p>
+<p>Using the JDK-provided java logging:</p>
+<div class="codehilite"><pre><span class="n">LogCtl</span><span class="p">.</span><span class="n">setJavaLogging</span><span class="p">()</span>
+</pre></div>
+
+
+<p>and a dependency of:</p>
+<div class="codehilite"><pre><span class="nt">&lt;dependency&gt;</span>
+  <span class="nt">&lt;groupId&gt;</span>org.slf4j<span class="nt">&lt;/groupId&gt;</span>
+  <span class="nt">&lt;artifactId&gt;</span>slf4j-jdk14<span class="nt">&lt;/artifactId&gt;</span>
+  <span class="nt">&lt;version&gt;</span>1.x.y<span class="nt">&lt;/version&gt;</span>
+<span class="nt">&lt;/dependency&gt;</span>
+</pre></div>
+
+
+<p>For Apache log4j: - this is how the full Fuseki server sets its logging:</p>
+<div class="codehilite"><pre><span class="n">FusekiLogging</span><span class="p">.</span><span class="n">setLogging</span><span class="p">();</span>
+</pre></div>
+
+
+<p>and dependencies:</p>
+<div class="codehilite"><pre><span class="nt">&lt;dependency&gt;</span>
+  <span class="nt">&lt;groupId&gt;</span>org.slf4j<span class="nt">&lt;/groupId&gt;</span>
+  <span class="nt">&lt;artifactId&gt;</span>slf4j-log4j12<span class="nt">&lt;/artifactId&gt;</span>
+  <span class="nt">&lt;version&gt;</span>1.x.y<span class="nt">&lt;/version&gt;</span>
+<span class="nt">&lt;/dependency&gt;</span>
+
+<span class="nt">&lt;dependency&gt;</span>
+  <span class="nt">&lt;groupId&gt;</span>log4j<span class="nt">&lt;/groupId&gt;</span>
+  <span class="nt">&lt;artifactId&gt;</span>log4j<span class="nt">&lt;/artifactId&gt;</span>
+  <span class="nt">&lt;version&gt;</span>1.x.y<span class="nt">&lt;/version&gt;</span>
+<span class="nt">&lt;/dependency&gt;</span>
+</pre></div>
+
+
+<p>See <a href="http://jena.apache.org/documentation/fuseki2/fuseki-logging.html">Fuseki Logging</a>.</p>
+<p>To silence logging from Java, try:</p>
+<div class="codehilite"><pre><span class="n">LogCtl</span><span class="p">.</span><span class="n">setLevel</span><span class="p">(</span><span class="n">Fuseki</span><span class="p">.</span><span class="n">serverLogName</span><span class="p">,</span>  &quot;<span class="n">WARN</span>&quot;<span class="p">);</span>
+<span class="n">LogCtl</span><span class="p">.</span><span class="n">setLevel</span><span class="p">(</span><span class="n">Fuseki</span><span class="p">.</span><span class="n">actionLogName</span><span class="p">,</span>  &quot;<span class="n">WARN</span>&quot;<span class="p">);</span>
+<span class="n">LogCtl</span><span class="p">.</span><span class="n">setLevel</span><span class="p">(</span><span class="n">Fuseki</span><span class="p">.</span><span class="n">requestLogName</span><span class="p">,</span> &quot;<span class="n">WARN</span>&quot;<span class="p">);</span>
+<span class="n">LogCtl</span><span class="p">.</span><span class="n">setLevel</span><span class="p">(</span><span class="n">Fuseki</span><span class="p">.</span><span class="n">adminLogName</span><span class="p">,</span>   &quot;<span class="n">WARN</span>&quot;<span class="p">);</span>
+<span class="n">LogCtl</span><span class="p">.</span><span class="n">setLevel</span><span class="p">(</span>&quot;<span class="n">org</span><span class="p">.</span><span class="n">eclipse</span><span class="p">.</span><span class="n">jetty</span>&quot;<span class="p">,</span>   &quot;<span class="n">WARN</span>&quot;<span class="p">);</span>
+</pre></div>
+
+
+<h2 id="build">Building a server<a class="headerlink" href="#build" title="Permanent link">&para;</a></h2>
+<p>When a <code>FusekiEmbeddedServer</code> server is built, it is not running;
+the application needs to start it.</p>
+<p>The default port for a Fuseki embedded server is 3330. This is different for the default
+port for Fuseki running as a standalone server or as a wwabbapp application.</p>
+<h2 id="example-1">Example 1<a class="headerlink" href="#example-1" title="Permanent link">&para;</a></h2>
+<p>Create a server on port 3330, that provides the default set of endpoints for an RDF
+dataset that can be updated via HTTP.</p>
+<div class="codehilite"><pre><span class="n">DatasetGraph</span> <span class="n">ds</span> <span class="p">=</span> <span class="n">DatasetFactory</span><span class="p">.</span><span class="n">createTxnMem</span><span class="p">()</span> <span class="p">;</span>
+<span class="n">FusekiEmbeddedServer</span> <span class="n">server</span> <span class="p">=</span> <span class="n">FusekiEmbeddedServer</span><span class="p">.</span><span class="n">create</span><span class="p">()</span>
+    <span class="p">.</span><span class="n">add</span><span class="p">(</span>&quot;<span class="o">/</span><span class="n">ds</span>&quot;<span class="p">,</span> <span class="n">ds</span><span class="p">)</span>
+    <span class="p">.</span><span class="n">build</span><span class="p">()</span> <span class="p">;</span>
+<span class="n">server</span><span class="p">.</span><span class="n">start</span><span class="p">()</span> <span class="p">;</span>
+<span class="p">...</span>
+<span class="n">server</span><span class="p">.</span><span class="n">stop</span><span class="p">()</span> <span class="p">;</span>
+</pre></div>
+
+
+<p>URLs:</p>
+<table class="table">
+<thead>
+<tr>
+<th>Service</th>
+<th>Endpoint</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>SPARQL Query</td>
+<td><code>http://host:3330/ds/query</code></td>
+</tr>
+<tr>
+<td>SPARQL Query</td>
+<td><code>http://host:3330/ds/sparql</code></td>
+</tr>
+<tr>
+<td>SPARQL Update</td>
+<td><code>http://host:3330/ds/update</code></td>
+</tr>
+<tr>
+<td>File upload</td>
+<td><code>http://host:3330/ds/update</code></td>
+</tr>
+<tr>
+<td>GSP read-write</td>
+<td><code>http://host:3330/ds/data</code></td>
+</tr>
+<tr>
+<td>Read-write quads</td>
+<td><code>http://host:3330/ds</code></td>
+</tr>
+</tbody>
+</table>
+<p>"GSP" = SPARQL Graph Store Protocol</p>
+<h2 id="example-2">Example 2<a class="headerlink" href="#example-2" title="Permanent link">&para;</a></h2>
+<p>Create a server on port 3332, that provides the default set of endpoints for a data
+set that is read-only over HTTP. The application can still update the dataset.</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">FusekiEmbeddedServer</span> <span class="n">server</span> <span class="p">=</span> <span class="n">FusekiEmbeddedServer</span><span class="p">.</span><span class="n">create</span><span class="p">()</span>
+    <span class="p">.</span><span class="n">setPort</span><span class="p">(</span>3332<span class="p">)</span>
+    <span class="p">.</span><span class="n">add</span><span class="p">(</span>&quot;<span class="o">/</span><span class="n">ds</span>&quot;<span class="p">,</span> <span class="n">ds</span><span class="p">,</span> <span class="n">true</span><span class="p">)</span>
+    <span class="p">.</span><span class="n">build</span><span class="p">()</span> <span class="p">;</span>
+<span class="n">server</span><span class="p">.</span><span class="n">start</span><span class="p">()</span> <span class="p">;</span>
+</pre></div>
+
+
+<table class="table">
+<thead>
+<tr>
+<th>Service</th>
+<th>Endpoint</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>SPARQL Query</td>
+<td><code>http://host:3332/ds/query</code></td>
+</tr>
+<tr>
+<td>SPARQL Query</td>
+<td><code>http://host:3332/ds/sparql</code></td>
+</tr>
+<tr>
+<td>GSP read-only</td>
+<td><code>http://host:3332/ds/data</code></td>
+</tr>
+<tr>
+<td>GET quads</td>
+<td><code>http://host:3332/ds</code></td>
+</tr>
+</tbody>
+</table>
+<h2 id="example-3">Example 3<a class="headerlink" href="#example-3" title="Permanent link">&para;</a></h2>
+<p>Different combinations of services and endpoint names can be given using a <code>DataService</code>.</p>
+<div class="codehilite"><pre><span class="n">DatasetGraph</span> <span class="n">dsg</span> <span class="p">=</span> <span class="p">...</span> <span class="p">;</span>
+<span class="n">DataService</span> <span class="n">dataService</span> <span class="p">=</span> <span class="n">new</span> <span class="n">DataService</span><span class="p">(</span><span class="n">dsg</span><span class="p">)</span> <span class="p">;</span>
+<span class="n">dataService</span><span class="p">.</span><span class="n">addEndpoint</span><span class="p">(</span><span class="n">OperationName</span><span class="p">.</span><span class="n">Quads_RW</span><span class="p">,</span> &quot;&quot;<span class="p">);</span>
+<span class="n">dataService</span><span class="p">.</span><span class="n">addEndpoint</span><span class="p">(</span><span class="n">OperationName</span><span class="p">.</span><span class="n">Query</span><span class="p">,</span> &quot;&quot;<span class="p">);</span>
+<span class="n">dataService</span><span class="p">.</span><span class="n">addEndpoint</span><span class="p">(</span><span class="n">OperationName</span><span class="p">.</span><span class="n">Update</span><span class="p">,</span> &quot;&quot;<span class="p">);</span>
+
+<span class="n">FusekiEmbeddedServer</span> <span class="n">server</span> <span class="p">=</span> <span class="n">FusekiEmbeddedServer</span><span class="p">.</span><span class="n">create</span><span class="p">()</span>
+   <span class="p">.</span><span class="n">setPort</span><span class="p">(</span>3332<span class="p">)</span>
+   <span class="p">.</span><span class="n">add</span><span class="p">(</span>&quot;<span class="o">/</span><span class="n">data</span>&quot;<span class="p">,</span> <span class="n">dataService</span><span class="p">)</span>
+   <span class="p">.</span><span class="n">build</span><span class="p">()</span> <span class="p">;</span>
+<span class="n">server</span><span class="p">.</span><span class="n">start</span><span class="p">()</span> <span class="p">;</span>
+</pre></div>
+
+
+<p>This setup puts all the operation on the datset URL. The <code>Content-type</code> and any query
+string is used to determine the operation.</p>
+<table class="table">
+<thead>
+<tr>
+<th>Service</th>
+<th>Endpoint</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>SPARQL Query</td>
+<td><code>http://host:3332/ds</code></td>
+</tr>
+<tr>
+<td>SPARQL Update</td>
+<td><code>http://host:3332/ds</code></td>
+</tr>
+<tr>
+<td>GSP read-only</td>
+<td><code>http://host:3332/ds</code></td>
+</tr>
+<tr>
+<td>GET/POST quads</td>
+<td><code>http://host:3332/ds</code></td>
+</tr>
+</tbody>
+</table>
+<h2 id="example-4">Example 4<a class="headerlink" href="#example-4" title="Permanent link">&para;</a></h2>
+<p>Multiple datasets can be served by one server.</p>
+<div class="codehilite"><pre><span class="n">Dataset</span> <span class="n">ds1</span> <span class="p">=</span> <span class="p">...</span>
+<span class="n">Dataset</span> <span class="n">ds2</span> <span class="p">=</span> <span class="p">...</span>
+<span class="n">FusekiEmbeddedServer</span> <span class="n">server</span> <span class="p">=</span> <span class="n">FusekiEmbeddedServer</span><span class="p">.</span><span class="n">create</span><span class="p">()</span>
+    <span class="p">.</span><span class="n">add</span><span class="p">(</span>&quot;<span class="o">/</span><span class="n">data1</span>&quot;<span class="p">,</span> <span class="n">ds1</span><span class="p">)</span>
+    <span class="p">.</span><span class="n">add</span><span class="p">(</span>&quot;<span class="o">/</span><span class="n">data1</span><span class="o">-</span><span class="n">readonly</span>&quot;<span class="p">,</span> <span class="n">ds1</span><span class="p">,</span> <span class="n">true</span><span class="p">)</span>
+    <span class="p">.</span><span class="n">add</span><span class="p">(</span>&quot;<span class="o">/</span><span class="n">data2</span>&quot;<span class="p">,</span> <span class="n">ds2</span><span class="p">)</span>
+    <span class="p">.</span><span class="n">build</span><span class="p">()</span> <span class="p">;</span>
+<span class="n">server</span><span class="p">.</span><span class="n">start</span><span class="p">()</span> <span class="p">;</span>
+</pre></div>
+  </div>
+</div>
+
+</div><!--/.container -->
+
+    <footer class="footer">
+      <div class="container">
+        <p>Copyright &copy; 2011&ndash;2016 The Apache Software Foundation, Licensed under
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        </p>
+        <p>
+        Apache Jena, Jena, the Apache Jena project logo,
+        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+        </p>
+      </div>
+  </footer>
+      
+
+</body>
+</html>

Modified: websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-layout.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-layout.html (original)
+++ websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-layout.html Fri Aug 12 09:29:04 2016
@@ -19,7 +19,7 @@
     limitations under the License.
 -->
 
-  <title>Apache Jena - </title>
+  <title>Apache Jena - Fuseki File System Layout</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -143,7 +143,7 @@
     <div class="row">
     <div class="col-md-12">
     <div id="breadcrumbs"></div>
-    <h1 class="title"></h1>
+    <h1 class="title">Fuseki File System Layout</h1>
   <style type="text/css">
 /* The following code is added by mdx_elementid.py
    It was originally lifted from http://subversion.apache.org/style/site.css */
@@ -155,7 +155,6 @@
   visibility: hidden;
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
-<h1 id="fuseki-file-system-layout">Fuseki File System Layout<a class="headerlink" href="#fuseki-file-system-layout" title="Permanent link">&para;</a></h1>
 <p>There are two areas: the fixed files provided by the distribution and the
 changing files for the local deployment,including the default location
 for TDB databases.</p>

Modified: websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-logging.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-logging.html (original)
+++ websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-logging.html Fri Aug 12 09:29:04 2016
@@ -19,7 +19,7 @@
     limitations under the License.
 -->
 
-  <title>Apache Jena - </title>
+  <title>Apache Jena - Fuseki Logging</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -143,7 +143,7 @@
     <div class="row">
     <div class="col-md-12">
     <div id="breadcrumbs"></div>
-    <h1 class="title"></h1>
+    <h1 class="title">Fuseki Logging</h1>
   <style type="text/css">
 /* The following code is added by mdx_elementid.py
    It was originally lifted from http://subversion.apache.org/style/site.css */
@@ -155,7 +155,6 @@
   visibility: hidden;
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
-<h1 id="fuseki-logging">Fuseki Logging<a class="headerlink" href="#fuseki-logging" title="Permanent link">&para;</a></h1>
 <p>Fuseki logs operation details and also provides a standard NCSA request log.  </p>
 <p>Logging is via <a href="http://slf4j.org/">slj4j</a> over 
 (Apache Log4J)[http://logging.apache.org/log4j/].

Modified: websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-quick-start.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-quick-start.html (original)
+++ websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-quick-start.html Fri Aug 12 09:29:04 2016
@@ -19,7 +19,7 @@
     limitations under the License.
 -->
 
-  <title>Apache Jena - </title>
+  <title>Apache Jena - Fuseki Quickstart</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -143,7 +143,7 @@
     <div class="row">
     <div class="col-md-12">
     <div id="breadcrumbs"></div>
-    <h1 class="title"></h1>
+    <h1 class="title">Fuseki Quickstart</h1>
   <style type="text/css">
 /* The following code is added by mdx_elementid.py
    It was originally lifted from http://subversion.apache.org/style/site.css */
@@ -155,9 +155,7 @@
   visibility: hidden;
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
-<h1 id="fuseki-quickstart">Fuseki Quickstart<a class="headerlink" href="#fuseki-quickstart" title="Permanent link">&para;</a></h1>
 <p>This page describes how to achieve certain common tasks in the most direct way possible.</p>
-<p><em>CHECK</em></p>
 <h2 id="running-with-apache-tomcat-and-loading-a-file">Running with Apache Tomcat and loading a file.<a class="headerlink" href="#running-with-apache-tomcat-and-loading-a-file" title="Permanent link">&para;</a></h2>
 <ol>
 <li>Unpack the distribution.</li>

Modified: websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-run.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-run.html (original)
+++ websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-run.html Fri Aug 12 09:29:04 2016
@@ -19,7 +19,7 @@
     limitations under the License.
 -->
 
-  <title>Apache Jena - </title>
+  <title>Apache Jena - Running Fuseki</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -143,7 +143,7 @@
     <div class="row">
     <div class="col-md-12">
     <div id="breadcrumbs"></div>
-    <h1 class="title"></h1>
+    <h1 class="title">Running Fuseki</h1>
   <style type="text/css">
 /* The following code is added by mdx_elementid.py
    It was originally lifted from http://subversion.apache.org/style/site.css */
@@ -155,18 +155,17 @@
   visibility: hidden;
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
-<h1 id="running-fuseki">Running Fuseki<a class="headerlink" href="#running-fuseki" title="Permanent link">&para;</a></h1>
 <p>Fuseki can be run in three ways</p>
 <ul>
-<li><a href="#fuseki-as-a-standalone-server">As a standalone server</a></li>
-<li><a href="#fuseki-as-a-web-application">As a Web Application</a> inside a container such as Apache Tomcat or Jetty.</li>
-<li><a href="#fuseki-as-a-service">As a service</a> run by the operation system, for example, started when the machine boots.</li>
+<li><a href="#fuseki-standalone-server">As a standalone server</a></li>
+<li><a href="#fuseki-service">As a service</a> run by the operation system, for example, started when the machine</li>
+<li><a href="#fuseki-web-application">As a Web Application</a> inside a container such as Apache Tomcat or Jetty.
+boots.</li>
+<li><a href="#fuseki-embedded">As an embedded SPARQ server</a>.</li>
 </ul>
-<p>@@caution: it is possible that the way these three forms are delivered will
-change internally but the scripts used here will retain the same interface.</p>
 <p>See "<a href="fuseki-configuration.html">Fuseki Configuration</a>" for information on
-how to provides datasetsand configure services.</p>
-<h2 id="fuseki-as-a-standalone-server">Fuseki as a Standalone Server<a class="headerlink" href="#fuseki-as-a-standalone-server" title="Permanent link">&para;</a></h2>
+how to provides datasets and configure services.</p>
+<h2 id="fuseki-standalone-server">Fuseki as a Standalone Server<a class="headerlink" href="#fuseki-standalone-server" title="Permanent link">&para;</a></h2>
 <p>This is running Fuseki from the command line.</p>
 <div class="codehilite"><pre><span class="n">fuseki</span><span class="o">-</span><span class="n">server</span> <span class="p">[</span><span class="o">--</span><span class="n">mem</span> <span class="o">|</span> <span class="o">--</span><span class="n">loc</span><span class="p">=</span><span class="n">DIR</span><span class="p">]</span> <span class="p">[[</span><span class="o">--</span><span class="n">update</span><span class="p">]</span> <span class="o">/</span><span class="n">NAME</span><span class="p">]</span>
 
@@ -189,7 +188,14 @@ the environment variable <code>FUSEKI_HO
 distribution.</p>
 <p>Unlike Fuseki v1, starting with no dataset and no configuration is possible.
 Datasets can be added from the admin UI to a running server.</p>
-<h2 id="fuseki-as-a-web-application">Fuseki as a Web Application<a class="headerlink" href="#fuseki-as-a-web-application" title="Permanent link">&para;</a></h2>
+<h2 id="fuseki-service">Fuseki as a Service<a class="headerlink" href="#fuseki-service" title="Permanent link">&para;</a></h2>
+<p>Fuseki can run as an operating system service, started when the server
+machine boots.  The script <code>fuseki</code> is a Linux <code>init.d</code> with the common
+secondary arguments of <code>start</code> and <code>stop</code>.</p>
+<p>Process arguments are read from <code>/etc/default/fuseki</code> including
+<code>FUSEKI_HOME</code> and <code>FUSEKI_BASE</code>.  <code>FUSEKI_HOME</code> should be the directory
+where the distribution was unpacked.</p>
+<h2 id="fuseki-web-application">Fuseki as a Web Application<a class="headerlink" href="#fuseki-web-application" title="Permanent link">&para;</a></h2>
 <p>Fuseki can run from a
 <a href="http://en.wikipedia.org/wiki/WAR_%28file_format%29">WAR</a> file.  Fuseki
 requires at least support for the Servlet 3.0 API (e.g. Apache Tomcat 7 or
@@ -200,13 +206,22 @@ directory.  It is initialised the first
 <a href="http://shiro.apache.org/">Apache Shiro</a> security file but this is only
 intended as a starting point.  It restricts use of the admin UI to the
 local machine.</p>
-<h2 id="fuseki-as-a-service">Fuseki as a Service<a class="headerlink" href="#fuseki-as-a-service" title="Permanent link">&para;</a></h2>
-<p>Fuseki can run as an operating system service, started when the server
-machine boots.  The script <code>fuseki</code> is a Linux <code>init.d</code> with the common
-secondary arguments of <code>start</code> and <code>stop</code>.</p>
-<p>Process arguments are read from <code>/etc/default/fuseki</code> including
-<code>FUSEKI_HOME</code> and <code>FUSEKI_BASE</code>.  <code>FUSEKI_HOME</code> should be the directory
-where the distribution was unpacked.</p>
+<h2 id="fuskei-as-an-embedded-sparql-server-fuseki-embedded">Fuskei as an Embedded SPARQL Server {#fuseki-embedded}.<a class="headerlink" href="#fuskei-as-an-embedded-sparql-server-fuseki-embedded" title="Permanent link">&para;</a></h2>
+<p>Fuseki can be run from inside an Java application to provide SPARQL
+services to application data. The application can continue to access and
+update the datasets served by the server.</p>
+<p>Basic example:</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="n">FusekiEmbeddedServer</span> <span class="n">server</span> <span class="p">=</span> <span class="n">FusekiEmbeddedServer</span><span class="p">.</span><span class="n">create</span><span class="p">()</span>
+  <span class="p">.</span><span class="n">add</span><span class="p">(</span>&quot;<span class="o">/</span><span class="n">dataset</span>&quot;<span class="p">,</span> <span class="n">ds</span><span class="p">)</span>
+  <span class="p">.</span><span class="n">build</span><span class="p">()</span> <span class="p">;</span>
+<span class="n">server</span><span class="p">.</span><span class="n">start</span><span class="p">()</span> <span class="p">;</span>
+</pre></div>
+
+
+<p>See the <a href="fuseki-embedded.html">full documentation</a> for details of
+configuration and working with data shared with the <a href="fuseki-embedded.html">embedded
+Fuseki</a> instance.</p>
   </div>
 </div>
 

Modified: websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-server-protocol.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-server-protocol.html (original)
+++ websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-server-protocol.html Fri Aug 12 09:29:04 2016
@@ -19,7 +19,7 @@
     limitations under the License.
 -->
 
-  <title>Apache Jena - </title>
+  <title>Apache Jena - Fuseki HTTP Administration Protocol</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -143,7 +143,7 @@
     <div class="row">
     <div class="col-md-12">
     <div id="breadcrumbs"></div>
-    <h1 class="title"></h1>
+    <h1 class="title">Fuseki HTTP Administration Protocol</h1>
   <style type="text/css">
 /* The following code is added by mdx_elementid.py
    It was originally lifted from http://subversion.apache.org/style/site.css */
@@ -155,10 +155,6 @@
   visibility: hidden;
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
-<h1 id="fuseki-http-administration-protocol">Fuseki HTTP Administration Protocol<a class="headerlink" href="#fuseki-http-administration-protocol" title="Permanent link">&para;</a></h1>
-<blockquote>
-<p><em>These functions are available in version 2.0 and later.</em></p>
-</blockquote>
 <p>This page describes the HTTP Protocol used to control an Fuseki server via
 its administrative interface.  See "<a href="admin.html">Fuseki Administration</a>"
 for an overview of server administration.</p>

Modified: websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-stats.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-stats.html (original)
+++ websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-stats.html Fri Aug 12 09:29:04 2016
@@ -155,7 +155,7 @@
   visibility: hidden;
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
-<h1 id="fuseki-service-statistics">Fuseki Service Statistics<a class="headerlink" href="#fuseki-service-statistics" title="Permanent link">&para;</a></h1>
+<p>Title;: Fuseki: Service Statistics</p>
 <p>A Fuseki server keeps detailed statistics for each dataset and each service
 of a dataset keeps counters as to the number
 of incoming requests, number of successful requests, number of bad requests

Modified: websites/staging/jena/trunk/content/documentation/fuseki2/index.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/fuseki2/index.html (original)
+++ websites/staging/jena/trunk/content/documentation/fuseki2/index.html Fri Aug 12 09:29:04 2016
@@ -167,14 +167,14 @@ h2:hover > .headerlink, h3:hover > .head
 service, as a Java web application (WAR file), and as a standalone server.
 It provides security (using <a href="https://shiro.apache.org/">Apache Shiro</a>) and
 has a user interface for server monitoring and administration.</p>
-<p>It provides the SPARQL 1.1 
-<a href="http://www.w3.org/TR/sparql11-protocol/">protocols for query and update</a> 
-as well as the 
+<p>It provides the SPARQL 1.1
+<a href="http://www.w3.org/TR/sparql11-protocol/">protocols for query and update</a>
+as well as the
 <a href="http://www.w3.org/TR/sparql11-http-rdf-update/">SPARQL Graph Store protocol</a>.</p>
 <p>Fuseki is tightly integrated with <a href="../tdb/index.html">TDB</a> to provide a robust,
 transactional persistent storage layer, and incorporates
 <a href="../query/text-query.html">Jena text query</a>
-and <a href="../query/spatial-query.html">Jena spatial query</a>.<br />
+and <a href="../query/spatial-query.html">Jena spatial query</a>.
 It can be used to provide the protocol engine for other RDF query and
 storage systems.</p>
 <h2 id="contents">Contents<a class="headerlink" href="#contents" title="Permanent link">&para;</a></h2>
@@ -183,9 +183,10 @@ storage systems.</p>
 <li><a href="#getting-started-with-fuseki">Getting Started</a></li>
 <li><a href="fuseki-security.html">Security</a></li>
 <li><a href="fuseki-run.html">Running Fuseki</a><ul>
-<li><a href="fuseki-run.html#fuseki-as-a-web-application">As a web application</a></li>
-<li><a href="fuseki-run.html#fuseki-as-a-service">As a service</a></li>
-<li><a href="fuseki-run.html#fuseki-as-a-standalone server">As a standalone server</a></li>
+<li><a href="fuseki-run.html#fuseki-standalone-server">As a standalone server</a></li>
+<li><a href="fuseki-run.html#fuseki-service">As a service</a></li>
+<li><a href="fuseki-run.html#fuseki-web-application">As a web application</a></li>
+<li><a href="fuseki-run.html#fuseki-embedded-server">As an embedded SPARQL server</a></li>
 </ul>
 </li>
 <li>Architecture<ul>
@@ -203,10 +204,11 @@ storage systems.</p>
 </li>
 <li><a href="rdf-sparql-standards.html">Links to Standards</a></li>
 </ul>
-<p>The Jena users mailing is the place to get help with Fuseki.  </p>
+<p>The Jena users mailing is the place to get help with Fuseki.</p>
 <p><a href="/help_and_support/#email-support-lists">Email support lists</a></p>
 <h2 id="fuseki-1">Fuseki 1<a class="headerlink" href="#fuseki-1" title="Permanent link">&para;</a></h2>
-<p><a href="/documentation/serving_data/">Documentation for Fuseki1</a>.</p>
+<p>Fuseki 1 is stil available for legacy use. 
+<a href="/documentation/serving_data/">Documentation for Fuseki1</a>.</p>
 <h2 id="download-fuseki">Download Fuseki<a class="headerlink" href="#download-fuseki" title="Permanent link">&para;</a></h2>
 <p>Releases of Apache Jena Fuseki can be downloaded from one of the mirror sites:</p>
 <p><a href="/download">Jena Downloads</a></p>
@@ -238,13 +240,9 @@ See also the <a href="//documentation/mi
 </tr>
 </tbody>
 </table>
-<blockquote>
-<p><em>@@ Not ready yet</em>
-It is also available as a Java web application WAR file via maven.</p>
-</blockquote>
 <div class="codehilite"><pre><span class="nt">&lt;dependency&gt;</span>
    <span class="nt">&lt;groupId&gt;</span>org.apache.jena<span class="nt">&lt;/groupId&gt;</span>
-   <span class="nt">&lt;artifactId&gt;</span>jena-fuseki-webapp<span class="nt">&lt;/artifactId&gt;</span>
+   <span class="nt">&lt;artifactId&gt;</span>jena-fuseki-war<span class="nt">&lt;/artifactId&gt;</span>
    <span class="nt">&lt;type&gt;</span>war<span class="nt">&lt;/type&gt;</span>
    <span class="nt">&lt;version&gt;</span>X.Y.Z<span class="nt">&lt;/version&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span>
@@ -259,7 +257,7 @@ preference to using any older versions o
 at <a href="http://archive.apache.org/dist/jena/">http://archive.apache.org/dist/jena</a></p>
 <h3 id="development-builds">Development Builds<a class="headerlink" href="#development-builds" title="Permanent link">&para;</a></h3>
 <p>Regular developement builds of all of Jena are available (these are not
-formal releases) from the 
+formal releases) from the
 <a href="https://repository.apache.org/snapshots/org/apache/jena">Apache snapshots maven repository</a>.
 This includes packaged builds of Fuseki.</p>
 <h2 id="getting-started-with-fuseki">Getting Started With Fuseki<a class="headerlink" href="#getting-started-with-fuseki" title="Permanent link">&para;</a></h2>

Modified: websites/staging/jena/trunk/content/documentation/fuseki2/rdf-sparql-standards.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/fuseki2/rdf-sparql-standards.html (original)
+++ websites/staging/jena/trunk/content/documentation/fuseki2/rdf-sparql-standards.html Fri Aug 12 09:29:04 2016
@@ -19,7 +19,7 @@
     limitations under the License.
 -->
 
-  <title>Apache Jena - </title>
+  <title>Apache Jena - Fuseki: SPARQL and RDF Standards</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -143,7 +143,7 @@
     <div class="row">
     <div class="col-md-12">
     <div id="breadcrumbs"></div>
-    <h1 class="title"></h1>
+    <h1 class="title">Fuseki: SPARQL and RDF Standards</h1>
   <style type="text/css">
 /* The following code is added by mdx_elementid.py
    It was originally lifted from http://subversion.apache.org/style/site.css */
@@ -155,7 +155,6 @@
   visibility: hidden;
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
-<h1 id="sparql-and-rdf-standards">SPARQL and RDF Standards<a class="headerlink" href="#sparql-and-rdf-standards" title="Permanent link">&para;</a></h1>
 <h2 id="sparql-standards">SPARQL Standards<a class="headerlink" href="#sparql-standards" title="Permanent link">&para;</a></h2>
 <p>The relevant SPARQL 1.1 standards are:</p>
 <ul>

Modified: websites/staging/jena/trunk/content/documentation/fuseki2/soh.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/fuseki2/soh.html (original)
+++ websites/staging/jena/trunk/content/documentation/fuseki2/soh.html Fri Aug 12 09:29:04 2016
@@ -19,7 +19,7 @@
     limitations under the License.
 -->
 
-  <title>Apache Jena - </title>
+  <title>Apache Jena - SOH - SPARQL over HTTP</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -143,7 +143,7 @@
     <div class="row">
     <div class="col-md-12">
     <div id="breadcrumbs"></div>
-    <h1 class="title"></h1>
+    <h1 class="title">SOH - SPARQL over HTTP</h1>
   <style type="text/css">
 /* The following code is added by mdx_elementid.py
    It was originally lifted from http://subversion.apache.org/style/site.css */
@@ -155,7 +155,6 @@
   visibility: hidden;
 }
 h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
-<h1 id="soh-sparql-over-http">SOH - SPARQL over HTTP<a class="headerlink" href="#soh-sparql-over-http" title="Permanent link">&para;</a></h1>
 <p><strong>SOH</strong> (SPARQL Over HTTP) is a set of command-line scripts for
 working with SPARQL 1.1. SOH is server-independent and will work
 with any compliant SPARQL 1.1 system offering HTTP access.</p>