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 2011/11/11 19:34:15 UTC
svn commit: r1201015 - in /incubator/jena/Jena2/jena/trunk: ./
src/main/java/com/hp/hpl/jena/assembler/
src/test/java/com/hp/hpl/jena/assembler/test/ vocabularies/
Author: andy
Date: Fri Nov 11 18:34:15 2011
New Revision: 1201015
URL: http://svn.apache.org/viewvc?rev=1201015&view=rev
Log:
JENA-110 : Remove RDB (source code part II; vocabularies updates)
Modified:
incubator/jena/Jena2/jena/trunk/ReleaseNotes.txt
incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/assembler/JA.java
incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestAssemblerVocabulary.java
incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestModelSourceAssembler.java
incubator/jena/Jena2/jena/trunk/vocabularies/assembler.n3
incubator/jena/Jena2/jena/trunk/vocabularies/jena-model-spec.n3
Modified: incubator/jena/Jena2/jena/trunk/ReleaseNotes.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/ReleaseNotes.txt?rev=1201015&r1=1201014&r2=1201015&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/ReleaseNotes.txt (original)
+++ incubator/jena/Jena2/jena/trunk/ReleaseNotes.txt Fri Nov 11 18:34:15 2011
@@ -4,6 +4,7 @@ Release Notes
==== Jena 2.6.5
** Java 6 is now required for running Jena.
+** The deprecate RDB subsystem has been removed. Please use TDB or SDB.
==== Jena 2.6.4
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/assembler/JA.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/assembler/JA.java?rev=1201015&r1=1201014&r2=1201015&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/assembler/JA.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/assembler/JA.java Fri Nov 11 18:34:15 2011
@@ -69,8 +69,6 @@ public class JA
public static final Resource Content = resource( "Content" );
- public static final Resource Connectable = resource( "Connectable" );
-
public static final Resource LiteralContent = resource( "LiteralContent" );
public static final Resource OntModelSpec = resource( "OntModelSpec" );
Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestAssemblerVocabulary.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestAssemblerVocabulary.java?rev=1201015&r1=1201014&r2=1201015&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestAssemblerVocabulary.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestAssemblerVocabulary.java Fri Nov 11 18:34:15 2011
@@ -105,7 +105,6 @@ public class TestAssemblerVocabulary ext
assertSubclassOf( JA.NamedModel, JA.Model );
assertSubclassOf( JA.FileModel, JA.NamedModel );
// assertSubclassOf( JA.OntModelSpec, JA.ReasonerFactory );
- assertSubclassOf( JA.ModelSource, JA.Connectable );
}
public void testInfModelProperties()
Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestModelSourceAssembler.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestModelSourceAssembler.java?rev=1201015&r1=1201014&r2=1201015&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestModelSourceAssembler.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestModelSourceAssembler.java Fri Nov 11 18:34:15 2011
@@ -35,11 +35,6 @@ public class TestModelSourceAssembler ex
public void testModelSourceAssemblerType()
{ testDemandsMinimalType( new ModelSourceAssembler(), JA.ModelSource ); }
- public void testModelSourceVocabulary()
- {
- assertSubclassOf( JA.Connectable, JA.Object );
- }
-
public void testMemModelMakerSource()
{
Assembler a = new ModelSourceAssembler();
Modified: incubator/jena/Jena2/jena/trunk/vocabularies/assembler.n3
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/vocabularies/assembler.n3?rev=1201015&r1=1201014&r2=1201015&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/vocabularies/assembler.n3 (original)
+++ incubator/jena/Jena2/jena/trunk/vocabularies/assembler.n3 Fri Nov 11 18:34:15 2011
@@ -183,7 +183,7 @@ ja:NamedModel a rdfs:Class
; rdfs:subClassOf [owl:onProperty ja:modelName; owl:cardinality 1]
; rdfs:label "Assembler.NamedModel"
; rdfs:comment
- """shared superclass for FileModel and RDBModel,
+ """superclass for FileModel,
accepting the modelName property"""
.
@@ -236,52 +236,17 @@ ja:fileEncoding a rdf:Property
; rdfs:label "Assemble.fileEncoding"
; rdfs:comment """FileModel property to give language encoding"""
.
-
-#
-# database models
-#
-
-ja:RDBModel a rdfs:Class
- ; rdfs:subClassOf ja:NamedModel
- ; rdfs:subClassOf [owl:onProperty ja:connection; owl:cardinality 1]
- ; rdfs:subClassOf ja:Connectable
- ; owl:equivalentClass [owl:intersectionOf (ja:Connectable ja:NamedModel)]
- ; rdfs:label "Assembler.RDBModel"
- ; rdfs:comment
- """a Model from a Jena relational database, specified by a
- Connection and with a given name."""
- .
ja:Connectable a rdfs:Class
; rdfs:subClassOf ja:Object
; rdfs:label "Assembler.Connectable"
- ; rdfs:comment
- """The class of Objects which can be the subject of a ja:connection
- property."""
.
-
-ja:connection a rdf:Property
- ; rdfs:label "Assembler.connection"
- ; rdfs:comment
- """property specifying that the subject RDBModel is built
- using the connection specified by the object."""
- ; rdfs:domain ja:Connectable
- ; rdfs:range ja:Connection
- .
-
+
ja:ModelSource a rdfs:Class
; rdfs:subClassOf ja:Connectable
; rdfs:label "Assembler.ModelSource"
; rdfs:comment "Source of models by name for an OntModelSpec"
.
-
-ja:RDBModelSource a rdfs:Class
- ; rdfs:subClassOf ja:ModelSource
- ; rdfs:subClassOf ja:Connectable
- ; rdfs:label "Assembler.RDBModelSource"
- ; rdfs:comment "A ModelSource backed by an RDB"
- .
-
#
# inference models
#
@@ -550,109 +515,6 @@ ja:rootModel a rdf:Property
.
#
-# connections
-#
-
-ja:Connection a rdfs:Class
- ; rdfs:subClassOf [owl:onProperty ja:dbURL; owl:maxCardinality 1]
- ; rdfs:subClassOf [owl:onProperty ja:dbURLProperty; owl:maxCardinality 1]
- ; rdfs:subClassOf [owl:onProperty ja:dbUser; owl:maxCardinality 1]
- ; rdfs:subClassOf [owl:onProperty ja:dbUserProperty; owl:maxCardinality 1]
- ; rdfs:subClassOf [owl:onProperty ja:dbPassword; owl:maxCardinality 1]
- ; rdfs:subClassOf [owl:onProperty ja:dbPasswordProperty; owl:maxCardinality 1]
- ; rdfs:subClassOf [owl:onProperty ja:dbType; owl:maxCardinality 1]
- ; rdfs:subClassOf [owl:onProperty ja:dbTypeProperty; owl:maxCardinality 1]
- ; rdfs:subClassOf [owl:onProperty ja:dbClass; owl:maxCardinality 1]
- ; rdfs:subClassOf [owl:onProperty ja:dbClassProperty; owl:maxCardinality 1]
- ; rdfs:subClassOf ja:Object
- ; rdfs:label "Assembler.Connection"
- ; rdfs:comment
- "class of RDB Connection objects for JDBC database connections."
- .
-
-ja:dbURL a rdf:Property
- ; rdfs:label "Assembler.dbURL"
- ; rdfs:comment
- """property of a Connection that specifies as a URI Resource
- the URL of the database to connect to."""
- ; rdfs:domain ja:Connection
- .
-
-ja:dbUser a rdf:Property
- ; rdfs:label "Assembler.dbUser"
- ; rdfs:comment
- """property of a database connection that specifies as a string
- the name of the database user for which the connection is to be made."""
- ; rdfs:domain ja:Connection
- .
-
-ja:dbPassword a rdf:Property
- ; rdfs:label "Assembler.dbPassword"
- ; rdfs:comment
- """property of a database connection that specifies as a string the
- password used to authorise the connection."""
- ; rdfs:domain ja:Connection
- .
-
-ja:dbType a rdf:Property
- ; rdfs:label "Assembler.dbType"
- ; rdfs:comment
- """property of a database connection that specifies as a string the
- type of the database to connect to."""
- ; rdfs:domain ja:Connection
- .
-
-ja:dbURLProperty a rdf:Property
- ; rdfs:label "Assembler.dbURLProperty"
- ; rdfs:comment
- """property of a Connection that specifies the name of a Java
- system property containing the URL of the database to connect to."""
- ; rdfs:domain ja:Connection
- .
-
-ja:dbUserProperty a rdf:Property
- ; rdfs:label "Assembler.dbUserProperty"
- ; rdfs:comment
- """property of a database connection that specifies the name of
- a Java system property containing the name of the database user
- for which the connection is to be made."""
- ; rdfs:domain ja:Connection
- .
-
-ja:dbPasswordProperty a rdf:Property
- ; rdfs:label "Assembler.dbPasswordProperty"
- ; rdfs:comment
- """property of a database connection that specifies the name of
- a Java system property the password used to authorise the connection."""
- ; rdfs:domain ja:Connection
- .
-
-ja:dbTypeProperty a rdf:Property
- ; rdfs:label "Assembler.dbTypeProperty"
- ; rdfs:comment
- """property of a database connection that specifies the name of a
- Java system property containing the type of the database to connect to."""
- ; rdfs:domain ja:Connection
- .
-
-ja:dbClass a rdf:Property
- ; rdfs:label "Assembler.dbClass"
- ; rdfs:comment
- """property of a database connection that specifies as a string the
- name of a Java class to be loaded before connection is attemped."""
- ; rdfs:domain ja:Connection
- .
-
-ja:dbClassProperty a rdf:Property
- ; rdfs:label "Assembler.dbClass"
- ; rdfs:comment
- """property of a database connection that specifies as a string the
- name a Java system property containing the name of a Java class to be
- loaded before connection is attemped."""
- ; rdfs:domain ja:Connection
- .
-
-#
# reification modes
#
Modified: incubator/jena/Jena2/jena/trunk/vocabularies/jena-model-spec.n3
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/vocabularies/jena-model-spec.n3?rev=1201015&r1=1201014&r2=1201015&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/vocabularies/jena-model-spec.n3 (original)
+++ incubator/jena/Jena2/jena/trunk/vocabularies/jena-model-spec.n3 Fri Nov 11 18:34:15 2011
@@ -21,7 +21,6 @@
jms:MakerSpec rdf:type rdfs:Class .
jms:FileMakerSpec rdf:type rdfs:Class .
jms:MemMakerSpec rdf:type rdfs:Class .
-jms:RDBMakerSpec rdf:type rdfs:Class .
jms:ModelSpec rdf:type rdfs:Class
; rdfs:comment "the base type of all model specifications"
@@ -72,12 +71,6 @@ jms:importMaker rdf:type rdf
jms:reasonsWith rdf:type rdf:Property .
jms:policyPath rdf:type rdf:Property .
-jms:dbUser rdf:type rdf:Property .
-jms:dbPassword rdf:type rdf:Property .
-jms:dbURL rdf:type rdf:Property .
-jms:dbType rdf:type rdf:Property .
-jms:dbClass rdf:type rdf:Property .
-
jms:maker rdf:type rdf:Property .
jms:reificationMode rdf:type rdf:Property .
jms:reasoner rdf:type rdf:Property .
@@ -88,7 +81,6 @@ jms:modelName rdf:type rdf
jms:MemMakerSpec rdfs:subClassOf jms:MakerSpec .
jms:FileMakerSpec rdfs:subClassOf jms:MakerSpec .
-jms:RDBMakerSpec rdfs:subClassOf jms:MakerSpec .
jms:DefaultModelSpec rdfs:subClassOf jms:ModelSpec .
jms:PlainModelSpec rdfs:subClassOf jms:ModelSpec .
@@ -104,7 +96,6 @@ jms:ontLanguage rdfs:domain
jms:reasonsWith rdfs:domain jms:InfModelSpec .
jms:modelName rdfs:domain jms:ModelSpec .
jms:fileBase rdfs:domain jms:FileMakerSpec .
-jms:hasConnection rdfs:domain jms:RDBMakerSpec .
jms:importMaker rdfs:subPropertyOf jms:maker .