Author: andy
Date: Sun Feb 22 10:20:57 2015
New Revision: 1661468
URL: http://svn.apache.org/r1661468
Log:
Updates for fuseki2
Modified:
jena/site/trunk/content/documentation/fuseki2/fuseki-logging.mdtext
jena/site/trunk/content/documentation/fuseki2/fuseki-main.mdtext
jena/site/trunk/content/documentation/fuseki2/fuseki-run.mdtext
jena/site/trunk/content/documentation/fuseki2/fuseki-server-protocol.mdtext
Modified: jena/site/trunk/content/documentation/fuseki2/fuseki-logging.mdtext
URL:
http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/fuseki2/fuseki-logging.mdtext?rev=1661468&r1=1661467&r2=1661468&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/fuseki2/fuseki-logging.mdtext
(original)
+++ jena/site/trunk/content/documentation/fuseki2/fuseki-logging.mdtext Sun Feb
22 10:20:57 2015
@@ -35,13 +35,22 @@ The Fuseki engine looks for the log4j co
* Use system property `log4j.configuration` if defined (as usual for log4j).
* Use `file:log4j.properties` (current directory) if it exists
* Use file `log4j.properties` is the directory defined by `FUSEKI_BASE`
-* Use any `log4j.properties` on the classpath.
-* Use the built-in `org/apache/jena/fuseki/log4j.properties` on the classpath.
+* Use java resource `log4j.properties` on the classpath.
+* Use java resource `org/apache/jena/fuseki/log4j.properties` on the classpath.
* Use a built-in configuration.
The laststep is a fallback to catch the case where Fuseki has been repackaged
into a new WAR file and `org/apache/jena/fuseki/log4j.properties` omitted, or
run from
-the base jar. It is better to include
`org/apache/jena/fuseki/log4j.properties`
+the base jar. It is better to include
`org/apache/jena/fuseki/log4j.properties`.
+
+The preferred customization is to use a custom `log4j.properties` file in
+`FUSEKI_BASE`. For the WAR file, `FUSEKI_BASE` defaults to `/etc/fuseki`
+on Linux. For the standalone server, `FUSEKI_BASE` defaults to directory
+`run/` within the directory where the server is run.
+
+## Default setting
+
+The [default
log4j.properties](https://github.com/apache/jena/blob/master/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/log4j.properties).
## Logrotate
Modified: jena/site/trunk/content/documentation/fuseki2/fuseki-main.mdtext
URL:
http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/fuseki2/fuseki-main.mdtext?rev=1661468&r1=1661467&r2=1661468&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/fuseki2/fuseki-main.mdtext (original)
+++ jena/site/trunk/content/documentation/fuseki2/fuseki-main.mdtext Sun Feb 22
10:20:57 2015
@@ -1,18 +1,21 @@
## Apache Jena Fuseki
-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 [Apache Shiro](https://shiro.apache.org/)) and has a user interface for
server
-monitoring and administration.
+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 [Apache Shiro](https://shiro.apache.org/)) and
+has a user interface for server monitoring and administration.
It provides the SPARQL 1.1
-[protocols for query and update](http://www.w3.org/TR/sparql11-protocol/)
-as well as the [SPARQL Graph Store
protocol](http://www.w3.org/TR/sparql11-http-rdf-update/).
+[protocols for query and update](http://www.w3.org/TR/sparql11-protocol/)
+as well as the
+[SPARQL Graph Store protocol](http://www.w3.org/TR/sparql11-http-rdf-update/).
Fuseki is tightly integrated with [TDB](../tdb/index.html) to provide a robust,
-transactional persistent storage layer, and incorporates [Jena text
query](../query/text-query.html)
-and [Jena spatial query](query/spatial-query.html). It can be used to provide
the protocol engine
-for other RDF query and storage systems.
+transactional persistent storage layer, and incorporates
+[Jena text query](../query/text-query.html)
+and [Jena spatial query](query/spatial-query.html).
+It can be used to provide the protocol engine for other RDF query and
+storage systems.
## Contents
@@ -79,22 +82,26 @@ at [http://archive.apache.org/dist/jena]
### Development Builds
-Regular developement builds of all of Jena are available (these are not formal
releases)
-from the [Apache snapshots maven
repository](https://repository.apache.org/snapshots/org/apache/jena).
+Regular developement builds of all of Jena are available (these are not
+formal releases) from the
+[Apache snapshots maven
repository](https://repository.apache.org/snapshots/org/apache/jena).
This includes packaged builds of Fuseki.
## Getting Started With Fuseki
-This section serves as a basic guide to getting a Fuskei server running on
your local machine.
-See [other sections](fuseki-run.html) for complete coverage of all the
deployment methods for Fuseki.
+This section serves as a basic guide to getting a Fuskei server running on
+your local machine. See [other sections](fuseki-run.html) for complete
+coverage of all the deployment methods for Fuseki.
## How to Contribute
-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.
-
-See "[Getting Involved](/getting_involved/index.html)" for ways to contribute
to Jena and Fuseki,
-including patches and making github pull-requests.
+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.
+
+See "[Getting Involved](/getting_involved/index.html)" for ways to
+contribute to Jena and Fuseki, including patches and making github
+pull-requests.
### Source code
@@ -103,5 +110,5 @@ The development codebase is available fr
Development builds (not a formal release):
[SNAPSHOT](https://repository.apache.org/content/repositories/snapshots/org/apache/jena/jena-fuseki/)
-Source code:
+Source code mirrored to github:
[https://github.com/apache/jena/jena-fuseki2](https://github.com/apache/jena/jena-fuseki2)
Modified: jena/site/trunk/content/documentation/fuseki2/fuseki-run.mdtext
URL:
http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/fuseki2/fuseki-run.mdtext?rev=1661468&r1=1661467&r2=1661468&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/fuseki2/fuseki-run.mdtext (original)
+++ jena/site/trunk/content/documentation/fuseki2/fuseki-run.mdtext Sun Feb 22
10:20:57 2015
@@ -6,10 +6,11 @@ Fuseki can be run in three ways
* [As a Web Application](#fuseki-as-a-web-application) inside a container such
as Apache Tomcat or Jetty.
* [As a service](#fuseki-as-a-service) run by the operation system, for
example, started when the machine boots.
-@@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.
+@@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.
-See "[Fuseki Configuration](fuseki-configuration.html)" for information on how
to provides datasetsand configure services.
+See "[Fuseki Configuration](fuseki-configuration.html)" for information on
+how to provides datasetsand configure services.
## Fuseki as a Standalone Server
@@ -24,11 +25,18 @@ where `/NAME` is the dataset publishing
See `fuseki-server --help` for details of more arguments.
-`FUSEKI_BASE`, the runtime area for the server instance, defaults to the
`run/` directory of the current directory.
+`FUSEKI_BASE`, the runtime area for the server instance, defaults to the
+`run/` directory of the current directory.
-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 `FUSEKI_BASE/configuration`; see "[Fuseki
Configuration](fuseki-configuration.html)".
-
-If you get the error message `Can't find jarfile to run` then you either need
to put a copy of `fuseki-server.jar` in the current directory or set the
environment variable `FUSEKI_HOME` to point to an unpacked Fuseki distribution.
+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 `FUSEKI_BASE/configuration`;
+see "[Fuseki Configuration](fuseki-configuration.html)".
+
+If you get the error message `Can't find jarfile to run` then you either
+need to put a copy of `fuseki-server.jar` in the current directory or set
+the environment variable `FUSEKI_HOME` to point to an unpacked Fuseki
+distribution.
Unlike Fuseki v1, starting with no dataset and no configuration is possible.
Datasets can be added from the admin UI to a running server.
@@ -39,13 +47,18 @@ Fuseki can run from a [WAR](http://en.wi
`FUSEKI_HOME` is not applicable.
-`FUSEKI_BASE` defaults to `/etc/fuseki` which must be a writeable directory.
It is initialised the first time Fuseki runs, including a [Apache
Shiro](http://shiro.apache.org/) security file but
-this is only intended as a starting point. It restricts use of the admin UI
to the local machine.
+`FUSEKI_BASE` defaults to `/etc/fuseki` which must be a writeable
+directory. It is initialised the first time Fuseki runs, including a
+[Apache Shiro](http://shiro.apache.org/) security file but this is only
+intended as a starting point. It restricts use of the admin UI to the
+local machine.
## Fuseki as a Service
-Fuseki can run as an operating system service, started when the server machine
boots.
-The script `fuseki` is a Linux `init.d` with the common secondary arguments of
`start` and `stop`.
-
-Process arguments are read from `/etc/default/fuseki` including `FUSEKI_HOME`
and `FUSEKI_BASE`.
-`FUSEKI_HOME` should be the directory where the distribution was unpacked.
+Fuseki can run as an operating system service, started when the server
+machine boots. The script `fuseki` is a Linux `init.d` with the common
+secondary arguments of `start` and `stop`.
+
+Process arguments are read from `/etc/default/fuseki` including
+`FUSEKI_HOME` and `FUSEKI_BASE`. `FUSEKI_HOME` should be the directory
+where the distribution was unpacked.
Modified:
jena/site/trunk/content/documentation/fuseki2/fuseki-server-protocol.mdtext
URL:
http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/fuseki2/fuseki-server-protocol.mdtext?rev=1661468&r1=1661467&r2=1661468&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/fuseki2/fuseki-server-protocol.mdtext
(original)
+++ jena/site/trunk/content/documentation/fuseki2/fuseki-server-protocol.mdtext
Sun Feb 22 10:20:57 2015
@@ -2,7 +2,9 @@
> _These functions are available in version 2.0 and later._
-This page describes the HTTP Protocol used to control an Fuseki server via its
administrative interface. See "[Fuseki Administration](admin.html)" for an
overview of server administration.
+This page describes the HTTP Protocol used to control an Fuseki server via
+its administrative interface. See "[Fuseki Administration](admin.html)"
+for an overview of server administration.
* [Operations](#operations)
* [Server Information](#server-information)
@@ -12,12 +14,8 @@ This page describes the HTTP Protocol us
* Dormant and Active
* [Removing a dataset](#remove-dataset)
-These are enabled by starting the server with argument `--mgt`.
-
-
-
-All admin operations have URL paths starting `/$/` to avoid clashes
-with dataset names and this prefix is reserved for the Fuseki control
functions.
+All admin operations have URL paths starting `/$/` 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.
## Operations
