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/12/19 20:28:06 UTC
svn commit: r933385 - in /websites/staging/jena/trunk/content: ./
documentation/fuseki2/fuseki-data-services.html
documentation/fuseki2/fuseki-logging.html
documentation/fuseki2/fuseki-main.html
Author: buildbot
Date: Fri Dec 19 19:28:06 2014
New Revision: 933385
Log:
Staging update by buildbot for jena
Modified:
websites/staging/jena/trunk/content/ (props changed)
websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-data-services.html
websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-logging.html
websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-main.html
Propchange: websites/staging/jena/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Dec 19 19:28:06 2014
@@ -1 +1 @@
-1645607
+1646842
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 Dec 19 19:28:06 2014
@@ -150,6 +150,12 @@ SPARQL update and file upload.</p>
<p>URI scheme.
Datasets and services
Admin</p>
+<h2 id="sparql-protocol">SPARQL Protocol</h2>
+<p>Queyr
+update
+GSP including direct naming for GSP</p>
+<p>in addition:</p>
+<p>Dataset as a set of quads.</p>
<hr />
<blockquote>
<p><em>@@ Just rough notes : out-of-date and inconsistent</em></p>
@@ -160,7 +166,7 @@ SPARQL update and file upload.</p>
<p>where <code>name</code> is</p>
<p>and <code>endpoint</code> is</p>
<p>In the administration operations, the name is used after the </p>
-<p>/</p>
+<p>/$/</p>
<p>e.g. </p>
<p>In administration operations, the dataset name is appended to the operation. For
example, <code>http://host:port/$/datasets/ds</code> accesses the assembler description
@@ -168,6 +174,34 @@ of the dataset.</p>
<p>There is also an internal name, generated by the server which is a UUID.
This UUID is never reused even if the dataset name is reused after the
first use is deleted.</p>
+<h2 id="services-and-datasets">Services and Datasets</h2>
+<p>Service </p>
+<h3 id="query">Query</h3>
+<div class="codehilite"><pre><span class="n">GEThttp</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="p">:</span><span class="n">port</span><span class="o">/</span><span class="n">dataset</span>?<span class="n">query</span><span class="p">=..</span>
+
+<span class="n">POST</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="p">:</span><span class="n">port</span><span class="o">/</span><span class="n">dataset</span>
+<span class="n">Content</span><span class="o">-</span><span class="n">type</span><span class="p">:</span> <span class="n">application</span><span class="o">/</span><span class="n">sparql</span><span class="o">-</span><span class="n">query</span>
+</pre></div>
+
+
+<h3 id="update">Update</h3>
+<div class="codehilite"><pre><span class="n">POST</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="p">:</span><span class="n">port</span><span class="o">/</span><span class="n">dataset</span>?<span class="n">update</span><span class="p">=...</span>
+<span class="n">POST</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="p">:</span><span class="n">port</span><span class="o">/</span><span class="n">dataset</span>?<span class="n">update</span>
+</pre></div>
+
+
+<p>or</p>
+<div class="codehilite"><pre><span class="n">POST</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="p">:</span><span class="n">port</span><span class="o">/</span><span class="n">dataset</span>
+<span class="n">Content</span><span class="o">-</span><span class="n">type</span><span class="p">:</span> <span class="n">application</span><span class="o">/</span><span class="n">sparql</span><span class="o">-</span><span class="n">update</span>
+</pre></div>
+
+
+<h3 id="gsp">GSP</h3>
+<div class="codehilite"><pre><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="p">:</span><span class="n">port</span><span class="o">/</span><span class="n">dataset</span>?<span class="n">default</span>
+<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="p">:</span><span class="n">port</span><span class="o">/</span><span class="n">dataset</span>?<span class="n">graph</span><span class="p">=...</span>
+</pre></div>
+
+
<h2 id="the-dataset-lifecycle">The Dataset Lifecycle</h2>
<p>The lifecycle of a dataset </p>
<ul>
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 Dec 19 19:28:06 2014
@@ -144,11 +144,11 @@
<div id="breadcrumbs"></div>
<h1 class="title"></h1>
<h1 id="fuseki-logging">Fuseki Logging</h1>
-<p>Fuseki logs separately from any web application server it is used in.<br />
-Logging is enabaled by default.</p>
-<p>The server uses a number of logs,
-which can be controlled with <code>log4j</code>.
-A <code>log4j.properties</code> file in the FUSEKI_BASE directory overrides the built configuration.</p>
+<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/].
+Logging output is controlled via log4j.</p>
+<h2 id="server-logs">Server Logs</h2>
<table>
<thead>
<tr>
@@ -158,6 +158,14 @@ A <code>log4j.properties</code> file in
</thead>
<tbody>
<tr>
+<td>org.apache.jena.fuseki.Server</td>
+<td>General Server Messages</td>
+</tr>
+<tr>
+<td>org.apache.jena.fuseki.Request</td>
+<td>NCSA request Log.</td>
+</tr>
+<tr>
<td>org.apache.jena.fuseki.Fuseki</td>
<td>The HTTP request log</td>
</tr>
@@ -173,16 +181,32 @@ A <code>log4j.properties</code> file in
<td>org.apache.jena.fuseki.Config</td>
<td>Configuration</td>
</tr>
-<tr>
-<td>org.apache.jena.fuseki.Server</td>
-<td>General Server Messages</td>
-</tr>
</tbody>
</table>
+<h2 id="ncsa-request-log">NCSA request Log.</h2>
+<p>This log is in NCSA extended/combined log format.<br />
+Many web log analysers can process this format.</p>
+<p>This log is normally off.</p>
+<p>When run as a WAR file inside a webapp container
+(e.g. <a href="http://tomcat.apache.org/">Apache Tomcat</a>), the webapp container
+or reverse proxy will log access requests anyway. </p>
+<h2 id="setting-logging">Setting logging</h2>
+<p>The Fuseki engine looks for the log4j configuration as follows:</p>
+<ul>
+<li>Use system property <code>log4j.configuration</code> if defined (as usual for log4j).</li>
+<li>Use <code>file:log4j.properties</code> (current directory) if it exists</li>
+<li>Use file <code>log4j.properties</code> is the directory defined by <code>FUSEKI_BASE</code></li>
+<li>Use any <code>log4j.properties</code> on the classpath.</li>
+<li>Use the built-in <code>org/apache/jena/fuseki/log4j.properties</code> on the classpath.</li>
+<li>Use a built-in configuration.</li>
+</ul>
+<p>The laststep is a fallback to catch the case where Fuseki has been repackaged
+into a new WAR file and <code>org/apache/jena/fuseki/log4j.properties</code> omitted, or run from
+the base jar. It is better to include <code>org/apache/jena/fuseki/log4j.properties</code></p>
<h2 id="logrotate">Logrotate</h2>
-<p>Below is an example logrotate(1) configuration (to go in <code>/etc/logrotate.d</code>)
-based on the default service mode deployment.
-It rotates the logs once a month, compresses logs on rotation and keeps them for 6 months.</p>
+<p>Below is an example logrotate(1) configuration (to go in <code>/etc/logrotate.d</code>)
+assuming the log file has been put in <code>/etc/fuseki/logs/fuseki.log</code>.</p>
+<p>It rotates the logs once a month, compresses logs on rotation and keeps them for 6 months.</p>
<p>It uses <code>copytruncate</code>. This may lead to at most one broken log file line.</p>
<div class="codehilite"><pre><span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">fuseki</span><span class="o">/</span><span class="n">logs</span><span class="o">/</span><span class="n">fuseki</span><span class="p">.</span><span class="nb">log</span>
<span class="p">{</span>
Modified: websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-main.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-main.html (original)
+++ websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-main.html Fri Dec 19 19:28:06 2014
@@ -167,8 +167,8 @@ for other RDF query and storage systems.
</ul>
</li>
<li>Architecture<ul>
-<li><a href="fuseki-data-services.html">Server URI scheme</a></li>
-<li><a href="fuseki-server-protocol.html">Server Protocol</a></li>
+<li><a href="fuseki-data-services.html">Server URI scheme : services and datasets</a></li>
+<li><a href="fuseki-server-protocol.html">Server Admin Protocol</a></li>
</ul>
</li>
<li><a href="fuseki-configuration.html">Fuseki Configuration</a></li>