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 2019/01/29 09:43:20 UTC

svn commit: r1852425 - in /jena/site/trunk/content/documentation: migrate_jena2_jena3.mdtext query/spatial-query.mdtext query/text-query.mdtext sdb/dataset_description.mdtext sdb/fuseki_integration.mdtext serving_data/fuseki1.md tdb/assembler.mdtext

Author: andy
Date: Tue Jan 29 09:43:20 2019
New Revision: 1852425

URL: http://svn.apache.org/viewvc?rev=1852425&view=rev
Log:
Remove unnecessary ja:loadClass. Replace many @prefix with PREFIX

Modified:
    jena/site/trunk/content/documentation/migrate_jena2_jena3.mdtext
    jena/site/trunk/content/documentation/query/spatial-query.mdtext
    jena/site/trunk/content/documentation/query/text-query.mdtext
    jena/site/trunk/content/documentation/sdb/dataset_description.mdtext
    jena/site/trunk/content/documentation/sdb/fuseki_integration.mdtext
    jena/site/trunk/content/documentation/serving_data/fuseki1.md
    jena/site/trunk/content/documentation/tdb/assembler.mdtext

Modified: jena/site/trunk/content/documentation/migrate_jena2_jena3.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/migrate_jena2_jena3.mdtext?rev=1852425&r1=1852424&r2=1852425&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/migrate_jena2_jena3.mdtext (original)
+++ jena/site/trunk/content/documentation/migrate_jena2_jena3.mdtext Tue Jan 29 09:43:20 2019
@@ -30,8 +30,6 @@ Only java package names are being change
 Migration support is provided by mapping `ja:loadClass` names beginning
 `com.hp.hpl.jena` internally to `org.apache.jena`. A warning is logged.
 
-Any assemblers that 
-
 ### Logging
 
 This will also affect logging: logger names reflect the java class naming

Modified: jena/site/trunk/content/documentation/query/spatial-query.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/query/spatial-query.mdtext?rev=1852425&r1=1852424&r2=1852425&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/query/spatial-query.mdtext (original)
+++ jena/site/trunk/content/documentation/query/spatial-query.mdtext Tue Jan 29 09:43:20 2019
@@ -69,7 +69,7 @@ There are mainly 2 types of RDF represen
 
 **1) Latitude/Longitude Format (in gonames, DBPedia and Linked Geo Data)**
 
-    @prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
+    PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
     :EGBB rdf:type :LargeAirport ;
         geo:lat "52.4539"^^xsd:float ;
         geo:long "-1.74803"^^xsd:float .
@@ -79,7 +79,7 @@ There are mainly 2 types of RDF represen
 
 **2) Well Known Text (WKT) Literal (in DBPedia and Linked Geo Data)**
 
-    @prefix ogc: <http://www.opengis.net/ont/geosparql#> .
+    PREFIX ogc: <http://www.opengis.net/ont/geosparql#>
     :node1000032677 a :Geometry ;
         ogc:asWKT "POINT(7.338818000000001 51.4433324)"^^ogc:wktLiteral .
     airports:EGBB_Fake_In_Box rdf:type airports_sc:LargeAirport ;
@@ -172,24 +172,13 @@ Once setup this way, any data added to t
 The following is an example of a TDB dataset with a spatial index.
 
     ## Example of a TDB dataset and spatial index
-    
-    @prefix :        <http://localhost/jena_example/#> .
-    @prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-    @prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
-    @prefix tdb:     <http://jena.hpl.hp.com/2008/tdb#> .
-    @prefix ja:      <http://jena.hpl.hp.com/2005/11/Assembler#> .
-    @prefix spatial: <http://jena.apache.org/spatial#> .
-    
-    # TDB
-    [] ja:loadClass "org.apache.jena.tdb.TDB" .
-    tdb:DatasetTDB  rdfs:subClassOf  ja:RDFDataset .
-    tdb:GraphTDB    rdfs:subClassOf  ja:Model .
-    
-    # Spatial
-    [] ja:loadClass "org.apache.jena.query.spatial.SpatialQuery" .
-    spatial:SpatialDataset  rdfs:subClassOf  ja:RDFDataset .
-    #spatial:SpatialIndexSolr  rdfs:subClassOf  spatial:SpatialIndex .
-    spatial:SpatialIndexLucene  rdfs:subClassOf   spatial:SpatialIndex .
+
+    PREFIX :        <http://localhost/jena_example/#>
+    PREFIX rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+    PREFIX rdfs:    <http://www.w3.org/2000/01/rdf-schema#>
+    PREFIX tdb:     <http://jena.hpl.hp.com/2008/tdb#>
+    PREFIX ja:      <http://jena.hpl.hp.com/2005/11/Assembler#>
+    PREFIX spatial: <http://jena.apache.org/spatial#>
     
     ## ---------------------------------------------------------------
     ## This URI must be fixed - it's used to assemble the spatial dataset.

Modified: jena/site/trunk/content/documentation/query/text-query.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/query/text-query.mdtext?rev=1852425&r1=1852424&r2=1852425&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/query/text-query.mdtext (original)
+++ jena/site/trunk/content/documentation/query/text-query.mdtext Tue Jan 29 09:43:20 2019
@@ -616,21 +616,15 @@ indexed as well.
 
 The following is an example of a TDB dataset with a text index.
 
-    @prefix :        <http://localhost/jena_example/#> .
-    @prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-    @prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
-    @prefix tdb:     <http://jena.hpl.hp.com/2008/tdb#> .
-    @prefix ja:      <http://jena.hpl.hp.com/2005/11/Assembler#> .
-    @prefix text:    <http://jena.apache.org/text#> .
+    PREFIX :        <http://localhost/jena_example/#>
+    PREFIX rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+    PREFIX rdfs:    <http://www.w3.org/2000/01/rdf-schema#>
+    PREFIX tdb:     <http://jena.hpl.hp.com/2008/tdb#>
+    PREFIX ja:      <http://jena.hpl.hp.com/2005/11/Assembler#>
+    PREFIX text:    <http://jena.apache.org/text#>
 
     ## Example of a TDB dataset and text index
-    ## Initialize TDB
-    [] ja:loadClass "org.apache.jena.tdb.TDB" .
-    tdb:DatasetTDB  rdfs:subClassOf  ja:RDFDataset .
-    tdb:GraphTDB    rdfs:subClassOf  ja:Model .
 
-    ## Initialize text query
-    [] ja:loadClass       "org.apache.jena.query.text.TextQuery" .
     # A TextDataset is a regular dataset with a text index.
     text:TextDataset      rdfs:subClassOf   ja:RDFDataset .
     # Lucene index

Modified: jena/site/trunk/content/documentation/sdb/dataset_description.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/sdb/dataset_description.mdtext?rev=1852425&r1=1852424&r2=1852425&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/sdb/dataset_description.mdtext (original)
+++ jena/site/trunk/content/documentation/sdb/dataset_description.mdtext Tue Jan 29 09:43:20 2019
@@ -12,14 +12,12 @@ store to use (or use the default model).
 The example below creates an in-memory store implemented by
 HSQLDB.
 
-    @prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
-    @prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-    @prefix xsd:    <http://www.w3.org/2001/XMLSchema#> .
+    PREFIX rdfs:   <http://www.w3.org/2000/01/rdf-schema#>
+    PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+    PREFIX xsd:    <http://www.w3.org/2001/XMLSchema#>
 
-    @prefix ja:     <http://jena.hpl.hp.com/2005/11/Assembler#> .
-    @prefix sdb:    <http://jena.hpl.hp.com/2007/sdb#> .
-
-    [] ja:loadClass "org.apache.jena.sdb.SDB" .
+    PREFIX ja:     <http://jena.hpl.hp.com/2005/11/Assembler#>
+    PREFIX sdb:    <http://jena.hpl.hp.com/2007/sdb#>
 
     sdb:DatasetStore rdfs:subClassOf ja:RDFDataset .
 

Modified: jena/site/trunk/content/documentation/sdb/fuseki_integration.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/sdb/fuseki_integration.mdtext?rev=1852425&r1=1852424&r2=1852425&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/sdb/fuseki_integration.mdtext (original)
+++ jena/site/trunk/content/documentation/sdb/fuseki_integration.mdtext Tue Jan 29 09:43:20 2019
@@ -9,8 +9,6 @@ Fuseki server configuration file needs t
 SDB:
 
     [] rdf:type fuseki:Server ;
-       ## Initialize SDB.
-       ja:loadClass "org.apache.jena.sdb.SDB" ;
        fuseki:services (
          <#service1>
        ) .

Modified: jena/site/trunk/content/documentation/serving_data/fuseki1.md
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/serving_data/fuseki1.md?rev=1852425&r1=1852424&r2=1852425&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/serving_data/fuseki1.md (original)
+++ jena/site/trunk/content/documentation/serving_data/fuseki1.md Tue Jan 29 09:43:20 2019
@@ -235,10 +235,6 @@ and a database in the directory DB, an a
     @prefix ja:      <http://jena.hpl.hp.com/2005/11/Assembler#> .
     @prefix tdb:     <http://jena.hpl.hp.com/2008/tdb#> .
 
-    [] ja:loadClass "org.apache.jena.tdb.TDB" .
-    tdb:DatasetTDB  rdfs:subClassOf  ja:RDFDataset .
-    tdb:GraphTDB    rdfs:subClassOf  ja:Model .
-
     <#dataset> rdf:type      tdb:DatasetTDB ;
          tdb:location "DB" ;
          .
@@ -328,9 +324,6 @@ with its datasets.
        # See java doc for ARQ.queryTimeout
        # ja:context [ ja:cxtName "arq:queryTimeout" ;  ja:cxtValue "10000" ] ;
 
-       # Load custom code (rarely needed)
-       # ja:loadClass "your.code.Class" ;
-
        # Services available.  Only explicitly listed services are configured.
        #  If there is a service description not linked from this list, it is ignored.
        fuseki:services (
@@ -346,13 +339,6 @@ Assemblers provide an extensible way of
 objects. Set up any assembler extensions - here, the TDB assembler
 support.
 
-    # Declaration additional assembler items.
-    [] ja:loadClass "org.apache.jena.tdb.TDB" .
-
-    # TDB
-    tdb:DatasetTDB  rdfs:subClassOf  ja:RDFDataset .
-    tdb:GraphTDB    rdfs:subClassOf  ja:Model .
-
 ### Service 1
 
 This service offers SPARQL Query, SPARQL Update and SPARQL Graph

Modified: jena/site/trunk/content/documentation/tdb/assembler.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/tdb/assembler.mdtext?rev=1852425&r1=1852424&r2=1852425&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/tdb/assembler.mdtext (original)
+++ jena/site/trunk/content/documentation/tdb/assembler.mdtext Tue Jan 29 09:43:20 2019
@@ -28,14 +28,10 @@ This is needed for use in [Fuseki](../fu
 
 A dataset can be constructed in an assembler file:
 
-    @prefix tdb:     <http://jena.hpl.hp.com/2008/tdb#> .
-    @prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-    @prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
-    @prefix ja:      <http://jena.hpl.hp.com/2005/11/Assembler#> .
-
-    [] ja:loadClass "org.apache.jena.tdb.TDB" .
-    tdb:DatasetTDB  rdfs:subClassOf  ja:RDFDataset .
-    tdb:GraphTDB    rdfs:subClassOf  ja:Model      .
+    PREFIX tdb:     <http://jena.hpl.hp.com/2008/tdb#>
+    PREFIX rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+    PREFIX rdfs:    <http://www.w3.org/2000/01/rdf-schema#>
+    PREFIX ja:      <http://jena.hpl.hp.com/2005/11/Assembler#>
 
     <#dataset> rdf:type         tdb:DatasetTDB ;
         tdb:location "DB" ;
@@ -46,23 +42,12 @@ directory).
 
 The first section declares the prefixes used later:
 
-    @prefix tdb:     <http://jena.hpl.hp.com/2008/tdb#> .
-    @prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-    @prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
-    @prefix ja:      <http://jena.hpl.hp.com/2005/11/Assembler#> .
-
-then there is a statement that causes TDB to be loaded. TDB
-initialization occurs automatically when loaded. The TDB jar must
-be on the Java classpath.
-
-While order in this file does not matter to the machine, because in
-this case the jena assembler system checks for any `ja:loadClass`
-statements before any attempt to assemble an object is made, having
-it early in the file is helpful to any person looking at the file.
+    PREFIX tdb:     <http://jena.hpl.hp.com/2008/tdb#>
+    PREFIX rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+    PREFIX rdfs:    <http://www.w3.org/2000/01/rdf-schema#>
+    PREFIX ja:      <http://jena.hpl.hp.com/2005/11/Assembler#>
 
-    [] ja:loadClass "org.apache.jena.tdb.TDB" .
-
-And finally there is the description of the TDB dataset itself:
+then there is the description of the TDB dataset itself:
 
     <#graph> rdf:type tdb:DatasetTDB ;
         tdb:location "DB" ;
@@ -95,11 +80,10 @@ with one graph is to use the default gra
 
 A single graph from a TDB dataset can be described by:
 
-    @prefix tdb:     <http://jena.hpl.hp.com/2008/tdb#> .
-    @prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-    @prefix ja:      <http://jena.hpl.hp.com/2005/11/Assembler#> .
-
-    [] ja:loadClass "org.apache.jena.tdb.TDB" .
+    PREFIX tdb:     <http://jena.hpl.hp.com/2008/tdb#>
+    PREFIX rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+    PREFIX rdfs:    <http://www.w3.org/2000/01/rdf-schema#>
+    PREFIX ja:      <http://jena.hpl.hp.com/2005/11/Assembler#>
 
     <#dataset> rdf:type tdb:DatasetTDB ;
         tdb:location "DB" ;
@@ -124,14 +108,10 @@ efficient.
 To include as a named graph in a dataset use vocabulary as shown
 below:
 
-    @prefix tdb:     <http://jena.hpl.hp.com/2008/tdb#> .
-    @prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-    @prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
-    @prefix ja:      <http://jena.hpl.hp.com/2005/11/Assembler#> .
-
-    [] ja:loadClass "org.apache.jena.tdb.TDB" .
-    tdb:DatasetTDB  rdfs:subClassOf  ja:RDFDataset .
-    tdb:GraphTDB    rdfs:subClassOf  ja:Model .
+    PREFIX tdb:     <http://jena.hpl.hp.com/2008/tdb#>
+    PREFIX rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+    PREFIX rdfs:    <http://www.w3.org/2000/01/rdf-schema#>
+    PREFIX ja:      <http://jena.hpl.hp.com/2005/11/Assembler#>
 
     # A dataset of one TDB-backed graph as the default graph and 
     # an in-memory graph as a named graph.
@@ -160,10 +140,10 @@ reasoners.
 
 ## RDFS
 
-    @prefix tdb:     <http://jena.hpl.hp.com/2008/tdb#> .
-    @prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-    @prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
-    @prefix ja:      <http://jena.hpl.hp.com/2005/11/Assembler#> .
+    PREFIX tdb:     <http://jena.hpl.hp.com/2008/tdb#>
+    PREFIX rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+    PREFIX rdfs:    <http://www.w3.org/2000/01/rdf-schema#>
+    PREFIX ja:      <http://jena.hpl.hp.com/2005/11/Assembler#>
 
     tdb:Dataset a rdfs:Class .
     tdb:GraphTDB a rdfs:Class .