Author: buildbot
Date: Sun Feb 22 10:21:17 2015
New Revision: 941044
Log:
Staging update by buildbot for jena
Modified:
websites/staging/jena/trunk/content/ (props changed)
websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-logging.html
websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-main.html
websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-run.html
websites/staging/jena/trunk/content/documentation/fuseki2/fuseki-server-protocol.html
Propchange: websites/staging/jena/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Feb 22 10:21:17 2015
@@ -1 +1 @@
-1661430
+1661468
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
Sun Feb 22 10:21:17 2015
@@ -195,13 +195,19 @@ or reverse proxy will log access request
<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 java resource <code>log4j.properties</code> on the classpath.</li>
+<li>Use java resource <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>
+the base jar. It is better to include
<code>org/apache/jena/fuseki/log4j.properties</code>.</p>
+<p>The preferred customization is to use a custom
<code>log4j.properties</code> file in
+<code>FUSEKI_BASE</code>. For the WAR file, <code>FUSEKI_BASE</code> defaults
to <code>/etc/fuseki</code>
+on Linux. For the standalone server, <code>FUSEKI_BASE</code> defaults to
directory
+<code>run/</code> within the directory where the server is run.</p>
+<h2 id="default-setting">Default setting</h2>
+<p>The <a
href="https://github.com/apache/jena/blob/master/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/log4j.properties";>default
log4j.properties</a>.</p>
<h2 id="logrotate">Logrotate</h2>
<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>
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
Sun Feb 22 10:21:17 2015
@@ -143,17 +143,20 @@
<div id="breadcrumbs"></div>
<h1 class="title"></h1>
<h2 id="apache-jena-fuseki">Apache Jena Fuseki</h2>
-<p>Apache Jena Fuseki is a SPARQL server. It can run as a operating system
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>Apache Jena Fuseki is a SPARQL server. It can run as a operating system
+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 <a href="http://www.w3.org/TR/sparql11-http-rdf-update/";>SPARQL
Graph Store protocol</a>.</p>
+<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>. It can be used
to provide the protocol engine
-for other RDF query and storage systems.</p>
+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 />
+It can be used to provide the protocol engine for other RDF query and
+storage systems.</p>
<h2 id="contents">Contents</h2>
<ul>
<li><a href="#download-fuseki">Download</a></li>
@@ -232,22 +235,26 @@ preference to using any older versions o
<p>Previous Apache Jena releases can be found in the Apache archive area
at <a
href="http://archive.apache.org/dist/jena/";>http://archive.apache.org/dist/jena</a></p>
<h3 id="development-builds">Development Builds</h3>
-<p>Regular developement builds of all of Jena are available (these are not
formal releases)
-from the <a
href="https://repository.apache.org/snapshots/org/apache/jena";>Apache snapshots
maven repository</a>.
+<p>Regular developement builds of all of Jena are available (these are not
+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</h2>
-<p>This section serves as a basic guide to getting a Fuskei server running on
your local machine.
-See <a href="fuseki-run.html">other sections</a> for complete coverage of all
the deployment methods for Fuseki.</p>
+<p>This section serves as a basic guide to getting a Fuskei server running on
+your local machine. See <a href="fuseki-run.html">other sections</a> for
complete
+coverage of all the deployment methods for Fuseki.</p>
<h2 id="how-to-contribute">How to Contribute</h2>
-<p>We welcome contributions towards making Jena a better platform for semantic
web and linked data applications.
-We appreciate feature suggestions, bug reports and patches for code or
documentation.</p>
-<p>See "<a href="/getting_involved/index.html">Getting Involved</a>" for ways
to contribute to Jena and Fuseki,
-including patches and making github pull-requests.</p>
+<p>We welcome contributions towards making Jena a better platform for semantic
+web and linked data applications. We appreciate feature suggestions, bug
+reports and patches for code or documentation.</p>
+<p>See "<a href="/getting_involved/index.html">Getting Involved</a>" for ways
to
+contribute to Jena and Fuseki, including patches and making github
+pull-requests.</p>
<h3 id="source-code">Source code</h3>
<p>The development codebase is available from git.</p>
<p>Development builds (not a formal release):
<a
href="https://repository.apache.org/content/repositories/snapshots/org/apache/jena/jena-fuseki/";>SNAPSHOT</a></p>
-<p>Source code:
+<p>Source code mirrored to github:
<a
href="https://github.com/apache/jena/jena-fuseki2";>https://github.com/apache/jena/jena-fuseki2</a></p>
</div>
</div>
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
Sun Feb 22 10:21:17 2015
@@ -149,9 +149,10 @@
<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>
</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>
+<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</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>
@@ -163,21 +164,33 @@ internally but the scripts used here wil
<p>where <code>/NAME</code> is the dataset publishing name at this server in
URI space.</p>
<p>See <code>fuseki-server --help</code> for details of more arguments.</p>
-<p><code>FUSEKI_BASE</code>, the runtime area for the server instance,
defaults to the <code>run/</code> directory of the current directory.</p>
-<p>Fuseki v2 supports the same style of configuration file as Fuseki v1 but it
is better to separate the data service definitions from the server
configuration with one definition per file in
<code>FUSEKI_BASE/configuration</code>; see "<a
href="fuseki-configuration.html">Fuseki Configuration</a>". </p>
-<p>If you get the error message <code>Can't find jarfile to run</code> then
you either need to put a copy of <code>fuseki-server.jar</code> in the current
directory or set the environment variable <code>FUSEKI_HOME</code> to point to
an unpacked Fuseki distribution.</p>
+<p><code>FUSEKI_BASE</code>, the runtime area for the server instance,
defaults to the
+<code>run/</code> directory of the current directory.</p>
+<p>Fuseki v2 supports the same style of configuration file as Fuseki v1 but it
+is better to separate the data service definitions from the server
+configuration with one definition per file in
<code>FUSEKI_BASE/configuration</code>;
+see "<a href="fuseki-configuration.html">Fuseki Configuration</a>".</p>
+<p>If you get the error message <code>Can't find jarfile to run</code> then
you either
+need to put a copy of <code>fuseki-server.jar</code> in the current directory
or set
+the environment variable <code>FUSEKI_HOME</code> to point to an unpacked
Fuseki
+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</h2>
<p>Fuseki can run from a <a
href="http://en.wikipedia.org/wiki/WAR_%28file_format%29";>WAR</a> file.</p>
<p><code>FUSEKI_HOME</code> is not applicable.</p>
-<p><code>FUSEKI_BASE</code> defaults to <code>/etc/fuseki</code> which must be
a writeable directory. It is initialised the first time Fuseki runs, including
a <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>
+<p><code>FUSEKI_BASE</code> defaults to <code>/etc/fuseki</code> which must be
a writeable
+directory. It is initialised the first time Fuseki runs, including a
+<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</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>
+<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>
</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
Sun Feb 22 10:21:17 2015
@@ -146,7 +146,9 @@
<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>
+<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>
<ul>
<li><a href="#operations">Operations</a></li>
<li><a href="#server-information">Server Information</a></li>
@@ -158,9 +160,8 @@
</li>
<li><a href="#remove-dataset">Removing a dataset</a></li>
</ul>
-<p>These are enabled by starting the server with argument
<code>--mgt</code>.</p>
-<p>All admin operations have URL paths starting <code>/$/</code> to avoid
clashes
-with dataset names and this prefix is reserved for the Fuseki control
functions.
+<p>All admin operations have URL paths starting <code>/$/</code> to avoid
clashes with
+dataset names and this prefix is reserved for the Fuseki control functions.
Further operations may be added within this naming scheme.</p>
<h2 id="operations">Operations</h2>
<table>
