Mailing-List: contact commits-help@jena.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@jena.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1646842 - in
 /jena/site/trunk/content/documentation/fuseki2:
 fuseki-data-services.mdtext fuseki-logging.mdtext fuseki-main.mdtext
Date: Fri, 19 Dec 2014 19:27:47 -0000
To: commits@jena.apache.org
From: andy@apache.org
Message-Id: <20141219192747.4620DAC08A8@hades.apache.org>

Author: andy
Date: Fri Dec 19 19:27:46 2014
New Revision: 1646842

URL: http://svn.apache.org/r1646842
Log:
Logging

Modified:
    jena/site/trunk/content/documentation/fuseki2/fuseki-data-services.mdtext
    jena/site/trunk/content/documentation/fuseki2/fuseki-logging.mdtext
    jena/site/trunk/content/documentation/fuseki2/fuseki-main.mdtext

Modified: jena/site/trunk/content/documentation/fuseki2/fuseki-data-services.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/fuseki2/fuseki-data-services.mdtext?rev=1646842&r1=1646841&r2=1646842&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/fuseki2/fuseki-data-services.mdtext (original)
+++ jena/site/trunk/content/documentation/fuseki2/fuseki-data-services.mdtext Fri Dec 19 19:27:46 2014
@@ -8,6 +8,17 @@ URI scheme.
   Datasets and services
   Admin
 
+## SPARQL Protocol
+
+Queyr
+update
+GSP including direct naming for GSP
+
+in addition:
+
+Dataset as a set of quads.
+
+
 ----------------------------
 
 > _@@ Just rough notes : out-of-date and inconsistent_
@@ -25,7 +36,7 @@ and `endpoint` is
 
 In the administration operations, the name is used after the 
 
-   /
+   /$/
 
 e.g. 
 
@@ -37,6 +48,33 @@ There is also an internal name, generate
 This UUID is never reused even if the dataset name is reused after the
 first use is deleted.
 
+## Services and Datasets
+
+Service 
+
+### Query
+
+    GEThttp://host:port/dataset?query=..
+
+    POST http://host:port/dataset
+    Content-type: application/sparql-query
+
+### Update
+
+    POST http://host:port/dataset?update=...
+    POST http://host:port/dataset?update
+
+or
+
+    POST http://host:port/dataset
+    Content-type: application/sparql-update
+
+### GSP
+
+    http://host:port/dataset?default
+    http://host:port/dataset?graph=...
+
+
 ## The Dataset Lifecycle
 
 The lifecycle of a dataset 

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=1646842&r1=1646841&r2=1646842&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/fuseki2/fuseki-logging.mdtext (original)
+++ jena/site/trunk/content/documentation/fuseki2/fuseki-logging.mdtext Fri Dec 19 19:27:46 2014
@@ -1,25 +1,53 @@
 # Fuseki Logging
 
-Fuseki logs separately from any web application server it is used in.  
-Logging is enabaled by default.
+Fuseki logs operation details and also provides a standard NCSA request log.  
 
-The server uses a number of logs, 
-which can be controlled with `log4j`.
-A `log4j.properties` file in the FUSEKI_BASE directory overrides the built configuration.
-
-| Full Log name | Usage |
-|---------------|-------|
-| org.apache.jena.fuseki.Fuseki   | The HTTP request log     |
-| org.apache.jena.fuseki.Admin    | Administration operations |
+Logging is via [slj4j](http://slf4j.org/) over 
+(Apache Log4J)[http://logging.apache.org/log4j/].
+Logging output is controlled via log4j.
+
+## Server Logs
+
+| Full Log name                   | Usage |
+|---------------                  |-------|
+| org.apache.jena.fuseki.Server   | General Server Messages              |
+| org.apache.jena.fuseki.Request  | NCSA request Log.                    |
+| org.apache.jena.fuseki.Fuseki   | The HTTP request log                 |
+| org.apache.jena.fuseki.Admin    | Administration operations            |
 | org.apache.jena.fuseki.Builder  | Dataset and service build operations |
-| org.apache.jena.fuseki.Config   | Configuration            |
-| org.apache.jena.fuseki.Server   | General Server Messages  |
+| org.apache.jena.fuseki.Config   | Configuration                        |
 
+## NCSA request Log. 
+
+This log is in NCSA extended/combined log format.  
+Many web log analysers can process this format.
+
+This log is normally off.
+
+When run as a WAR file inside a webapp container 
+(e.g. [Apache Tomcat](http://tomcat.apache.org/)), the webapp container
+or reverse proxy will log access requests anyway. 
+
+## Setting logging
+
+The Fuseki engine looks for the log4j configuration as follows:
+
+* 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 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`
 
 ## Logrotate
 
-Below is an example logrotate(1) configuration (to go in `/etc/logrotate.d`) 
-based on the default service mode deployment.
+Below is an example logrotate(1) configuration (to go in `/etc/logrotate.d`)
+assuming the log file has been put in `/etc/fuseki/logs/fuseki.log`.
+
 It rotates the logs once a month, compresses logs on rotation and keeps them for 6 months.
 
 It uses `copytruncate`.  This may lead to at most one broken log file line.

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=1646842&r1=1646841&r2=1646842&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/fuseki2/fuseki-main.mdtext (original)
+++ jena/site/trunk/content/documentation/fuseki2/fuseki-main.mdtext Fri Dec 19 19:27:46 2014
@@ -24,8 +24,8 @@ for other RDF query and storage systems.
     - [As a service](fuseki-run.html#fuseki-as-a-service)
     - [As a standalone server](fuseki-run.html#fuseki-as-a-standalone server)
 - Architecture
-    - [Server URI scheme](fuseki-data-services.html)
-    - [Server Protocol](fuseki-server-protocol.html)
+    - [Server URI scheme : services and datasets](fuseki-data-services.html)
+    - [Server Admin Protocol](fuseki-server-protocol.html)
 - [Fuseki Configuration](fuseki-configuration.html)
 - [Logging](fuseki-logging.html)
 - [How to Contribute](#how-to-contribute)