jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r799039 - in /websites/staging/jena/trunk/content/jena/documentation/assembler: assembler-howto.html index.html inside-assemblers.html
Date Mon, 21 Nov 2011 12:06:55 GMT
Author: buildbot
Date: Mon Nov 21 12:06:54 2011
New Revision: 799039

Log:
Staging update by buildbot

Modified:
    websites/staging/jena/trunk/content/jena/documentation/assembler/assembler-howto.html
    websites/staging/jena/trunk/content/jena/documentation/assembler/index.html
    websites/staging/jena/trunk/content/jena/documentation/assembler/inside-assemblers.html

Modified: websites/staging/jena/trunk/content/jena/documentation/assembler/assembler-howto.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/assembler/assembler-howto.html
(original)
+++ websites/staging/jena/trunk/content/jena/documentation/assembler/assembler-howto.html
Mon Nov 21 12:06:54 2011
@@ -219,7 +219,7 @@ all the kinds of objects - not just Mode
 the next sections.</p>
 <h2 id="specifications_common_to_all_models">Specifications common to all models</h2>
 <p>Assembler specifications can describe many kinds of models: memory,
-inference, database, ontology, and file-backed. All of these model
+inference, ontology, and file-backed. All of these model
 specifications share a set of base properties for attaching
 content, prefix mappings, and reification modes.</p>
 <div class="codehilite"><pre><span class="err">ja:Loadable</span>
<span class="err">a</span> <span class="err">rdfs:Class</span> <span
class="err">;</span>
@@ -338,115 +338,6 @@ interpretation.</p>
 resources. The subgraphs rooted at those resources (using the
 algorithm from <code>ResourceUtils.reachableClosure()</code>) are added to the
 content.</p>
-<h3 id="rdb_models_and_connections">RDB models and Connections</h3>
-<p>The description of an RDB model requires its name and a description
-of the JDBC connection for the database the model is in. For
-example:</p>
-<div class="codehilite"><pre><span class="err">eg:database-example</span>
-    <span class="err">ja:connection</span> <span class="err">eg:connection</span>
<span class="err">;</span>
-      <span class="err">ja:modelName</span> <span class="err">&quot;Thunderbird3&quot;</span>
-    <span class="err">.</span>
-<span class="err">eg:connection</span>
-    <span class="err">ja:dbType</span> <span class="err">&quot;MySQL&quot;</span>
<span class="err">;</span>
-      <span class="err">ja:dbURL</span> <span class="err">&lt;jdbc:mysql:</span><span
class="c1">//localhost/test&gt; ;</span>
-      <span class="err">ja:dbUser</span> <span class="err">&quot;cjd&quot;</span>
-    <span class="err">.</span>
-
-<span class="err">ja:RDBModel</span> <span class="err">a</span> <span
class="err">rdfs:Class</span> <span class="err">;</span>
-  <span class="err">rdfs:subClassOf</span> <span class="err">ja:Connectable</span>
<span class="err">;</span>
-  <span class="err">rdfs:subClassOf</span> <span class="err">[owl:onProperty</span>
<span class="err">ja:connection;</span> <span class="err">owl:cardinality</span>
<span class="err">1]</span> <span class="err">;</span>
-  <span class="err">rdfs:subClassOf</span> <span class="err">ja:NamedModel</span>
-<span class="err">.</span>
-
-<span class="err">ja:Connectable</span> <span class="err">a</span>
<span class="err">rdfs:Class</span> <span class="err">;</span>
-  <span class="err">rdfs:subClassOf</span> <span class="err">ja:Object</span>
-<span class="err">.</span>
-<span class="err">ja:connection</span> <span class="err">a</span>
<span class="err">rdf:Property</span> <span class="err">;</span>
-  <span class="err">rdfs:domain</span> <span class="err">ja:Connectable</span>
<span class="err">;</span>
-  <span class="err">rdfs:range</span> <span class="err">ja:Connection</span>
-<span class="err">.</span>
-
-<span class="err">ja:NamedModel</span> <span class="err">a</span>
<span class="err">rdfs:Class</span> <span class="err">;</span>
-  <span class="err">rdfs:subClassOf</span> <span class="err">[owl:onProperty</span>
<span class="err">ja:modelName;</span> <span class="err">owl:cardinality</span>
<span class="err">1]</span> <span class="err">;</span>
-  <span class="err">rdfs:subClassOf</span> <span class="err">ja:Model</span>
-<span class="err">.</span>
-<span class="err">ja:modelName</span> <span class="err">a</span>
<span class="err">rdf:Property</span> <span class="err">;</span>
-  <span class="err">rdfs:domain</span> <span class="err">ja:NamedModel</span>
-<span class="err">.</span>
-</pre></div>
-
-
-<p><code>ja:RDBModel</code> is a subclass of <code>ja:NamedModel</code>
and shares the
-<code>ja:ModelName</code> property value naming the model within the
-database.</p>
-<p>The mandatory unique property value of <code>ja:connection</code> specifies
-the connection to the database to be used.</p>
-<p>The description of a connection requires the database name and type
-and the user name and password. If the username and password are
-not specified, <code>Assembler.general</code> will default them, normally to
-the values of the system properties <code>jena.dbUser</code> and
-<code>jena.dbPassword</code>.</p>
-<div class="codehilite"><pre><span class="err">ja:Connection</span>
<span class="err">a</span> <span class="err">rdfs:Class</span> <span
class="err">;</span>
-  <span class="err">rdfs:subClassOf</span> <span class="err">[owl:onProperty</span>
<span class="err">ja:dbType;</span> <span class="err">owl:maxCardinality</span>
<span class="err">1]</span> <span class="err">;</span>
-  <span class="err">rdfs:subClassOf</span> <span class="err">[owl:onProperty</span>
<span class="err">ja:dbClass;</span> <span class="err">owl:maxCardinality</span>
<span class="err">1]</span> <span class="err">;</span>
-  <span class="err">rdfs:subClassOf</span> <span class="err">[owl:onProperty</span>
<span class="err">ja:dbTypeProperty;</span> <span class="err">owl:maxCardinality</span>
<span class="err">1]</span> <span class="err">;</span>
-  <span class="err">rdfs:subClassOf</span> <span class="err">[owl:onProperty</span>
<span class="err">ja:dbURL;</span> <span class="err">owl:maxCardinality</span>
<span class="err">1]</span> <span class="err">;</span>
-  <span class="err">rdfs:subClassOf</span> <span class="err">[owl:onProperty</span>
<span class="err">ja:dbClassProperty;</span> <span class="err">owl:maxCardinality</span>
<span class="err">1]</span> <span class="err">;</span>
-  <span class="err">rdfs:subClassOf</span> <span class="err">[owl:onProperty</span>
<span class="err">ja:dbUser;</span> <span class="err">owl:maxCardinality</span>
<span class="err">1]</span> <span class="err">;</span>
-  <span class="err">rdfs:subClassOf</span> <span class="err">[owl:onProperty</span>
<span class="err">ja:dbPassword;</span> <span class="err">owl:maxCardinality</span>
<span class="err">1]</span> <span class="err">;</span>
-  <span class="err">rdfs:subClassOf</span> <span class="err">[owl:onProperty</span>
<span class="err">ja:dbUserProperty;</span> <span class="err">owl:maxCardinality</span>
<span class="err">1]</span> <span class="err">;</span>
-  <span class="err">rdfs:subClassOf</span> <span class="err">[owl:onProperty</span>
<span class="err">ja:dbPasswordProperty;</span> <span class="err">owl:maxCardinality</span>
<span class="err">1]</span> <span class="err">;</span>
-  <span class="err">rdfs:subClassOf</span> <span class="err">[owl:onProperty</span>
<span class="err">ja:dbURLProperty;</span> <span class="err">owl:maxCardinality</span>
<span class="err">1]</span> <span class="err">;</span>
-  <span class="err">rdfs:subClassOf</span> <span class="err">ja:Object</span>
-<span class="err">.</span>
-<span class="err">ja:dbTypeProperty</span> <span class="err">a</span>
<span class="err">rdf:Property</span> <span class="err">;</span>
-  <span class="err">rdfs:domain</span> <span class="err">ja:Connection</span>
-<span class="err">.</span>
-<span class="err">ja:dbPasswordProperty</span> <span class="err">a</span>
<span class="err">rdf:Property</span> <span class="err">;</span>
-  <span class="err">rdfs:domain</span> <span class="err">ja:Connection</span>
-<span class="err">.</span>
-<span class="err">ja:dbType</span> <span class="err">a</span> <span
class="err">rdf:Property</span> <span class="err">;</span>
-  <span class="err">rdfs:domain</span> <span class="err">ja:Connection</span>
-<span class="err">.</span>
-<span class="err">ja:dbURL</span> <span class="err">a</span> <span
class="err">rdf:Property</span> <span class="err">;</span>
-  <span class="err">rdfs:domain</span> <span class="err">ja:Connection</span>
-<span class="err">.</span>
-<span class="err">ja:dbPassword</span> <span class="err">a</span>
<span class="err">rdf:Property</span> <span class="err">;</span>
-  <span class="err">rdfs:domain</span> <span class="err">ja:Connection</span>
-<span class="err">.</span>
-<span class="err">ja:dbURLProperty</span> <span class="err">a</span>
<span class="err">rdf:Property</span> <span class="err">;</span>
-  <span class="err">rdfs:domain</span> <span class="err">ja:Connection</span>
-<span class="err">.</span>
-<span class="err">ja:dbUserProperty</span> <span class="err">a</span>
<span class="err">rdf:Property</span> <span class="err">;</span>
-  <span class="err">rdfs:domain</span> <span class="err">ja:Connection</span>
-<span class="err">.</span>
-<span class="err">ja:dbClass</span> <span class="err">a</span> <span
class="err">rdf:Property</span> <span class="err">;</span>
-  <span class="err">rdfs:domain</span> <span class="err">ja:Connection</span>
-<span class="err">.</span>
-<span class="err">ja:dbClassProperty</span> <span class="err">a</span>
<span class="err">rdf:Property</span> <span class="err">;</span>
-  <span class="err">rdfs:domain</span> <span class="err">ja:Connection</span>
-<span class="err">.</span>
-<span class="err">ja:dbUser</span> <span class="err">a</span> <span
class="err">rdf:Property</span> <span class="err">;</span>
-  <span class="err">rdfs:domain</span> <span class="err">ja:Connection</span>
-<span class="err">.</span>
-</pre></div>
-
-
-<p>The <code>ja:dbURL</code> property value specifies the URL of the database
to
-be connected to. If it is omitted, the <code>ja:dbURLProperty</code> value is
-the name of a Java system property whose value is the URL of the
-database.</p>
-<p>The <code>ja:dbType</code> property value specifies the type of the
database
-as a string. If it is omitted, the <code>ja:dbTypeProperty</code> value is the
-name of a Java system property whose value is the database type.</p>
-<p>The unique <code>ja:dbUser</code> property value is a string literal
whose
-value is the name of the user connecting to the database. If it is
-omitted, the value of the <code>ja:dbUserProperty</code> is the name of a Java
-system property containing the user name.</p>
-<p>The unique <code>ja:dbPassword</code> property value is the password
of the
-user connecting to the database. If it is omitted, the value of the
-<code>ja:dbPasswordProperty</code> is the name of a Java system property whose
-value is the password.</p>
 <h3 id="file_models">File models</h3>
 <p>A FileModel specification builds a memory model that is backed by a
 file. By "backed", we mean that the model is loaded from that file
@@ -525,26 +416,16 @@ reason over. For example:</p>
 <em>reasonerURL</em> property value is the URI used to identify the
 reasoner (it is the value of the Jena constant
 <code>RDFSRuleReasonerFactory.URI</code>). The base model is specified as a
-memory model; if it is left out, an empty memory model is used. Of
-course, you can specify a database model as a base model:</p>
-<div class="codehilite"><pre><span class="err">eg:database-example</span>
-    <span class="err">ja:connection</span> <span class="err">eg:connection</span>
<span class="err">;</span>
-    <span class="err">ja:modelName</span> <span class="err">&quot;Thunderbird3&quot;</span>
-    <span class="err">.</span>
-<span class="err">eg:connection</span>
-    <span class="err">ja:dbType</span> <span class="err">&quot;MySQL&quot;</span>
<span class="err">;</span>
-    <span class="err">ja:dbURL</span> <span class="err">&lt;jdbc:mysql:</span><span
class="c1">//localhost/test&gt; ;</span>
-    <span class="err">ja:dbUser</span> <span class="err">&quot;cjd&quot;</span>
-    <span class="err">.</span>
-<span class="err">eg:db-inference-example</span>
-    <span class="err">ja:baseModel</span> <span class="err">eg:database-example</span>
<span class="err">;</span>
+memory model; if it is left out, an empty memory model is used.</p>
+<div class="codehilite"><pre><span class="err">eg:db-inference-example</span>
+    <span class="err">ja:baseModel</span> <span class="err">eg:model-example</span>
<span class="err">;</span>
     <span class="err">ja:reasoner</span> <span class="err">[ja:reasonerURL</span>
<span class="err">&lt;http:</span><span class="c1">//jena.hpl.hp.com/2003/RDFSExptRuleReasoner&gt;]</span>
     <span class="err">.</span>
 </pre></div>
 
 
 <p>The same reasoner as used as in the previous example, but now the
-base model is a database specified in the same way as our earlier
+base model is a specific model description in the same way as our earlier
 example.</p>
 <p>Because Jena's access to external reasoners goes through the same
 API as for its internal reasoners, you can access a DIG reasoner
@@ -742,10 +623,7 @@ appropriate properties:</p>
     <code>ja:likeBuiltinSpec ja:OWL_MEM</code>.</li>
 <li><code>ja:importSource</code>: The value of this optional unique property
     is a <code>ModelSource</code> description which describes where imports are
-    obtained from. A <code>ModelSource</code> my be of class <code>ja:ModelSource</code>,
for
-    which memory models are constructed, or a <code>ja:RDBModelSource</code>
with
-    a <code>ja:connection</code> property, for which models are constructed in
the
-    specified database.</li>
+    obtained from. A <code>ModelSource</code> is usually of of class <code>ja:ModelSource</code>.</li>
 <li><code>ja:documentManager</code>: This value of this optional unique
     property is a DocumentManager specification. If absent, the default
     document manager is used.</li>

Modified: websites/staging/jena/trunk/content/jena/documentation/assembler/index.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/assembler/index.html (original)
+++ websites/staging/jena/trunk/content/jena/documentation/assembler/index.html Mon Nov 21
12:06:54 2011
@@ -200,27 +200,6 @@ the root resource <code>my:root</code>.<
 <p><em>theReasonerURL</em> is one of the reasoner (factory) URLs given
in the
 inference documentation and code; <em>theBaseModelResource</em> is another
 resource in the same document describing the base model.</p>
-<h3 id="_a_database_model">... a database model?</h3>
-<div class="codehilite"><pre><span class="err">my:root</span>
-    <span class="err">ja:connection</span> <span class="err">aConnectionresource</span>
<span class="err">;</span>
-    <span class="err">ja:modelName</span> <span class="err">&quot;myModelName&quot;</span>
-    <span class="err">.</span>
-
-<span class="err">aConnectionResource</span> <span class="err">;</span>
-    <span class="err">ja:dbURL</span> <span class="err">theDatabaseURL</span>
<span class="err">;</span>
-    <span class="err">ja:dbUser</span> <span class="err">&quot;the</span>
<span class="err">user</span> <span class="err">name&quot;</span>
<span class="err">;</span>
-    <span class="err">ja:dbPassword</span> <span class="err">&quot;the</span>
<span class="err">user&#39;s</span> <span class="err">password&quot;</span>
<span class="err">;</span>
-    <span class="err">ja:dbType</span> <span class="err">&quot;the</span>
<span class="err">database</span> <span class="err">type,</span> <span
class="err">eg</span> <span class="err">MySQL&quot;</span> <span
class="err">;</span>
-    <span class="err">ja:dbClass</span> <span class="err">&quot;some.jena.driver.</span><span
class="kd">class</span><span class="err">&quot;</span>
-    <span class="err">.</span>
-</pre></div>
-
-
-<p><em>aConnectionResource</em> describes the connection to the desired
-database. If a particular Java driver class has to be loaded, it is
-specified by the <code>dbClass</code> property value. See the
-<a href="assembler-howto.html">Assembler howto</a> for ways in which sensitive
-details such as passwords can be left out of the description.</p>
 <h3 id="_some_initialising_content">... some initialising content?</h3>
 <div class="codehilite"><pre><span class="err">my:root</span>
     <span class="err">ja:content</span> <span class="err">[ja:</span><span
class="kd">extern</span><span class="err">alContent</span> <span class="err">&lt;someContentURL&gt;]</span>

Modified: websites/staging/jena/trunk/content/jena/documentation/assembler/inside-assemblers.html
==============================================================================
--- websites/staging/jena/trunk/content/jena/documentation/assembler/inside-assemblers.html
(original)
+++ websites/staging/jena/trunk/content/jena/documentation/assembler/inside-assemblers.html
Mon Nov 21 12:06:54 2011
@@ -336,24 +336,12 @@ assembler classes.</p>
 <td>infModel</td>
 </tr>
 <tr>
-<td>RDB models</td>
-<td>RDBModelAssembler</td>
-<td>ja:RDBModel</td>
-<td>rdbModel</td>
-</tr>
-<tr>
 <td>reasoners</td>
 <td>ReasonerAssembler</td>
 <td>ja:Reasoner</td>
 <td>reasoner</td>
 </tr>
 <tr>
-<td>connection descriptions</td>
-<td>ConnectionAssembler</td>
-<td>ja:Connection</td>
-<td>connection</td>
-</tr>
-<tr>
 <td>content</td>
 <td>ContentAssembler</td>
 <td>ja:Content</td>
@@ -408,19 +396,6 @@ Content object has the method:</p>
 <p>Invoking the <code>fill</code> method adds the represented content to
the
 model. The supplied ModelAssemblers automatically apply the
 <code>Content</code> objects corresponding to <code>ja:content</code>
property values.</p>
-<h3 id="basic_assembler_connectionassembler">Basic assembler ConnectionAssembler</h3>
-<p>A ConnectionAssembler constructs ConnectionDescriptions according
-to the specification. An ConnectionDescription retains the
-information required to make a database connection, can constructs
-that connection on demand.</p>
-<p>When a ConnectionAssembler is constructed, it may optionally be
-given a Resource describing (using the JA vocabulary) default
-values for any of the database properties. When that Assembler is
-used to create a Connection, missing values are filled in from the
-defaults. This allows sensitive information to be left out of the
-RDF description.</p>
-<p>The ConnectionAssembler embedded in Assembler.general has defaults
-taken from the system properties <code>jena.dbUser</code> and <code>jena.dbType</code></p>
 <h3 id="basic_assembler_rulesetassembler">Basic assembler RulesetAssembler</h3>
 <p>A RulesetAssembler generates lists of Jena rules.</p>
 <h3 id="basic_assembler_defaultmodelassembler">Basic assembler DefaultModelAssembler</h3>



Mime
View raw message