You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by re...@apache.org on 2016/05/17 22:20:55 UTC
svn commit: r1744328 [20/24] - in /stanbol/trunk: ./
commons/indexedgraph/src/main/java/org/apache/stanbol/commons/indexedgraph/
commons/indexedgraph/src/test/java/org/apache/stanbol/commons/indexedgraph/
commons/installer/bundleprovider/src/main/java/...
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/Vocabulary.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/Vocabulary.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/Vocabulary.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/Vocabulary.java Tue May 17 22:20:49 2016
@@ -16,9 +16,8 @@
*/
package org.apache.stanbol.ontologymanager.servicesapi;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.IRI;
import org.semanticweb.owlapi.apibinding.OWLManager;
-import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLClass;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.OWLDataProperty;
@@ -59,7 +58,7 @@ public class Vocabulary {
private static final String _SHORT_ENTRY = "Entry";
- private static final String _SHORT_GRAPH = "Graph";
+ private static final String _SHORT_GRAPH = "ImmutableGraph";
private static final String _SHORT_HAS_APPENDED = "hasAppended";
@@ -116,325 +115,325 @@ public class Vocabulary {
/**
* The OWL <b>object property</b> <tt>isAppendedTo</tt>.
*/
- public static final OWLObjectProperty APPENDED_TO = __df.getOWLObjectProperty(IRI
+ public static final OWLObjectProperty APPENDED_TO = __df.getOWLObjectProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_APPENDED_TO));
/**
- * The OWL <b>object property</b> <tt>isAppendedTo</tt> (in UriRef form).
+ * The OWL <b>object property</b> <tt>isAppendedTo</tt> (in IRI form).
*/
- public static final UriRef APPENDED_TO_URIREF = new UriRef(_NS_ONTONET + _SHORT_APPENDED_TO);
+ public static final IRI APPENDED_TO_URIREF = new IRI(_NS_ONTONET + _SHORT_APPENDED_TO);
/**
* The OWL <b>object property</b> <tt>dependsOn</tt>.
*/
- public static final OWLObjectProperty DEPENDS_ON = __df.getOWLObjectProperty(IRI
+ public static final OWLObjectProperty DEPENDS_ON = __df.getOWLObjectProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_DEPENDS_ON));
/**
- * The OWL <b>object property</b> <tt>dependsOn</tt> (in UriRef form).
+ * The OWL <b>object property</b> <tt>dependsOn</tt> (in IRI form).
*/
- public static final UriRef DEPENDS_ON_URIREF = new UriRef(_NS_ONTONET + _SHORT_DEPENDS_ON);
+ public static final IRI DEPENDS_ON_URIREF = new IRI(_NS_ONTONET + _SHORT_DEPENDS_ON);
/**
* The OWL <b>class</b> <tt>Entry</tt>.
*/
- public static final OWLClass ENTRY = __df.getOWLClass(IRI.create(_NS_ONTONET + _SHORT_ENTRY));
+ public static final OWLClass ENTRY = __df.getOWLClass(org.semanticweb.owlapi.model.IRI.create(_NS_ONTONET + _SHORT_ENTRY));
/**
- * The OWL <b>class</b> <tt>Entry</tt> (in UriRef form).
+ * The OWL <b>class</b> <tt>Entry</tt> (in IRI form).
*/
- public static final UriRef ENTRY_URIREF = new UriRef(_NS_ONTONET + _SHORT_ENTRY);
+ public static final IRI ENTRY_URIREF = new IRI(_NS_ONTONET + _SHORT_ENTRY);
/**
- * The OWL <b>class</b> <tt>Graph</tt>.
+ * The OWL <b>class</b> <tt>ImmutableGraph</tt>.
*/
- public static final OWLClass GRAPH = __df.getOWLClass(IRI.create(_NS_ONTONET + _SHORT_GRAPH));
+ public static final OWLClass GRAPH = __df.getOWLClass(org.semanticweb.owlapi.model.IRI.create(_NS_ONTONET + _SHORT_GRAPH));
/**
- * The OWL <b>class</b> <tt>Graph</tt> (in UriRef form).
+ * The OWL <b>class</b> <tt>ImmutableGraph</tt> (in IRI form).
*/
- public static final UriRef GRAPH_URIREF = new UriRef(_NS_ONTONET + _SHORT_GRAPH);
+ public static final IRI GRAPH_URIREF = new IRI(_NS_ONTONET + _SHORT_GRAPH);
/**
* The OWL <b>object property</b> <tt>hasAppended</tt>.
*/
- public static final OWLObjectProperty HAS_APPENDED = __df.getOWLObjectProperty(IRI
+ public static final OWLObjectProperty HAS_APPENDED = __df.getOWLObjectProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_HAS_APPENDED));
/**
- * The OWL <b>object property</b> <tt>hasAppended</tt> (in UriRef form).
+ * The OWL <b>object property</b> <tt>hasAppended</tt> (in IRI form).
*/
- public static final UriRef HAS_APPENDED_URIREF = new UriRef(_NS_ONTONET + _SHORT_HAS_APPENDED);
+ public static final IRI HAS_APPENDED_URIREF = new IRI(_NS_ONTONET + _SHORT_HAS_APPENDED);
/**
* The OWL <b>object property</b> <tt>hasDependent</tt>.
*/
- public static final OWLObjectProperty HAS_DEPENDENT = __df.getOWLObjectProperty(IRI
+ public static final OWLObjectProperty HAS_DEPENDENT = __df.getOWLObjectProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_HAS_DEPENDENT));
/**
- * The OWL <b>datatype property</b> <tt>hasDependent</tt> (in UriRef form).
+ * The OWL <b>datatype property</b> <tt>hasDependent</tt> (in IRI form).
*/
- public static final UriRef HAS_DEPENDENT_URIREF = new UriRef(_NS_ONTONET + _SHORT_HAS_DEPENDENT);
+ public static final IRI HAS_DEPENDENT_URIREF = new IRI(_NS_ONTONET + _SHORT_HAS_DEPENDENT);
/**
* The OWL <b>datatype property</b> <tt>hasOntologyIRI</tt>.
*/
- public static final OWLDataProperty HAS_ONTOLOGY_IRI = __df.getOWLDataProperty(IRI
+ public static final OWLDataProperty HAS_ONTOLOGY_IRI = __df.getOWLDataProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_HAS_ONTOLOGY_IRI));
/**
- * The OWL <b>datatype property</b> <tt>hasOntologyIRI</tt> (in UriRef form).
+ * The OWL <b>datatype property</b> <tt>hasOntologyIRI</tt> (in IRI form).
*/
- public static final UriRef HAS_ONTOLOGY_IRI_URIREF = new UriRef(_NS_ONTONET + _SHORT_HAS_ONTOLOGY_IRI);
+ public static final IRI HAS_ONTOLOGY_IRI_URIREF = new IRI(_NS_ONTONET + _SHORT_HAS_ONTOLOGY_IRI);
/**
* The OWL <b>object property</b> <tt>isManagedBy</tt>.
*/
- public static final OWLObjectProperty HAS_SPACE_CORE = __df.getOWLObjectProperty(IRI
+ public static final OWLObjectProperty HAS_SPACE_CORE = __df.getOWLObjectProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_HAS_SPACE_CORE));
/**
- * The OWL <b>object property</b> <tt>hasCoreSpace</tt> (in UriRef form).
+ * The OWL <b>object property</b> <tt>hasCoreSpace</tt> (in IRI form).
*/
- public static final UriRef HAS_SPACE_CORE_URIREF = new UriRef(_NS_ONTONET + _SHORT_HAS_SPACE_CORE);
+ public static final IRI HAS_SPACE_CORE_URIREF = new IRI(_NS_ONTONET + _SHORT_HAS_SPACE_CORE);
/**
* The OWL <b>object property</b> <tt>isManagedBy</tt>.
*/
- public static final OWLObjectProperty HAS_SPACE_CUSTOM = __df.getOWLObjectProperty(IRI
+ public static final OWLObjectProperty HAS_SPACE_CUSTOM = __df.getOWLObjectProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_HAS_SPACE_CUSTOM));
/**
- * The OWL <b>object property</b> <tt>hasCustomSpace</tt> (in UriRef form).
+ * The OWL <b>object property</b> <tt>hasCustomSpace</tt> (in IRI form).
*/
- public static final UriRef HAS_SPACE_CUSTOM_URIREF = new UriRef(_NS_ONTONET + _SHORT_HAS_SPACE_CUSTOM);
+ public static final IRI HAS_SPACE_CUSTOM_URIREF = new IRI(_NS_ONTONET + _SHORT_HAS_SPACE_CUSTOM);
/**
- * The OWL <b>object property</b> <tt>hasStatus</tt> (in UriRef form).
+ * The OWL <b>object property</b> <tt>hasStatus</tt> (in IRI form).
*/
- public static final OWLObjectProperty HAS_STATUS = __df.getOWLObjectProperty(IRI
+ public static final OWLObjectProperty HAS_STATUS = __df.getOWLObjectProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_HAS_STATUS));
/**
* The OWL <b>object property</b> <tt>hasStatus</tt>.
*/
- public static final UriRef HAS_STATUS_URIREF = new UriRef(_NS_ONTONET + _SHORT_HAS_STATUS);
+ public static final IRI HAS_STATUS_URIREF = new IRI(_NS_ONTONET + _SHORT_HAS_STATUS);
/**
* The OWL <b>datatype property</b> <tt>hasVersionIRI</tt>.
*/
- public static final OWLDataProperty HAS_VERSION_IRI = __df.getOWLDataProperty(IRI
+ public static final OWLDataProperty HAS_VERSION_IRI = __df.getOWLDataProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_HAS_VERSION_IRI));
/**
- * The OWL <b>datatype property</b> <tt>hasVersionIRI</tt> (in UriRef form).
+ * The OWL <b>datatype property</b> <tt>hasVersionIRI</tt> (in IRI form).
*/
- public static final UriRef HAS_VERSION_IRI_URIREF = new UriRef(_NS_ONTONET + _SHORT_HAS_VERSION_IRI);
+ public static final IRI HAS_VERSION_IRI_URIREF = new IRI(_NS_ONTONET + _SHORT_HAS_VERSION_IRI);
/**
* The OWL <b>object property</b> <tt>isManagedBy</tt>.
*/
- public static final OWLObjectProperty IS_MANAGED_BY = __df.getOWLObjectProperty(IRI
+ public static final OWLObjectProperty IS_MANAGED_BY = __df.getOWLObjectProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_IS_MANAGED_BY));
/**
* The OWL <b>object property</b> <tt>isManagedByCore</tt>.
*/
- public static final OWLObjectProperty IS_MANAGED_BY_CORE = __df.getOWLObjectProperty(IRI
+ public static final OWLObjectProperty IS_MANAGED_BY_CORE = __df.getOWLObjectProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_IS_MANAGED_BY_CORE));
/**
- * The OWL <b>object property</b> <tt>isManagedByCore</tt> (in UriRef form).
+ * The OWL <b>object property</b> <tt>isManagedByCore</tt> (in IRI form).
*/
- public static final UriRef IS_MANAGED_BY_CORE_URIREF = new UriRef(_NS_ONTONET + _SHORT_IS_MANAGED_BY_CORE);
+ public static final IRI IS_MANAGED_BY_CORE_URIREF = new IRI(_NS_ONTONET + _SHORT_IS_MANAGED_BY_CORE);
/**
* The OWL <b>object property</b> <tt>isManagedByCustom</tt>.
*/
- public static final OWLObjectProperty IS_MANAGED_BY_CUSTOM = __df.getOWLObjectProperty(IRI
+ public static final OWLObjectProperty IS_MANAGED_BY_CUSTOM = __df.getOWLObjectProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_IS_MANAGED_BY_CUSTOM));
/**
- * The OWL <b>object property</b> <tt>isManagedByCustom</tt> (in UriRef form).
+ * The OWL <b>object property</b> <tt>isManagedByCustom</tt> (in IRI form).
*/
- public static final UriRef IS_MANAGED_BY_CUSTOM_URIREF = new UriRef(_NS_ONTONET
+ public static final IRI IS_MANAGED_BY_CUSTOM_URIREF = new IRI(_NS_ONTONET
+ _SHORT_IS_MANAGED_BY_CUSTOM);
/**
- * The OWL <b>object property</b> <tt>isManagedBy</tt> (in UriRef form).
+ * The OWL <b>object property</b> <tt>isManagedBy</tt> (in IRI form).
*/
- public static final UriRef IS_MANAGED_BY_URIREF = new UriRef(_NS_ONTONET + _SHORT_IS_MANAGED_BY);
+ public static final IRI IS_MANAGED_BY_URIREF = new IRI(_NS_ONTONET + _SHORT_IS_MANAGED_BY);
/**
* The OWL <b>object property</b> <tt>isCoreSpaceOf</tt>.
*/
- public static final OWLObjectProperty IS_SPACE_CORE_OF = __df.getOWLObjectProperty(IRI
+ public static final OWLObjectProperty IS_SPACE_CORE_OF = __df.getOWLObjectProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_IS_SPACE_CORE_OF));
/**
- * The OWL <b>object property</b> <tt>isCoreSpaceOf</tt> (in UriRef form).
+ * The OWL <b>object property</b> <tt>isCoreSpaceOf</tt> (in IRI form).
*/
- public static final UriRef IS_SPACE_CORE_OF_URIREF = new UriRef(_NS_ONTONET + _SHORT_IS_SPACE_CORE_OF);
+ public static final IRI IS_SPACE_CORE_OF_URIREF = new IRI(_NS_ONTONET + _SHORT_IS_SPACE_CORE_OF);
/**
* The OWL <b>object property</b> <tt>isCustomSpaceOf</tt>.
*/
- public static final OWLObjectProperty IS_SPACE_CUSTOM_OF = __df.getOWLObjectProperty(IRI
+ public static final OWLObjectProperty IS_SPACE_CUSTOM_OF = __df.getOWLObjectProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_IS_SPACE_CUSTOM_OF));
/**
- * The OWL <b>object property</b> <tt>isCustomSpaceOf</tt> (in UriRef form).
+ * The OWL <b>object property</b> <tt>isCustomSpaceOf</tt> (in IRI form).
*/
- public static final UriRef IS_SPACE_CUSTOM_OF_URIREF = new UriRef(_NS_ONTONET + _SHORT_IS_SPACE_CUSTOM_OF);
+ public static final IRI IS_SPACE_CUSTOM_OF_URIREF = new IRI(_NS_ONTONET + _SHORT_IS_SPACE_CUSTOM_OF);
/**
* The OWL <b>object property</b> <tt>manages</tt>.
*/
- public static final OWLObjectProperty MANAGES = __df.getOWLObjectProperty(IRI.create(_NS_ONTONET
+ public static final OWLObjectProperty MANAGES = __df.getOWLObjectProperty(org.semanticweb.owlapi.model.IRI.create(_NS_ONTONET
+ _SHORT_MANAGES));
/**
* The OWL <b>object property</b> <tt>managesInCore</tt>.
*/
- public static final OWLObjectProperty MANAGES_IN_CORE = __df.getOWLObjectProperty(IRI
+ public static final OWLObjectProperty MANAGES_IN_CORE = __df.getOWLObjectProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_MANAGES_IN_CORE));
/**
- * The OWL <b>object property</b> <tt>managesInCore</tt> (in UriRef form).
+ * The OWL <b>object property</b> <tt>managesInCore</tt> (in IRI form).
*/
- public static final UriRef MANAGES_IN_CORE_URIREF = new UriRef(_NS_ONTONET + _SHORT_MANAGES_IN_CORE);
+ public static final IRI MANAGES_IN_CORE_URIREF = new IRI(_NS_ONTONET + _SHORT_MANAGES_IN_CORE);
/**
* The OWL <b>object property</b> <tt>managesInCustom</tt>.
*/
- public static final OWLObjectProperty MANAGES_IN_CUSTOM = __df.getOWLObjectProperty(IRI
+ public static final OWLObjectProperty MANAGES_IN_CUSTOM = __df.getOWLObjectProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_MANAGES_IN_CUSTOM));
/**
- * The OWL <b>object property</b> <tt>managesInCustom</tt> (in UriRef form).
+ * The OWL <b>object property</b> <tt>managesInCustom</tt> (in IRI form).
*/
- public static final UriRef MANAGES_IN_CUSTOM_URIREF = new UriRef(_NS_ONTONET + _SHORT_MANAGES_IN_CUSTOM);
+ public static final IRI MANAGES_IN_CUSTOM_URIREF = new IRI(_NS_ONTONET + _SHORT_MANAGES_IN_CUSTOM);
/**
- * The OWL <b>object property</b> <tt>manages</tt> (in UriRef form).
+ * The OWL <b>object property</b> <tt>manages</tt> (in IRI form).
*/
- public static final UriRef MANAGES_URIREF = new UriRef(_NS_ONTONET + _SHORT_MANAGES);
+ public static final IRI MANAGES_URIREF = new IRI(_NS_ONTONET + _SHORT_MANAGES);
/**
* The OWL <b>object property</b> <tt>mapsToGraph</tt>.
*/
- public static final OWLObjectProperty MAPS_TO_GRAPH = __df.getOWLObjectProperty(IRI
+ public static final OWLObjectProperty MAPS_TO_GRAPH = __df.getOWLObjectProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_MAPS_TO_GRAPH));
/**
- * The OWL <b>object property</b> <tt>mapsToGraph</tt> (in UriRef form).
+ * The OWL <b>object property</b> <tt>mapsToGraph</tt> (in IRI form).
*/
- public static final UriRef MAPS_TO_GRAPH_URIREF = new UriRef(_NS_ONTONET + _SHORT_MAPS_TO_GRAPH);
+ public static final IRI MAPS_TO_GRAPH_URIREF = new IRI(_NS_ONTONET + _SHORT_MAPS_TO_GRAPH);
/**
* The OWL <b>class</b> <tt>PrimaryEntry</tt>.
*/
- public static final OWLClass PRIMARY_ENTRY = __df.getOWLClass(IRI.create(_NS_ONTONET
+ public static final OWLClass PRIMARY_ENTRY = __df.getOWLClass(org.semanticweb.owlapi.model.IRI.create(_NS_ONTONET
+ _SHORT_PRIMARY_ENTRY));
/**
- * The OWL <b>class</b> <tt>PrimaryEntry</tt> (in UriRef form).
+ * The OWL <b>class</b> <tt>PrimaryEntry</tt> (in IRI form).
*/
- public static final UriRef PRIMARY_ENTRY_URIREF = new UriRef(_NS_ONTONET + _SHORT_PRIMARY_ENTRY);
+ public static final IRI PRIMARY_ENTRY_URIREF = new IRI(_NS_ONTONET + _SHORT_PRIMARY_ENTRY);
/**
* The OWL <b>datatype property</b> <tt>retrievedFrom</tt>.
*/
- public static final OWLDataProperty RETRIEVED_FROM = __df.getOWLDataProperty(IRI
+ public static final OWLDataProperty RETRIEVED_FROM = __df.getOWLDataProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_RETRIEVED_FROM));
/**
- * The OWL <b>datatype property</b> <tt>retrievedFrom</tt> (in UriRef form).
+ * The OWL <b>datatype property</b> <tt>retrievedFrom</tt> (in IRI form).
*/
- public static final UriRef RETRIEVED_FROM_URIREF = new UriRef(_NS_ONTONET + _SHORT_RETRIEVED_FROM);
+ public static final IRI RETRIEVED_FROM_URIREF = new IRI(_NS_ONTONET + _SHORT_RETRIEVED_FROM);
/**
* The OWL <b>class</b> <tt>Scope</tt>.
*/
- public static final OWLClass SCOPE = __df.getOWLClass(IRI.create(_NS_ONTONET + _SHORT_SCOPE));
+ public static final OWLClass SCOPE = __df.getOWLClass(org.semanticweb.owlapi.model.IRI.create(_NS_ONTONET + _SHORT_SCOPE));
/**
- * The OWL <b>class</b> <tt>Scope</tt> (in UriRef form).
+ * The OWL <b>class</b> <tt>Scope</tt> (in IRI form).
*/
- public static final UriRef SCOPE_URIREF = new UriRef(_NS_ONTONET + _SHORT_SCOPE);
+ public static final IRI SCOPE_URIREF = new IRI(_NS_ONTONET + _SHORT_SCOPE);
/**
* The OWL <b>class</b> <tt>Session</tt>.
*/
- public static final OWLClass SESSION = __df.getOWLClass(IRI.create(_NS_ONTONET + _SHORT_SESSION));
+ public static final OWLClass SESSION = __df.getOWLClass(org.semanticweb.owlapi.model.IRI.create(_NS_ONTONET + _SHORT_SESSION));
/**
- * The OWL <b>class</b> <tt>Session</tt> (in UriRef form).
+ * The OWL <b>class</b> <tt>Session</tt> (in IRI form).
*/
- public static final UriRef SESSION_URIREF = new UriRef(_NS_ONTONET + _SHORT_SESSION);
+ public static final IRI SESSION_URIREF = new IRI(_NS_ONTONET + _SHORT_SESSION);
/**
* The OWL <b>datatype property</b> <tt>hasSizeInAxioms</tt>.
*/
- public static final OWLDataProperty SIZE_IN_AXIOMS = __df.getOWLDataProperty(IRI
+ public static final OWLDataProperty SIZE_IN_AXIOMS = __df.getOWLDataProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_SIZE_IN_AXIOMS));
/**
- * The OWL <b>datatype property</b> <tt>hasSizeInAxioms</tt> (in UriRef form).
+ * The OWL <b>datatype property</b> <tt>hasSizeInAxioms</tt> (in IRI form).
*/
- public static final UriRef SIZE_IN_AXIOMS_URIREF = new UriRef(_NS_ONTONET + _SHORT_SIZE_IN_AXIOMS);
+ public static final IRI SIZE_IN_AXIOMS_URIREF = new IRI(_NS_ONTONET + _SHORT_SIZE_IN_AXIOMS);
/**
* The OWL <b>datatype property</b> <tt>hasSizeInTriples</tt>.
*/
- public static final OWLDataProperty SIZE_IN_TRIPLES = __df.getOWLDataProperty(IRI
+ public static final OWLDataProperty SIZE_IN_TRIPLES = __df.getOWLDataProperty(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_SIZE_IN_TRIPLES));
/**
- * The OWL <b>datatype property</b> <tt>hasSizeInTriples</tt> (in UriRef form).
+ * The OWL <b>datatype property</b> <tt>hasSizeInTriples</tt> (in IRI form).
*/
- public static final UriRef SIZE_IN_TRIPLES_URIREF = new UriRef(_NS_ONTONET + _SHORT_SIZE_IN_TRIPLES);
+ public static final IRI SIZE_IN_TRIPLES_URIREF = new IRI(_NS_ONTONET + _SHORT_SIZE_IN_TRIPLES);
/**
* The OWL <b>class</b> <tt>Space</tt>.
*/
- public static final OWLClass SPACE = __df.getOWLClass(IRI.create(_NS_ONTONET + _SHORT_SPACE));
+ public static final OWLClass SPACE = __df.getOWLClass(org.semanticweb.owlapi.model.IRI.create(_NS_ONTONET + _SHORT_SPACE));
/**
- * The OWL <b>class</b> <tt>Space</tt> (in UriRef form).
+ * The OWL <b>class</b> <tt>Space</tt> (in IRI form).
*/
- public static final UriRef SPACE_URIREF = new UriRef(_NS_ONTONET + _SHORT_SPACE);
+ public static final IRI SPACE_URIREF = new IRI(_NS_ONTONET + _SHORT_SPACE);
/**
* The OWL <b>class</b> <tt>Status</tt>.
*/
- public static final OWLClass STATUS = __df.getOWLClass(IRI.create(_NS_ONTONET + _SHORT_STATUS));
+ public static final OWLClass STATUS = __df.getOWLClass(org.semanticweb.owlapi.model.IRI.create(_NS_ONTONET + _SHORT_STATUS));
/**
* The OWL <b>individual</b> <tt>Status.ACTIVE</tt>.
*/
- public static final OWLIndividual STATUS_ACTIVE = __df.getOWLNamedIndividual(IRI
+ public static final OWLIndividual STATUS_ACTIVE = __df.getOWLNamedIndividual(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_STATUS_ACTIVE));
/**
- * The OWL <b>individual</b> <tt>Status.ACTIVE</tt> (in UriRef form).
+ * The OWL <b>individual</b> <tt>Status.ACTIVE</tt> (in IRI form).
*/
- public static final UriRef STATUS_ACTIVE_URIREF = new UriRef(_NS_ONTONET + _SHORT_STATUS_ACTIVE);
+ public static final IRI STATUS_ACTIVE_URIREF = new IRI(_NS_ONTONET + _SHORT_STATUS_ACTIVE);
/**
* The OWL <b>individual</b> <tt>Status.INACTIVE</tt>.
*/
- public static final OWLIndividual STATUS_INACTIVE = __df.getOWLNamedIndividual(IRI
+ public static final OWLIndividual STATUS_INACTIVE = __df.getOWLNamedIndividual(org.semanticweb.owlapi.model.IRI
.create(_NS_ONTONET + _SHORT_STATUS_INACTIVE));
/**
- * The OWL <b>individual</b> <tt>Status.INACTIVE</tt> (in UriRef form).
+ * The OWL <b>individual</b> <tt>Status.INACTIVE</tt> (in IRI form).
*/
- public static final UriRef STATUS_INACTIVE_URIREF = new UriRef(_NS_ONTONET + _SHORT_STATUS_INACTIVE);
+ public static final IRI STATUS_INACTIVE_URIREF = new IRI(_NS_ONTONET + _SHORT_STATUS_INACTIVE);
/**
- * The OWL <b>class</b> <tt>Status</tt> (in UriRef form).
+ * The OWL <b>class</b> <tt>Status</tt> (in IRI form).
*/
- public static final UriRef STATUS_URIREF = new UriRef(_NS_ONTONET + _SHORT_STATUS);
+ public static final IRI STATUS_URIREF = new IRI(_NS_ONTONET + _SHORT_STATUS);
}
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/io/Origin.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/io/Origin.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/io/Origin.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/io/Origin.java Tue May 17 22:20:49 2016
@@ -16,9 +16,8 @@
*/
package org.apache.stanbol.ontologymanager.servicesapi.io;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.TcProvider;
-import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntologyID;
/**
@@ -27,7 +26,7 @@ import org.semanticweb.owlapi.model.OWLO
* <ul>
* <li> {@link IRI}, which is interpreted as the physical location of the resource.
* <li> {@link OWLOntologyID}, which is interpreted as the public key of an ontology already stored by Stanbol.
- * <li> {@link UriRef}, which is interpreted as the name of a graph to be retrieved from an underlying Clerezza
+ * <li> {@link IRI}, which is interpreted as the name of a graph to be retrieved from an underlying Clerezza
* store (typically a {@link TcProvider}).
* </ul>
*
@@ -45,8 +44,8 @@ public class Origin<R> {
* the physical location of the resource
* @return the origin that wraps this IRI.
*/
- public static Origin<IRI> create(IRI physicalURL) {
- return new Origin<IRI>(physicalURL);
+ public static Origin<org.semanticweb.owlapi.model.IRI> create(org.semanticweb.owlapi.model.IRI physicalURL) {
+ return new Origin<org.semanticweb.owlapi.model.IRI>(physicalURL);
}
/**
@@ -69,8 +68,8 @@ public class Origin<R> {
* the graph name
* @return the origin that wraps this graph name.
*/
- public static Origin<UriRef> create(UriRef graphName) {
- return new Origin<UriRef>(graphName);
+ public static Origin<IRI> create(IRI graphName) {
+ return new Origin<IRI>(graphName);
}
private R ref;
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/ontology/OntologyProvider.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/ontology/OntologyProvider.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/ontology/OntologyProvider.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/ontology/OntologyProvider.java Tue May 17 22:20:49 2016
@@ -20,9 +20,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Set;
-import org.apache.clerezza.rdf.core.Graph;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.TripleCollection;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.rdf.core.serializedform.UnsupportedFormatException;
import org.apache.stanbol.ontologymanager.ontonet.api.OntologyNetworkConfiguration;
@@ -144,13 +144,13 @@ public interface OntologyProvider<S> {
/**
* Returns the graph that stores all the information on stored ontologies. Whether the returned triple
- * collection is a {@link Graph} or a {@link MGraph} depends on the provider's policy on allowing external
+ * collection is a {@link ImmutableGraph} or a {@link Graph} depends on the provider's policy on allowing external
* modifications to the meta-level graph or not.
*
* @param returnType
* @return
*/
- <O extends TripleCollection> O getMetaGraph(Class<O> returnType);
+ <O extends Graph> O getMetaGraph(Class<O> returnType);
@Deprecated
OWLOntologyID getOntologyId(String storageKey);
Copied: stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/GraphMultiplexer.java (from r1744311, stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/MGraphMultiplexer.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/GraphMultiplexer.java?p2=stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/GraphMultiplexer.java&p1=stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/MGraphMultiplexer.java&r1=1744311&r2=1744328&rev=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/MGraphMultiplexer.java (original)
+++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/GraphMultiplexer.java Tue May 17 22:20:49 2016
@@ -39,15 +39,14 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.apache.clerezza.rdf.core.Literal;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.IRI;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.TypedLiteral;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.clerezza.rdf.ontologies.OWL;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.stanbol.ontologymanager.core.scope.ScopeManagerImpl;
@@ -62,7 +61,6 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.servicesapi.session.SessionEvent;
import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager;
import org.apache.stanbol.ontologymanager.servicesapi.util.OntologyUtils;
-import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntologyID;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,7 +71,7 @@ import org.slf4j.LoggerFactory;
* @author alexdma
*
*/
-public class MGraphMultiplexer implements Multiplexer {
+public class GraphMultiplexer implements Multiplexer {
private class InvalidMetaGraphStateException extends RuntimeException {
@@ -95,9 +93,9 @@ public class MGraphMultiplexer implement
private Logger log = LoggerFactory.getLogger(getClass());
- private MGraph meta;
+ private Graph meta;
- public MGraphMultiplexer(MGraph metaGraph) {
+ public GraphMultiplexer(Graph metaGraph) {
this.meta = metaGraph;
}
@@ -109,66 +107,66 @@ public class MGraphMultiplexer implement
* the ontology
* @return
*/
- protected OWLOntologyID buildPublicKey(final UriRef resource) {
+ protected OWLOntologyID buildPublicKey(final IRI resource) {
// TODO desanitize?
- IRI oiri = null, viri = null;
+ org.semanticweb.owlapi.model.IRI oiri = null, viri = null;
Iterator<Triple> it = meta.filter(resource, HAS_ONTOLOGY_IRI_URIREF, null);
if (it.hasNext()) {
- Resource obj = it.next().getObject();
- if (obj instanceof UriRef) oiri = IRI.create(((UriRef) obj).getUnicodeString());
- else if (obj instanceof Literal) oiri = IRI.create(((Literal) obj).getLexicalForm());
+ RDFTerm obj = it.next().getObject();
+ if (obj instanceof IRI) oiri = org.semanticweb.owlapi.model.IRI.create(((IRI) obj).getUnicodeString());
+ else if (obj instanceof Literal) oiri = org.semanticweb.owlapi.model.IRI.create(((Literal) obj).getLexicalForm());
} else {
// Anonymous ontology? Decode the resource itself (which is not null)
return OntologyUtils.decode(resource.getUnicodeString());
}
it = meta.filter(resource, HAS_VERSION_IRI_URIREF, null);
if (it.hasNext()) {
- Resource obj = it.next().getObject();
- if (obj instanceof UriRef) viri = IRI.create(((UriRef) obj).getUnicodeString());
- else if (obj instanceof Literal) viri = IRI.create(((Literal) obj).getLexicalForm());
+ RDFTerm obj = it.next().getObject();
+ if (obj instanceof IRI) viri = org.semanticweb.owlapi.model.IRI.create(((IRI) obj).getUnicodeString());
+ else if (obj instanceof Literal) viri = org.semanticweb.owlapi.model.IRI.create(((Literal) obj).getLexicalForm());
}
if (viri == null) return new OWLOntologyID(oiri);
else return new OWLOntologyID(oiri, viri);
}
/**
- * Creates an {@link UriRef} out of an {@link OWLOntologyID}, so it can be used as an identifier. This
- * does NOT necessarily correspond to the UriRef that identifies the stored graph. In order to obtain
+ * Creates an {@link IRI} out of an {@link OWLOntologyID}, so it can be used as an identifier. This
+ * does NOT necessarily correspond to the IRI that identifies the stored graph. In order to obtain
* that, check the objects of any MAPS_TO_GRAPH assertions.
*
* @param publicKey
* @return
*/
- protected UriRef buildResource(final OWLOntologyID publicKey) {
+ protected IRI buildResource(final OWLOntologyID publicKey) {
if (publicKey == null) throw new IllegalArgumentException(
- "Cannot build a UriRef resource on a null public key!");
- // The UriRef is of the form ontologyIRI[:::versionIRI] (TODO use something less conventional?)
+ "Cannot build a IRI resource on a null public key!");
+ // The IRI is of the form ontologyIRI[:::versionIRI] (TODO use something less conventional?)
// XXX should versionIRI also include the version IRI set by owners? Currently not
// Remember not to sanitize logical identifiers.
- IRI ontologyIri = publicKey.getOntologyIRI(), versionIri = publicKey.getVersionIRI();
+ org.semanticweb.owlapi.model.IRI ontologyIri = publicKey.getOntologyIRI(), versionIri = publicKey.getVersionIRI();
if (ontologyIri == null) throw new IllegalArgumentException(
- "Cannot build a UriRef resource on an anonymous public key!");
+ "Cannot build a IRI resource on an anonymous public key!");
log.debug("Searching for a meta graph entry for public key:");
log.debug(" -- {}", publicKey);
- UriRef match = null;
+ IRI match = null;
LiteralFactory lf = LiteralFactory.getInstance();
- TypedLiteral oiri = lf.createTypedLiteral(new UriRef(ontologyIri.toString()));
- TypedLiteral viri = versionIri == null ? null : lf.createTypedLiteral(new UriRef(versionIri
+ Literal oiri = lf.createTypedLiteral(new IRI(ontologyIri.toString()));
+ Literal viri = versionIri == null ? null : lf.createTypedLiteral(new IRI(versionIri
.toString()));
for (Iterator<Triple> it = meta.filter(null, HAS_ONTOLOGY_IRI_URIREF, oiri); it.hasNext();) {
- Resource subj = it.next().getSubject();
+ RDFTerm subj = it.next().getSubject();
log.debug(" -- Ontology IRI match found. Scanning");
- log.debug(" -- Resource : {}", subj);
- if (!(subj instanceof UriRef)) {
+ log.debug(" -- RDFTerm : {}", subj);
+ if (!(subj instanceof IRI)) {
log.debug(" ---- (uncomparable: skipping...)");
continue;
}
if (viri != null) {
// Must find matching versionIRI
- if (meta.contains(new TripleImpl((UriRef) subj, HAS_VERSION_IRI_URIREF, viri))) {
+ if (meta.contains(new TripleImpl((IRI) subj, HAS_VERSION_IRI_URIREF, viri))) {
log.debug(" ---- Version IRI match!");
- match = (UriRef) subj;
+ match = (IRI) subj;
break; // Found
} else {
log.debug(" ---- Expected version IRI match not found.");
@@ -177,23 +175,23 @@ public class MGraphMultiplexer implement
} else {
// Must find unversioned resource
- if (meta.filter((UriRef) subj, HAS_VERSION_IRI_URIREF, null).hasNext()) {
+ if (meta.filter((IRI) subj, HAS_VERSION_IRI_URIREF, null).hasNext()) {
log.debug(" ---- Unexpected version IRI found. Skipping.");
continue;
} else {
log.debug(" ---- Unversioned match!");
- match = (UriRef) subj;
+ match = (IRI) subj;
break; // Found
}
}
}
- log.debug("Matching UriRef in graph : {}", match);
- if (match == null) return new UriRef(OntologyUtils.encode(publicKey));
+ log.debug("Matching IRI in graph : {}", match);
+ if (match == null) return new IRI(OntologyUtils.encode(publicKey));
else return match;
}
- private void checkHandle(UriRef candidate, Set<OntologyCollector> handles) {
+ private void checkHandle(IRI candidate, Set<OntologyCollector> handles) {
/*
* We have to do it like this because we cannot make this class a Component and reference ONManager
@@ -208,7 +206,7 @@ public class MGraphMultiplexer implement
// TODO check when not explicitly typed.
SpaceType spaceType;
if (meta.contains(new TripleImpl(candidate, RDF.type, SPACE_URIREF))) {
- Resource rScope;
+ RDFTerm rScope;
Iterator<Triple> parentSeeker = meta.filter(candidate, IS_SPACE_CORE_OF_URIREF, null);
if (parentSeeker.hasNext()) {
rScope = parentSeeker.next().getObject();
@@ -233,9 +231,9 @@ public class MGraphMultiplexer implement
}
}
}
- if (!(rScope instanceof UriRef)) throw new InvalidMetaGraphStateException(
+ if (!(rScope instanceof IRI)) throw new InvalidMetaGraphStateException(
rScope + " is not a legal scope identifier.");
- String scopeId = ((UriRef) rScope).getUnicodeString().substring(prefix_scope.length());
+ String scopeId = ((IRI) rScope).getUnicodeString().substring(prefix_scope.length());
Scope scope = scopeManager.getScope(scopeId);
switch (spaceType) {
case CORE:
@@ -261,7 +259,7 @@ public class MGraphMultiplexer implement
Set<OWLOntologyID> aliases = listAliases(dependent);
aliases.add(dependent);
for (OWLOntologyID depalias : aliases) {
- UriRef dep = buildResource(depalias);
+ IRI dep = buildResource(depalias);
Iterator<Triple> it = meta.filter(dep, DEPENDS_ON_URIREF, null);
while (it.hasNext()) {
Triple t = it.next();
@@ -288,19 +286,19 @@ public class MGraphMultiplexer implement
Set<OWLOntologyID> aliases = listAliases(dependent);
aliases.add(dependent);
for (OWLOntologyID depalias : aliases) {
- UriRef dep = buildResource(depalias);
+ IRI dep = buildResource(depalias);
Iterator<Triple> it = meta.filter(dep, DEPENDS_ON_URIREF, null);
while (it.hasNext()) {
- Resource obj = it.next().getObject();
+ RDFTerm obj = it.next().getObject();
log.debug(" ... found {} (inverse).", obj);
- if (obj instanceof UriRef) dependencies.add(buildPublicKey((UriRef) obj));
+ if (obj instanceof IRI) dependencies.add(buildPublicKey((IRI) obj));
else log.warn(" ... Unexpected literal value!");
}
it = meta.filter(null, HAS_DEPENDENT_URIREF, dep);
while (it.hasNext()) {
- Resource sub = it.next().getSubject();
+ RDFTerm sub = it.next().getSubject();
log.debug(" ... found {} (inverse).", sub);
- if (sub instanceof UriRef) dependencies.add(buildPublicKey((UriRef) sub));
+ if (sub instanceof IRI) dependencies.add(buildPublicKey((IRI) sub));
else log.warn(" ... Unexpected literal value!");
}
}
@@ -311,21 +309,21 @@ public class MGraphMultiplexer implement
@Override
public Set<OWLOntologyID> getDependents(OWLOntologyID dependency) {
Set<OWLOntologyID> dependents = new HashSet<OWLOntologyID>();
- UriRef dep = buildResource(dependency);
+ IRI dep = buildResource(dependency);
log.debug("Getting depents for {}", dependency);
synchronized (meta) {
Iterator<Triple> it = meta.filter(null, DEPENDS_ON_URIREF, dep);
while (it.hasNext()) {
- Resource sub = it.next().getSubject();
+ RDFTerm sub = it.next().getSubject();
log.debug(" ... found {} (inverse).", sub);
- if (sub instanceof UriRef) dependents.add(buildPublicKey((UriRef) sub));
+ if (sub instanceof IRI) dependents.add(buildPublicKey((IRI) sub));
else log.warn(" ... Unexpected literal value!");
}
it = meta.filter(dep, HAS_DEPENDENT_URIREF, null);
while (it.hasNext()) {
- Resource obj = it.next().getObject();
+ RDFTerm obj = it.next().getObject();
log.debug(" ... found {} (inverse).", obj);
- if (obj instanceof UriRef) dependents.add(buildPublicKey((UriRef) obj));
+ if (obj instanceof IRI) dependents.add(buildPublicKey((IRI) obj));
else log.warn(" ... Unexpected literal value!");
}
}
@@ -338,18 +336,18 @@ public class MGraphMultiplexer implement
Set<OWLOntologyID> aliases = listAliases(publicKey);
aliases.add(publicKey);
for (OWLOntologyID alias : aliases) {
- UriRef ontologyId = buildResource(alias);
+ IRI ontologyId = buildResource(alias);
for (Iterator<Triple> it = meta.filter(null, MANAGES_URIREF, ontologyId); it.hasNext();) {
- NonLiteral sub = it.next().getSubject();
- if (sub instanceof UriRef) checkHandle((UriRef) sub, handles);
+ BlankNodeOrIRI sub = it.next().getSubject();
+ if (sub instanceof IRI) checkHandle((IRI) sub, handles);
else throw new InvalidMetaGraphStateException(
sub + " is not a valid ontology collector identifer.");
}
for (Iterator<Triple> it = meta.filter(ontologyId, IS_MANAGED_BY_URIREF, null); it.hasNext();) {
- Resource obj = it.next().getObject();
- if (obj instanceof UriRef) checkHandle((UriRef) obj, handles);
+ RDFTerm obj = it.next().getObject();
+ if (obj instanceof IRI) checkHandle((IRI) obj, handles);
else throw new InvalidMetaGraphStateException(
obj + " is not a valid ontology collector identifer.");
}
@@ -358,26 +356,26 @@ public class MGraphMultiplexer implement
// throw new UnsupportedOperationException("Not implemented yet.");
}
- private UriRef getIRIforScope(String scopeId) {
+ private IRI getIRIforScope(String scopeId) {
// Use the Stanbol-internal namespace, so that the whole configuration can be ported.
- return new UriRef(_NS_STANBOL_INTERNAL + Scope.shortName + "/" + scopeId);
+ return new IRI(_NS_STANBOL_INTERNAL + Scope.shortName + "/" + scopeId);
}
- private UriRef getIRIforSession(Session session) {
+ private IRI getIRIforSession(Session session) {
// Use the Stanbol-internal namespace, so that the whole configuration can be ported.
- return new UriRef(_NS_STANBOL_INTERNAL + Session.shortName + "/" + session.getID());
+ return new IRI(_NS_STANBOL_INTERNAL + Session.shortName + "/" + session.getID());
}
- private UriRef getIRIforSpace(OntologySpace space) {
+ private IRI getIRIforSpace(OntologySpace space) {
// Use the Stanbol-internal namespace, so that the whole configuration can be ported.
- return new UriRef(_NS_STANBOL_INTERNAL + OntologySpace.shortName + "/" + space.getID());
+ return new IRI(_NS_STANBOL_INTERNAL + OntologySpace.shortName + "/" + space.getID());
}
@Override
public OWLOntologyID getPublicKey(String stringForm) {
if (stringForm == null || stringForm.trim().isEmpty()) throw new IllegalArgumentException(
"String form must not be null or empty.");
- return buildPublicKey(new UriRef(stringForm));
+ return buildPublicKey(new IRI(stringForm));
}
@Override
@@ -385,18 +383,18 @@ public class MGraphMultiplexer implement
Set<OWLOntologyID> result = new HashSet<OWLOntologyID>();
Iterator<Triple> it = meta.filter(null, RDF.type, ENTRY_URIREF);
while (it.hasNext()) {
- Resource obj = it.next().getSubject();
- if (obj instanceof UriRef) result.add(buildPublicKey((UriRef) obj));
+ RDFTerm obj = it.next().getSubject();
+ if (obj instanceof IRI) result.add(buildPublicKey((IRI) obj));
}
return result;
}
@Override
public int getSize(OWLOntologyID publicKey) {
- UriRef subj = buildResource(publicKey);
+ IRI subj = buildResource(publicKey);
Iterator<Triple> it = meta.filter(subj, SIZE_IN_TRIPLES_URIREF, null);
if (it.hasNext()) {
- Resource obj = it.next().getObject();
+ RDFTerm obj = it.next().getObject();
if (obj instanceof Literal) {
String s = ((Literal) obj).getLexicalForm();
try {
@@ -417,16 +415,16 @@ public class MGraphMultiplexer implement
if (publicKey == null || publicKey.isAnonymous()) throw new IllegalArgumentException(
"Cannot locate aliases for null or anonymous public keys.");
Set<OWLOntologyID> aliases = new HashSet<OWLOntologyID>();
- UriRef ont = buildResource(publicKey);
+ IRI ont = buildResource(publicKey);
// Forwards
for (Iterator<Triple> it = meta.filter(ont, OWL.sameAs, null); it.hasNext();) {
- Resource r = it.next().getObject();
- if (r instanceof UriRef) aliases.add(buildPublicKey((UriRef) r));
+ RDFTerm r = it.next().getObject();
+ if (r instanceof IRI) aliases.add(buildPublicKey((IRI) r));
}
// Backwards
for (Iterator<Triple> it = meta.filter(null, OWL.sameAs, ont); it.hasNext();) {
- Resource r = it.next().getSubject();
- if (r instanceof UriRef) aliases.add(buildPublicKey((UriRef) r));
+ RDFTerm r = it.next().getSubject();
+ if (r instanceof IRI) aliases.add(buildPublicKey((IRI) r));
}
return aliases;
}
@@ -443,9 +441,9 @@ public class MGraphMultiplexer implement
if (collector instanceof Scope) colltype = Scope.shortName + "/"; // Cannot be
else if (collector instanceof OntologySpace) colltype = OntologySpace.shortName + "/";
else if (collector instanceof Session) colltype = Session.shortName + "/";
- UriRef c = new UriRef(_NS_STANBOL_INTERNAL + colltype + collector.getID());
- UriRef u =
- // new UriRef(prefix + "::" + keymap.buildResource(addedOntology).getUnicodeString());
+ IRI c = new IRI(_NS_STANBOL_INTERNAL + colltype + collector.getID());
+ IRI u =
+ // new IRI(prefix + "::" + keymap.buildResource(addedOntology).getUnicodeString());
// keymap.getMapping(addedOntology);
buildResource(addedOntology);
@@ -464,7 +462,7 @@ public class MGraphMultiplexer implement
if (!hasValues) log.debug("-- <none>");
// Add both inverse triples. This graph has to be traversed efficiently, no need for reasoners.
- UriRef predicate1 = null, predicate2 = null;
+ IRI predicate1 = null, predicate2 = null;
if (collector instanceof OntologySpace) {
predicate1 = MANAGES_URIREF;
predicate2 = IS_MANAGED_BY_URIREF;
@@ -503,17 +501,17 @@ public class MGraphMultiplexer implement
if (collector instanceof Scope) colltype = Scope.shortName + "/"; // Cannot be
else if (collector instanceof OntologySpace) colltype = OntologySpace.shortName + "/";
else if (collector instanceof Session) colltype = Session.shortName + "/";
- UriRef c = new UriRef(_NS_STANBOL_INTERNAL + colltype + collector.getID());
+ IRI c = new IRI(_NS_STANBOL_INTERNAL + colltype + collector.getID());
Set<OWLOntologyID> aliases = listAliases(removedOntology);
aliases.add(removedOntology);
boolean badState = true;
for (OWLOntologyID alias : aliases) {
- UriRef u = buildResource(alias);
+ IRI u = buildResource(alias);
// XXX condense the following code
log.debug("Checking ({},{}) pattern", c, u);
for (Iterator<Triple> it = meta.filter(c, null, u); it.hasNext();) {
- UriRef property = it.next().getPredicate();
+ IRI property = it.next().getPredicate();
if (collector instanceof OntologySpace || collector instanceof Session) {
if (property.equals(MANAGES_URIREF)) badState = false;
}
@@ -521,7 +519,7 @@ public class MGraphMultiplexer implement
log.debug("Checking ({},{}) pattern", u, c);
for (Iterator<Triple> it = meta.filter(u, null, c); it.hasNext();) {
- UriRef property = it.next().getPredicate();
+ IRI property = it.next().getPredicate();
if (collector instanceof OntologySpace || collector instanceof Session) {
if (property.equals(IS_MANAGED_BY_URIREF)) badState = false;
}
@@ -547,12 +545,12 @@ public class MGraphMultiplexer implement
log.debug("Removing dependency.");
log.debug(" ... dependent : {}", dependent);
log.debug(" ... dependency : {}", dependency);
- UriRef depy = buildResource(dependency);
+ IRI depy = buildResource(dependency);
synchronized (meta) {
Set<OWLOntologyID> aliases = listAliases(dependent);
aliases.add(dependent);
for (OWLOntologyID depalias : aliases) {
- UriRef dep = buildResource(depalias);
+ IRI dep = buildResource(depalias);
Triple t = new TripleImpl(dep, DEPENDS_ON_URIREF, depy);
boolean found = false;
if (meta.contains(t)) {
@@ -575,10 +573,10 @@ public class MGraphMultiplexer implement
@Override
public void scopeAppended(Session session, String scopeId) {
- final UriRef sessionur = getIRIforSession(session), scopeur = getIRIforScope(scopeId);
+ final IRI sessionur = getIRIforSession(session), scopeur = getIRIforScope(scopeId);
if (sessionur == null || scopeur == null) throw new IllegalArgumentException(
- "UriRefs for scope and session cannot be null.");
- if (meta instanceof MGraph) synchronized (meta) {
+ "IRIs for scope and session cannot be null.");
+ if (meta instanceof Graph) synchronized (meta) {
meta.add(new TripleImpl(sessionur, HAS_APPENDED_URIREF, scopeur));
meta.add(new TripleImpl(scopeur, APPENDED_TO_URIREF, sessionur));
}
@@ -592,10 +590,10 @@ public class MGraphMultiplexer implement
@Override
public void scopeDetached(Session session, String scopeId) {
- final UriRef sessionur = getIRIforSession(session), scopeur = getIRIforScope(scopeId);
+ final IRI sessionur = getIRIforSession(session), scopeur = getIRIforScope(scopeId);
if (sessionur == null || scopeur == null) throw new IllegalArgumentException(
- "UriRefs for scope and session cannot be null.");
- if (meta instanceof MGraph) synchronized (meta) {
+ "IRIs for scope and session cannot be null.");
+ if (meta instanceof Graph) synchronized (meta) {
// TripleImpl implements equals() and hashCode() ...
meta.remove(new TripleImpl(sessionur, HAS_APPENDED_URIREF, scopeur));
meta.remove(new TripleImpl(scopeur, APPENDED_TO_URIREF, sessionur));
@@ -633,7 +631,7 @@ public class MGraphMultiplexer implement
log.debug("Setting dependency.");
log.debug(" ... dependent : {}", dependent);
log.debug(" ... dependency : {}", dependency);
- UriRef dep = buildResource(dependent), depy = buildResource(dependency);
+ IRI dep = buildResource(dependent), depy = buildResource(dependency);
// TODO check for the actual resource!
synchronized (meta) {
meta.add(new TripleImpl(dep, DEPENDS_ON_URIREF, depy));
@@ -648,9 +646,9 @@ public class MGraphMultiplexer implement
* the scope whose information needs to be updated.
*/
private void updateScopeRegistration(Scope scope) {
- final UriRef scopeur = getIRIforScope(scope.getID());
- final UriRef coreur = getIRIforSpace(scope.getCoreSpace());
- final UriRef custur = getIRIforSpace(scope.getCustomSpace());
+ final IRI scopeur = getIRIforScope(scope.getID());
+ final IRI coreur = getIRIforSpace(scope.getCoreSpace());
+ final IRI custur = getIRIforSpace(scope.getCustomSpace());
// If this method was called after a scope rebuild, the following will have little to no effect.
synchronized (meta) {
// Spaces are created along with the scope, so it is safe to add their triples.
@@ -675,9 +673,9 @@ public class MGraphMultiplexer implement
private void updateScopeUnregistration(Scope scope) {
long before = System.currentTimeMillis();
boolean removable = false, conflict = false;
- final UriRef scopeur = getIRIforScope(scope.getID());
- final UriRef coreur = getIRIforSpace(scope.getCoreSpace());
- final UriRef custur = getIRIforSpace(scope.getCustomSpace());
+ final IRI scopeur = getIRIforScope(scope.getID());
+ final IRI coreur = getIRIforSpace(scope.getCoreSpace());
+ final IRI custur = getIRIforSpace(scope.getCustomSpace());
Set<Triple> removeUs = new HashSet<Triple>();
for (Iterator<Triple> it = meta.filter(scopeur, null, null); it.hasNext();) {
Triple t = it.next();
@@ -715,7 +713,7 @@ public class MGraphMultiplexer implement
}
private void updateSessionRegistration(Session session) {
- final UriRef sesur = getIRIforSession(session);
+ final IRI sesur = getIRIforSession(session);
// If this method was called after a session rebuild, the following will have little to no effect.
synchronized (meta) {
// The only essential triple to add is typing
@@ -727,7 +725,7 @@ public class MGraphMultiplexer implement
private void updateSessionUnregistration(Session session) {
long before = System.currentTimeMillis();
boolean removable = false, conflict = false;
- final UriRef sessionur = getIRIforSession(session);
+ final IRI sessionur = getIRIforSession(session);
Set<Triple> removeUs = new HashSet<Triple>();
for (Iterator<Triple> it = meta.filter(sessionur, null, null); it.hasNext();) {
Triple t = it.next();
Modified: stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/AbstractOntologyCollectorImpl.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/AbstractOntologyCollectorImpl.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/AbstractOntologyCollectorImpl.java (original)
+++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/AbstractOntologyCollectorImpl.java Tue May 17 22:20:49 2016
@@ -27,19 +27,19 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.clerezza.rdf.core.Graph;
-import org.apache.clerezza.rdf.core.Literal;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.TripleCollection;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-import org.apache.clerezza.rdf.core.impl.TripleImpl;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.IRI;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.ontologies.OWL;
import org.apache.clerezza.rdf.ontologies.RDF;
-import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
+import org.apache.stanbol.commons.indexedgraph.IndexedGraph;
import org.apache.stanbol.commons.owl.util.URIUtils;
import org.apache.stanbol.ontologymanager.servicesapi.collector.Lockable;
import org.apache.stanbol.ontologymanager.servicesapi.collector.MissingOntologyException;
@@ -57,7 +57,6 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.sources.owlapi.RootOntologySource;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.AddImport;
-import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.OWLImportsDeclaration;
import org.semanticweb.owlapi.model.OWLOntology;
@@ -109,17 +108,17 @@ public abstract class AbstractOntologyCo
*/
protected Set<OWLOntologyID> managedOntologies;
- protected IRI namespace = null;
+ protected org.semanticweb.owlapi.model.IRI namespace = null;
protected OntologyProvider<?> ontologyProvider;
protected Set<Class<?>> supportedTypes;
- public AbstractOntologyCollectorImpl(String id, IRI namespace, OntologyProvider<?> ontologyProvider) {
+ public AbstractOntologyCollectorImpl(String id, org.semanticweb.owlapi.model.IRI namespace, OntologyProvider<?> ontologyProvider) {
// Supports OWL API and Clerezza
supportedTypes = new HashSet<Class<?>>();
supportedTypes.add(OWLOntology.class);
- supportedTypes.add(TripleCollection.class);
+ supportedTypes.add(Graph.class);
setID(id);
setDefaultNamespace(namespace);
this.ontologyProvider = ontologyProvider;
@@ -140,8 +139,8 @@ public abstract class AbstractOntologyCo
long before = System.currentTimeMillis();
Object o = ontologySource.getRootOntology();
// // FIXME restore ownership management, but maybe not by directly setting the versionIRI
- // if (ontologyProvider.hasOntology(id.getOntologyIRI())) if (o instanceof MGraph)
- // claimOwnership((MGraph) o);
+ // if (ontologyProvider.hasOntology(id.getOntologyIRI())) if (o instanceof Graph)
+ // claimOwnership((Graph) o);
// else if (o instanceof OWLOntology) claimOwnership((OWLOntology) o);
// Check the origin anyhow, as it may be useful for setting aliases with physical locations etc.
@@ -161,15 +160,15 @@ public abstract class AbstractOntologyCo
Origin<?> origin = ontologySource.getOrigin();
Object ref = origin.getReference();
log.debug("Origin wraps a {}", ref.getClass().getCanonicalName());
- if (ref instanceof IRI) try {
+ if (ref instanceof org.semanticweb.owlapi.model.IRI) try {
log.debug("Deferring addition to physical IRI {} (if available).", ref);
- key = addOntology(new RootOntologySource((IRI) ref));
+ key = addOntology(new RootOntologySource((org.semanticweb.owlapi.model.IRI) ref));
} catch (OWLOntologyCreationException e) {
throw new RuntimeException(e);
}
- else if (ref instanceof UriRef) {
+ else if (ref instanceof IRI) {
log.debug("Deferring addition to stored Clerezza graph {} (if available).", ref);
- key = addOntology(new GraphSource((UriRef) ref));
+ key = addOntology(new GraphSource((IRI) ref));
} else if (ref instanceof OWLOntologyID) {
OWLOntologyID idref = (OWLOntologyID) ref;
log.debug("Deferring addition to stored ontology with public key {} (if available).", ref);
@@ -219,15 +218,15 @@ public abstract class AbstractOntologyCo
@SuppressWarnings("unchecked")
@Override
- public <O> O export(Class<O> returnType, boolean merge, IRI universalPrefix) {
+ public <O> O export(Class<O> returnType, boolean merge, org.semanticweb.owlapi.model.IRI universalPrefix) {
if (OWLOntology.class.isAssignableFrom(returnType)) {
return (O) exportToOWLOntology(merge, universalPrefix);
}
- if (TripleCollection.class.isAssignableFrom(returnType)) {
- TripleCollection root = exportToMGraph(merge, universalPrefix);
+ if (Graph.class.isAssignableFrom(returnType)) {
+ Graph root = exportToGraph(merge, universalPrefix);
// A Clerezza graph has to be cast properly.
- if (returnType == Graph.class) root = ((MGraph) root).getGraph();
- else if (returnType == MGraph.class) {}
+ if (returnType == ImmutableGraph.class) root = ((Graph) root).getImmutableGraph();
+ else if (returnType == Graph.class) {}
return (O) root;
}
throw new UnsupportedOperationException("Cannot export ontology collector " + getID() + " to a "
@@ -241,15 +240,15 @@ public abstract class AbstractOntologyCo
* @param merge
* @return
*/
- protected MGraph exportToMGraph(boolean merge, IRI prefix) {
+ protected Graph exportToGraph(boolean merge, org.semanticweb.owlapi.model.IRI prefix) {
// if (merge) throw new UnsupportedOperationException(
// "Merge not implemented yet for Clerezza triple collections.");
long before = System.currentTimeMillis();
// No need to store, give it a name, or anything.
- MGraph root = new SimpleMGraph();
- UriRef iri = new UriRef(prefix + _id);
+ Graph root = new SimpleGraph();
+ IRI iri = new IRI(prefix + _id);
// Add the import declarations for directly managed ontologies.
if (root != null) {
// Set the ontology ID
@@ -258,21 +257,21 @@ public abstract class AbstractOntologyCo
if (merge) {
log.warn("Merging of Clerezza triple collections is only implemented one level down. Import statements will be preserved for further levels.");
Iterator<Triple> it;
- Set<Resource> importTargets = new HashSet<Resource>();
+ Set<RDFTerm> importTargets = new HashSet<RDFTerm>();
for (OWLOntologyID ontologyId : managedOntologies) {
- Graph g = getOntology(ontologyId, Graph.class, false);
+ ImmutableGraph g = getOntology(ontologyId, ImmutableGraph.class, false);
root.addAll(g);
it = g.filter(null, OWL.imports, null);
while (it.hasNext()) {
- IRI tgt;
- Resource r = it.next().getObject();
+ org.semanticweb.owlapi.model.IRI tgt;
+ RDFTerm r = it.next().getObject();
try {
- if (r instanceof UriRef) tgt = IRI.create(((UriRef) r).getUnicodeString());
- else if (r instanceof Literal) tgt = IRI.create(((Literal) r).getLexicalForm());
- else tgt = IRI.create(r.toString());
+ if (r instanceof IRI) tgt = org.semanticweb.owlapi.model.IRI.create(((IRI) r).getUnicodeString());
+ else if (r instanceof Literal) tgt = org.semanticweb.owlapi.model.IRI.create(((Literal) r).getLexicalForm());
+ else tgt = org.semanticweb.owlapi.model.IRI.create(r.toString());
tgt = URIUtils.sanitize(tgt);
- importTargets.add(new UriRef(tgt.toString()));
+ importTargets.add(new IRI(tgt.toString()));
} catch (Exception ex) {
log.error("FAILED to obtain import target from resource {}", r);
continue;
@@ -282,7 +281,7 @@ public abstract class AbstractOntologyCo
it = g.filter(null, RDF.type, OWL.Ontology);
while (it.hasNext()) {
- NonLiteral ontology = it.next().getSubject();
+ BlankNodeOrIRI ontology = it.next().getSubject();
log.debug("Removing all triples related to {} from {}", ontology, iri);
Iterator<Triple> it2 = g.filter(ontology, null, null);
while (it2.hasNext())
@@ -293,7 +292,7 @@ public abstract class AbstractOntologyCo
* Reinstate import statements, though. If imported ontologies were not merged earlier, we
* are not doing it now anyway.
*/
- for (Resource target : importTargets)
+ for (RDFTerm target : importTargets)
root.add(new TripleImpl(iri, OWL.imports, target));
}
@@ -306,12 +305,12 @@ public abstract class AbstractOntologyCo
// The key set of managedOntologies contains the ontology IRIs, not their storage keys.
for (OWLOntologyID ontologyId : managedOntologies) {
- IRI physIRI =
+ org.semanticweb.owlapi.model.IRI physIRI =
// ontologyId.getVersionIRI() == null ? URIUtils.sanitize(IRI
// .create(base + ontologyId.getOntologyIRI())) : URIUtils.sanitize(IRI
// .create(base + ontologyId.getVersionIRI()));
- IRI.create(base + OntologyUtils.encode(ontologyId));
- root.add(new TripleImpl(iri, OWL.imports, new UriRef(physIRI.toString())));
+ org.semanticweb.owlapi.model.IRI.create(base + OntologyUtils.encode(ontologyId));
+ root.add(new TripleImpl(iri, OWL.imports, new IRI(physIRI.toString())));
}
}
@@ -322,13 +321,13 @@ public abstract class AbstractOntologyCo
return root;
}
- private TripleCollection getMergedTc() {
- TripleCollection result = new SimpleMGraph(); // Takes less memory than the Indexed one
+ private Graph getMergedTc() {
+ Graph result = new SimpleGraph(); // Takes less memory than the Indexed one
for (OWLOntologyID key : listManagedOntologies()) {
// TODO when implemented, switch to true.
- TripleCollection managed = getOntology(key, TripleCollection.class, false);
- Set<Resource> exclusions = new HashSet<Resource>();
+ Graph managed = getOntology(key, Graph.class, false);
+ Set<RDFTerm> exclusions = new HashSet<RDFTerm>();
Iterator<Triple> it = managed.filter(null, RDF.type, OWL.Ontology);
while (it.hasNext())
exclusions.add(it.next().getSubject());
@@ -350,14 +349,14 @@ public abstract class AbstractOntologyCo
* @param merge
* @return
*/
- protected OWLOntology exportToOWLOntology(boolean merge, IRI prefix) {
+ protected OWLOntology exportToOWLOntology(boolean merge, org.semanticweb.owlapi.model.IRI prefix) {
long before = System.currentTimeMillis();
// Create a new ontology
OWLOntology root;
OWLOntologyManager ontologyManager = OWLManager.createOWLOntologyManager();
- IRI iri = IRI.create(prefix + _id);
+ org.semanticweb.owlapi.model.IRI iri = org.semanticweb.owlapi.model.IRI.create(prefix + _id);
try {
root = ontologyManager.createOntology(iri);
} catch (OWLOntologyAlreadyExistsException e) {
@@ -418,7 +417,7 @@ public abstract class AbstractOntologyCo
// The key set of managedOntologies contains the ontology IRIs, not their storage keys.
for (OWLOntologyID ontologyId : managedOntologies) {
// XXX some day the versionIRI will be the only physical reference for the ontology
- IRI physIRI = IRI.create(base + OntologyUtils.encode(ontologyId));
+ org.semanticweb.owlapi.model.IRI physIRI = org.semanticweb.owlapi.model.IRI.create(base + OntologyUtils.encode(ontologyId));
changes.add(new AddImport(root, df.getOWLImportsDeclaration(physIRI)));
}
ontologyManager.applyChanges(changes);
@@ -458,7 +457,7 @@ public abstract class AbstractOntologyCo
}
@Override
- public IRI getDefaultNamespace() {
+ public org.semanticweb.owlapi.model.IRI getDefaultNamespace() {
return this.namespace;
}
@@ -478,27 +477,27 @@ public abstract class AbstractOntologyCo
}
@Override
- public IRI getNamespace() {
+ public org.semanticweb.owlapi.model.IRI getNamespace() {
return getDefaultNamespace();
}
@Override
- public <O> O getOntology(IRI ontologyIri, Class<O> returnType) {
+ public <O> O getOntology(org.semanticweb.owlapi.model.IRI ontologyIri, Class<O> returnType) {
return getOntology(new OWLOntologyID(ontologyIri), returnType);
}
@Override
- public <O> O getOntology(IRI ontologyIri, Class<O> returnType, boolean merge) {
+ public <O> O getOntology(org.semanticweb.owlapi.model.IRI ontologyIri, Class<O> returnType, boolean merge) {
return getOntology(new OWLOntologyID(ontologyIri), returnType, merge);
}
@Override
- public <O> O getOntology(IRI ontologyIri, Class<O> returnType, boolean merge, IRI universalPrefix) {
+ public <O> O getOntology(org.semanticweb.owlapi.model.IRI ontologyIri, Class<O> returnType, boolean merge, org.semanticweb.owlapi.model.IRI universalPrefix) {
return getOntology(new OWLOntologyID(ontologyIri), returnType, merge, universalPrefix);
}
@Override
- public <O> O getOntology(IRI ontologyIri, Class<O> returnType, IRI universalPrefix) {
+ public <O> O getOntology(org.semanticweb.owlapi.model.IRI ontologyIri, Class<O> returnType, org.semanticweb.owlapi.model.IRI universalPrefix) {
return getOntology(new OWLOntologyID(ontologyIri), returnType, universalPrefix);
}
@@ -514,15 +513,15 @@ public abstract class AbstractOntologyCo
@SuppressWarnings("unchecked")
@Override
- public <O> O getOntology(OWLOntologyID ontologyId, Class<O> returnType, boolean merge, IRI universalPrefix) {
+ public <O> O getOntology(OWLOntologyID ontologyId, Class<O> returnType, boolean merge, org.semanticweb.owlapi.model.IRI universalPrefix) {
if (OWLOntology.class.isAssignableFrom(returnType)) return (O) getOntologyAsOWLOntology(ontologyId,
merge, universalPrefix);
- if (TripleCollection.class.isAssignableFrom(returnType)) {
- TripleCollection root = getOntologyAsMGraph(ontologyId, merge, universalPrefix);
+ if (Graph.class.isAssignableFrom(returnType)) {
+ Graph root = getOntologyAsGraph(ontologyId, merge, universalPrefix);
// A Clerezza graph has to be cast properly.
- if (returnType == Graph.class) root = ((MGraph) root).getGraph();
- else if (returnType == MGraph.class) {}
- // We don't know of other TripleCollection subclasses: just try to cast the MGraph.
+ if (returnType == ImmutableGraph.class) root = ((Graph) root).getImmutableGraph();
+ else if (returnType == Graph.class) {}
+ // We don't know of other Graph subclasses: just try to cast the Graph.
return (O) root;
}
throw new UnsupportedOperationException("Cannot export ontology collector " + getID() + " to a "
@@ -530,11 +529,11 @@ public abstract class AbstractOntologyCo
}
@Override
- public <O> O getOntology(OWLOntologyID ontologyId, Class<O> returnType, IRI universalPrefix) {
+ public <O> O getOntology(OWLOntologyID ontologyId, Class<O> returnType, org.semanticweb.owlapi.model.IRI universalPrefix) {
return getOntology(ontologyId, returnType, false, universalPrefix);
}
- protected MGraph getOntologyAsMGraph(OWLOntologyID ontologyId, boolean merge, IRI universalPrefix) {
+ protected Graph getOntologyAsGraph(OWLOntologyID ontologyId, boolean merge, org.semanticweb.owlapi.model.IRI universalPrefix) {
if (merge) throw new UnsupportedOperationException(
"Merge not implemented yet for Clerezza triple collections.");
/*
@@ -543,7 +542,7 @@ public abstract class AbstractOntologyCo
* imported ontologies as *not* managed.
*/
// if (!merge) { // TODO
- MGraph o = new IndexedMGraph(ontologyProvider.getStoredOntology(ontologyId, MGraph.class, merge));
+ Graph o = new IndexedGraph(ontologyProvider.getStoredOntology(ontologyId, Graph.class, merge));
// Now rewrite import statements
@@ -563,11 +562,11 @@ public abstract class AbstractOntologyCo
replaceUs.add(it.next());
for (Triple t : replaceUs) {
- String s = ((UriRef) (t.getObject())).getUnicodeString();
+ String s = ((IRI) (t.getObject())).getUnicodeString();
// FIXME note the different import targets in the OWLOntology and TripleColllection objects!
// s = s.substring(s.indexOf("::") + 2, s.length());
- boolean managed = managedOntologies.contains(IRI.create(s));
- UriRef target = new UriRef((managed ? universalPrefix + "/" + tid + "/"
+ boolean managed = managedOntologies.contains(org.semanticweb.owlapi.model.IRI.create(s));
+ IRI target = new IRI((managed ? universalPrefix + "/" + tid + "/"
: URIUtils.upOne(universalPrefix) + "/")
+ s);
o.remove(t);
@@ -585,7 +584,7 @@ public abstract class AbstractOntologyCo
protected OWLOntology getOntologyAsOWLOntology(OWLOntologyID ontologyId,
boolean merge,
- IRI universalPrefix) {
+ org.semanticweb.owlapi.model.IRI universalPrefix) {
// if (merge) throw new UnsupportedOperationException("Merge not implemented yet for OWLOntology.");
// Remove the check below. It might be an unmanaged dependency (TODO remove from collector and
@@ -638,7 +637,7 @@ public abstract class AbstractOntologyCo
String tid = getID();
if (backwardPathLength > 0) tid = tid.split("/")[0];
- IRI target = IRI.create((managed ? universalPrefix + "/" + tid + "/" : URIUtils
+ org.semanticweb.owlapi.model.IRI target = org.semanticweb.owlapi.model.IRI.create((managed ? universalPrefix + "/" + tid + "/" : URIUtils
.upOne(universalPrefix) + "/")
+ s);
changes.add(new AddImport(o, df.getOWLImportsDeclaration(target)));
@@ -660,7 +659,7 @@ public abstract class AbstractOntologyCo
}
@Override
- public boolean hasOntology(IRI ontologyIri) {
+ public boolean hasOntology(org.semanticweb.owlapi.model.IRI ontologyIri) {
return hasOntology(new OWLOntologyID(ontologyIri));
}
@@ -684,7 +683,7 @@ public abstract class AbstractOntologyCo
}
@Override
- public void removeOntology(IRI ontologyId) throws OntologyCollectorModificationException {
+ public void removeOntology(org.semanticweb.owlapi.model.IRI ontologyId) throws OntologyCollectorModificationException {
removeOntology(new OWLOntologyID(ontologyId));
}
@@ -724,7 +723,7 @@ public abstract class AbstractOntologyCo
* will be logged.
*/
@Override
- public void setDefaultNamespace(IRI namespace) {
+ public void setDefaultNamespace(org.semanticweb.owlapi.model.IRI namespace) {
if (namespace == null) throw new IllegalArgumentException(
"Stanbol ontology namespace cannot be null.");
if (namespace.toURI().getQuery() != null) throw new IllegalArgumentException(
@@ -736,7 +735,7 @@ public abstract class AbstractOntologyCo
if (!namespace.toString().endsWith("/")) {
log.warn("Namespace {} does not end with a slash ('/') character. It be added automatically.",
namespace);
- namespace = IRI.create(namespace + "/");
+ namespace = org.semanticweb.owlapi.model.IRI.create(namespace + "/");
}
this.namespace = namespace;
}
@@ -744,7 +743,7 @@ public abstract class AbstractOntologyCo
protected abstract void setID(String id);
@Override
- public void setNamespace(IRI namespace) {
+ public void setNamespace(org.semanticweb.owlapi.model.IRI namespace) {
setDefaultNamespace(namespace);
}
Modified: stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/CustomSpaceImpl.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/CustomSpaceImpl.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/CustomSpaceImpl.java (original)
+++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/CustomSpaceImpl.java Tue May 17 22:20:49 2016
@@ -20,18 +20,17 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.impl.TripleImpl;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.IRI;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.ontologies.OWL;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyProvider;
import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.AddImport;
-import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyID;
@@ -49,7 +48,7 @@ public class CustomSpaceImpl extends Abs
return (scopeID != null ? scopeID : "") + "/" + SUFFIX;
}
- public CustomSpaceImpl(String scopeID, IRI namespace, OntologyProvider<?> ontologyProvider) {
+ public CustomSpaceImpl(String scopeID, org.semanticweb.owlapi.model.IRI namespace, OntologyProvider<?> ontologyProvider) {
super(buildId(scopeID), namespace, SpaceType.CUSTOM, ontologyProvider);
}
@@ -68,13 +67,13 @@ public class CustomSpaceImpl extends Abs
}
@Override
- protected MGraph getOntologyAsMGraph(OWLOntologyID ontologyId, boolean merge, IRI universalPrefix) {
- MGraph o = super.getOntologyAsMGraph(ontologyId, merge, universalPrefix);
+ protected Graph getOntologyAsGraph(OWLOntologyID ontologyId, boolean merge, org.semanticweb.owlapi.model.IRI universalPrefix) {
+ Graph o = super.getOntologyAsGraph(ontologyId, merge, universalPrefix);
switch (getConnectivityPolicy()) {
case LOOSE:
break;
case TIGHT:
- Set<NonLiteral> onts = new HashSet<NonLiteral>(); // Expected to be a singleton
+ Set<BlankNodeOrIRI> onts = new HashSet<BlankNodeOrIRI>(); // Expected to be a singleton
synchronized (o) {
Iterator<Triple> it = o.filter(null, RDF.type, OWL.Ontology);
while (it.hasNext())
@@ -83,8 +82,8 @@ public class CustomSpaceImpl extends Abs
String s = getID();
s = s.substring(0, s.indexOf(SUFFIX)); // strip "custom"
s += SpaceType.CORE.getIRISuffix(); // concatenate "core"
- UriRef target = new UriRef(universalPrefix + s);
- for (NonLiteral subject : onts)
+ IRI target = new IRI(universalPrefix + s);
+ for (BlankNodeOrIRI subject : onts)
o.add(new TripleImpl(subject, OWL.imports, target));
break;
default:
@@ -97,7 +96,7 @@ public class CustomSpaceImpl extends Abs
@Override
protected OWLOntology getOntologyAsOWLOntology(OWLOntologyID ontologyId,
boolean merge,
- IRI universalPrefix) {
+ org.semanticweb.owlapi.model.IRI universalPrefix) {
OWLOntology o = super.getOntologyAsOWLOntology(ontologyId, merge, universalPrefix);
switch (getConnectivityPolicy()) {
case LOOSE:
@@ -106,7 +105,7 @@ public class CustomSpaceImpl extends Abs
String s = getID();
s = s.substring(0, s.indexOf(SUFFIX)); // strip "custom"
s += SpaceType.CORE.getIRISuffix(); // concatenate "core"
- IRI target = IRI.create(universalPrefix + s);
+ org.semanticweb.owlapi.model.IRI target = org.semanticweb.owlapi.model.IRI.create(universalPrefix + s);
o.getOWLOntologyManager().applyChange(
new AddImport(o, OWLManager.getOWLDataFactory().getOWLImportsDeclaration(target)));
break;