You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/02/11 11:03:31 UTC

svn commit: r1444706 - in /jena/site/trunk/content/documentation: query/explain.mdtext query/index.mdtext query/logging.mdtext query/sparql-remote.mdtext sdb/fuseki_integration.mdtext sdb/joseki_integration.mdtext serving_data/soh.mdtext

Author: andy
Date: Mon Feb 11 10:03:30 2013
New Revision: 1444706

URL: http://svn.apache.org/r1444706
Log:
Joseki -> Fuseki

Added:
    jena/site/trunk/content/documentation/sdb/fuseki_integration.mdtext
      - copied, changed from r1444695, jena/site/trunk/content/documentation/sdb/joseki_integration.mdtext
Removed:
    jena/site/trunk/content/documentation/sdb/joseki_integration.mdtext
Modified:
    jena/site/trunk/content/documentation/query/explain.mdtext
    jena/site/trunk/content/documentation/query/index.mdtext
    jena/site/trunk/content/documentation/query/logging.mdtext
    jena/site/trunk/content/documentation/query/sparql-remote.mdtext
    jena/site/trunk/content/documentation/serving_data/soh.mdtext

Modified: jena/site/trunk/content/documentation/query/explain.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/query/explain.mdtext?rev=1444706&r1=1444705&r2=1444706&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/query/explain.mdtext (original)
+++ jena/site/trunk/content/documentation/query/explain.mdtext Mon Feb 11 10:03:30 2013
@@ -28,6 +28,7 @@ which applies all optimizations.
 Other useful arguments are:
 
 **qparse arguments**
+
 Argument | Effect
 -------- | -----
 `--print=query` | Print the parsed query

Modified: jena/site/trunk/content/documentation/query/index.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/query/index.mdtext?rev=1444706&r1=1444705&r2=1444706&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/query/index.mdtext (original)
+++ jena/site/trunk/content/documentation/query/index.mdtext Mon Feb 11 10:03:30 2013
@@ -83,7 +83,7 @@ support for the submission is for legacy
 
 ## See Also
 
-- [Joseki](http://www.joseki.org) - Server implementation of the SPARQL protocol.
+- [Fuseki](../serving/data/index.html) - Server implementation of the SPARQL protocol.
 - [TDB - A SPARQL database for Jena](../tdb), a pure Java persistence layer for large graphs, high performance applications and embedded use.
 - [SDB - A SPARQL database for Jena](../sdb), using SQL databases.
 

Modified: jena/site/trunk/content/documentation/query/logging.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/query/logging.mdtext?rev=1444706&r1=1444705&r2=1444706&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/query/logging.mdtext (original)
+++ jena/site/trunk/content/documentation/query/logging.mdtext Mon Feb 11 10:03:30 2013
@@ -56,8 +56,8 @@ Example log4j.properties file:
     log4j.logger.com.hp.hpl.jena=WARN
     log4j.logger.org.openjena=WARN
 
-[Joseki](http://joseki.org/ "http://joseki.org/") server output can
-include [ARQ execution logging](http://openjena.org/wiki/ARQ/Explain "ARQ/Explain").
+A [Fuseki](../serving/data/index.html)
+server output can include [ARQ execution logging](explain.html "ARQ/Explain").
 
 Note: ARQ performs some direct control of logging in the test suite and
 depends on log4j to compile.

Modified: jena/site/trunk/content/documentation/query/sparql-remote.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/query/sparql-remote.mdtext?rev=1444706&r1=1444705&r2=1444706&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/query/sparql-remote.mdtext (original)
+++ jena/site/trunk/content/documentation/query/sparql-remote.mdtext Mon Feb 11 10:03:30 2013
@@ -6,13 +6,11 @@ SPARQL is a
 The remote access protocol can be used with plain HTTP or over
 [SOAP](http://www.w3.org/TR/soap12-part0/).
 
-See [Joseki](http://www.joseki.org/) for an implementation of an
-RDF publishing server, using the SPARQL protocol (HTTP and SOAP).
-Joseki uses ARQ to provide SPARQL query access to Jena models,
-including Jena persistent models.
+See [Fuseki](../serving_data/index.html) for an implementation of the
+SPARQL protocol over HTTP. Fuseki uses ARQ to provide SPARQL 
+query access to Jena models, including Jena persistent models.
 
-ARQ includes a query engine capable of using the HTTP version. A
-version using SOAP is include in Joseki.
+ARQ includes a query engine capable of using the HTTP version.
 
 ## From your application
 

Copied: jena/site/trunk/content/documentation/sdb/fuseki_integration.mdtext (from r1444695, jena/site/trunk/content/documentation/sdb/joseki_integration.mdtext)
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/sdb/fuseki_integration.mdtext?p2=jena/site/trunk/content/documentation/sdb/fuseki_integration.mdtext&p1=jena/site/trunk/content/documentation/sdb/joseki_integration.mdtext&r1=1444695&r2=1444706&rev=1444706&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/sdb/joseki_integration.mdtext (original)
+++ jena/site/trunk/content/documentation/sdb/fuseki_integration.mdtext Mon Feb 11 10:03:30 2013
@@ -1,11 +1,11 @@
-Title: SDB Joseki Integration
+Title: SDB Fuseki Integration
 
-[Joseki](http://www.joseki.org "http://www.joseki.org") is a server
+[Fuseki](../serving_data/index.html "Apache Jena Fuseki") is a server
 that implements the SPARQL protocol for HTTP. It can be used to
 give a SPARQL interface to an SDB installation.
 
-The Joseki server needs the SDB jar files on its classpath. The
-Joseki configuration file needs to contain two triples to integrate
+The Fuseki server needs the SDB jar files on its classpath. The
+Fuseki configuration file needs to contain two triples to integrate
 SDB:
 
     ## Initialize SDB.
@@ -14,7 +14,7 @@ SDB:
     ## Declare that sdb:DatasetStore is an implementation of ja:RDFDataset .
     sdb:DatasetStore rdfs:subClassOf ja:RDFDataset .
 
-then a Joseki service can use an SBD-implemented dataset:
+then a Fuseki service can use an SBD-implemented dataset:
 
     <#books> rdf:type sdb:DatasetStore ;
        sdb:store <#store> .
@@ -30,34 +30,7 @@ then a Joseki service can use an SBD-imp
         ]
         .
 
-To enable pooling of connections to the SDB store, use the
-joseki:poolSize property. This causes Joseki to create a pool of
-SDB datasets, each with it's own JDBC connection. This requires
-Joseki 3.2.
-
-    <#sdb> rdf:type sdb:DatasetStore ;
-        joseki:poolSize     5 ;         # Number of concurrent connections allowed to this dataset.
-        sdb:store <#store> .
-
-SDB 1.0:
-
-    ## Dataset in SDB.
-    <#books> rdf:type sdb:DatasetStore , ja:RDFDataset ;
-        rdfs:label       "Books" ;
-        sdb:layout       "layout2" ;
-        sdb:connection
-        [  rdf:type sdb:SDBConnection ;
-           sdb:sdbType        "postgresql" ;
-           sdb:sdbHost        "localhost" ;
-           sdb:sdbName        "SDB" ;
-        ]
-        .
-
 The database installation does not need to accept public requests,
-it needs only to be accessible to the Joseki server itself.
-
-There is an example configuration file for a Joseki server using
-SDB in the Joseki distribution.
-
+it needs only to be accessible to the Fuseki server itself.
 
 

Modified: jena/site/trunk/content/documentation/serving_data/soh.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/serving_data/soh.mdtext?rev=1444706&r1=1444705&r2=1444706&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/serving_data/soh.mdtext (original)
+++ jena/site/trunk/content/documentation/serving_data/soh.mdtext Mon Feb 11 10:03:30 2013
@@ -14,7 +14,7 @@ Commands:
 -   `s-query` – SPARQL 1.1 Query, both GET and POST of queries.
 -   `s-update` – SPARQL 1.1 Update
 -   `s-update-form` – SPARQL 1.1 Update using the HTML form and a
-    parameter of `request=` (compatible with Joseki).
+    parameter of `request=`.
 
 Each command supports the `-v` flag to print out details of the
 HTTP interaction.
@@ -84,21 +84,3 @@ then the service endpoints are:
 -   HTTP: `http://localhost:3030/dataset/data`
 -   Query: `http://localhost:3030/dataset/query`
 -   Update: `http://localhost:3030/dataset/update`
-
-### Joseki
-
-[Joseki](http://www.joseki.org/) allows a
-choice of server endpoint names in the configuration file.
-
-Used with the default configuration file joseki-config.ttl:
-
--   Query:
-    -   `http://localhost:2020/books` -- example books database
-    -   `http://localhost:2020/sparql` -- general purpose SPARQL query
-        engine
-    -   `http://localhost:2020/sparql/read` -- companion to updatable
-        dataset (if enabled)
-
--   Update: `http://localhost:2020/update/service` (if enabled)
--   HTTP: Not supported
-