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 [21/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/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/ScopeImpl.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/ScopeImpl.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/ScopeImpl.java (original)
+++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/ScopeImpl.java Tue May 17 22:20:49 2016
@@ -23,15 +23,15 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import org.apache.clerezza.rdf.core.Graph;
-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.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.ontologymanager.servicesapi.collector.OntologyCollector;
@@ -44,7 +44,6 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.servicesapi.scope.Scope;
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.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyChange;
@@ -89,10 +88,10 @@ public class ScopeImpl implements Scope,
private Logger log = LoggerFactory.getLogger(getClass());
- protected IRI namespace = null;
+ protected org.semanticweb.owlapi.model.IRI namespace = null;
public ScopeImpl(String id,
- IRI namespace,
+ org.semanticweb.owlapi.model.IRI namespace,
OntologySpaceFactory factory,
OntologyInputSource<?>... coreOntologies) {
setID(id);
@@ -158,33 +157,33 @@ if (!this.getCustomSpace().equals(sc.get
@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 scope " + getID() + " to a " + returnType);
}
/**
- * Get a Clerezza {@link MGraph} representation of the scope.
+ * Get a Clerezza {@link Graph} representation of the scope.
*
* @param merge
* if true the core and custom spaces will be recursively merged with the scope graph,
* otherwise owl:imports statements will be added.
* @return the RDF representation of the scope as a modifiable graph.
*/
- protected MGraph exportToMGraph(boolean merge, IRI universalPrefix) {
+ protected Graph exportToGraph(boolean merge, org.semanticweb.owlapi.model.IRI universalPrefix) {
// No need to store, give it a name, or anything.
- MGraph root = new SimpleMGraph();
- UriRef iri = new UriRef(universalPrefix + getID());
+ Graph root = new SimpleGraph();
+ IRI iri = new IRI(universalPrefix + getID());
if (root != null) {
// Set the ontology ID
@@ -192,13 +191,13 @@ if (!this.getCustomSpace().equals(sc.get
if (merge) {
- Graph custom, core;
+ ImmutableGraph custom, core;
// Get the subjects of "bad" triples (those with subjects of type owl:Ontology).
Iterator<Triple> it;
- Set<NonLiteral> ontologies = new HashSet<NonLiteral>();
- Set<Resource> importTargets = new HashSet<Resource>();
- custom = this.getCustomSpace().export(Graph.class, merge);
+ Set<BlankNodeOrIRI> ontologies = new HashSet<BlankNodeOrIRI>();
+ Set<RDFTerm> importTargets = new HashSet<RDFTerm>();
+ custom = this.getCustomSpace().export(ImmutableGraph.class, merge);
// root.addAll(space);
it = custom.filter(null, RDF.type, OWL.Ontology);
while (it.hasNext())
@@ -206,7 +205,7 @@ if (!this.getCustomSpace().equals(sc.get
it = custom.filter(null, OWL.imports, null);
while (it.hasNext())
importTargets.add(it.next().getObject());
- core = this.getCoreSpace().export(Graph.class, merge);
+ core = this.getCoreSpace().export(ImmutableGraph.class, merge);
// root.addAll(space);
it = core.filter(null, RDF.type, OWL.Ontology);
while (it.hasNext())
@@ -218,7 +217,7 @@ if (!this.getCustomSpace().equals(sc.get
// Make sure the scope itself is not in the "bad" subjects.
ontologies.remove(iri);
- for (NonLiteral nl : ontologies)
+ for (BlankNodeOrIRI nl : ontologies)
log.debug("{} -related triples will not be added to {}", nl, iri);
// Merge the two spaces, skipping the "bad" triples.
@@ -233,14 +232,14 @@ if (!this.getCustomSpace().equals(sc.get
* 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));
} else {
- UriRef physIRI = new UriRef(universalPrefix.toString() + this.getID() + "/"
+ IRI physIRI = new IRI(universalPrefix.toString() + this.getID() + "/"
+ SpaceType.CUSTOM.getIRISuffix());
root.add(new TripleImpl(iri, OWL.imports, physIRI));
- physIRI = new UriRef(universalPrefix.toString() + this.getID() + "/"
+ physIRI = new IRI(universalPrefix.toString() + this.getID() + "/"
+ SpaceType.CORE.getIRISuffix());
root.add(new TripleImpl(iri, OWL.imports, physIRI));
}
@@ -257,7 +256,7 @@ if (!this.getCustomSpace().equals(sc.get
* otherwise owl:imports statements will be added.
* @return the OWL representation of the scope.
*/
- protected OWLOntology exportToOWLOntology(boolean merge, IRI universalPrefix) {
+ protected OWLOntology exportToOWLOntology(boolean merge, org.semanticweb.owlapi.model.IRI universalPrefix) {
// if (merge) throw new UnsupportedOperationException(
// "Ontology merging only implemented for managed ontologies, not for collectors. "
// + "Please set merge parameter to false.");
@@ -285,25 +284,25 @@ if (!this.getCustomSpace().equals(sc.get
OWLOntologyMerger merger = new OWLOntologyMerger(provider);
try {
ont = merger.createMergedOntology(OWLManager.createOWLOntologyManager(),
- IRI.create(getDefaultNamespace() + getID()));
+ org.semanticweb.owlapi.model.IRI.create(getDefaultNamespace() + getID()));
} catch (OWLOntologyCreationException e) {
log.error("Failed to merge imports for ontology.", e);
ont = null;
}
} else {
// The root ontology ID is in the form [namespace][scopeId]
- ont = mgr.createOntology(IRI.create(universalPrefix + getID()));
+ ont = mgr.createOntology(org.semanticweb.owlapi.model.IRI.create(universalPrefix + getID()));
List<OWLOntologyChange> additions = new LinkedList<OWLOntologyChange>();
// Add the import statement for the custom space, if existing and not empty
OntologySpace spc = getCustomSpace();
if (spc != null && spc.listManagedOntologies().size() > 0) {
- IRI spaceIri = IRI.create(universalPrefix + spc.getID());
+ org.semanticweb.owlapi.model.IRI spaceIri = org.semanticweb.owlapi.model.IRI.create(universalPrefix + spc.getID());
additions.add(new AddImport(ont, df.getOWLImportsDeclaration(spaceIri)));
}
// Add the import statement for the core space, if existing and not empty
spc = getCoreSpace();
if (spc != null && spc.listManagedOntologies().size() > 0) {
- IRI spaceIri = IRI.create(universalPrefix + spc.getID());
+ org.semanticweb.owlapi.model.IRI spaceIri = org.semanticweb.owlapi.model.IRI.create(universalPrefix + spc.getID());
additions.add(new AddImport(ont, df.getOWLImportsDeclaration(spaceIri)));
}
mgr.applyChanges(additions);
@@ -341,7 +340,7 @@ if (!this.getCustomSpace().equals(sc.get
}
@Override
- public IRI getDefaultNamespace() {
+ public org.semanticweb.owlapi.model.IRI getDefaultNamespace() {
return this.namespace;
}
@@ -351,7 +350,7 @@ if (!this.getCustomSpace().equals(sc.get
}
@Override
- public IRI getNamespace() {
+ public org.semanticweb.owlapi.model.IRI getNamespace() {
return getDefaultNamespace();
}
@@ -405,7 +404,7 @@ if (!this.getCustomSpace().equals(sc.get
* will be logged.
*/
@Override
- public void setDefaultNamespace(IRI namespace) {
+ public void setDefaultNamespace(org.semanticweb.owlapi.model.IRI namespace) {
if (namespace == null) throw new IllegalArgumentException("Namespace cannot be null.");
if (namespace.toURI().getQuery() != null) throw new IllegalArgumentException(
"URI Query is not allowed in OntoNet namespaces.");
@@ -416,7 +415,7 @@ if (!this.getCustomSpace().equals(sc.get
if (!namespace.toString().endsWith("/")) {
log.warn("Namespace {} does not end with slash character ('/'). It will be added automatically.",
namespace);
- namespace = IRI.create(namespace + "/");
+ namespace = org.semanticweb.owlapi.model.IRI.create(namespace + "/");
}
this.namespace = namespace;
}
@@ -432,7 +431,7 @@ if (!this.getCustomSpace().equals(sc.get
}
@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/SessionImpl.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/SessionImpl.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/SessionImpl.java (original)
+++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/SessionImpl.java Tue May 17 22:20:49 2016
@@ -22,10 +22,9 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.TripleCollection;
-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.IRI;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.ontologies.OWL;
import org.apache.stanbol.ontologymanager.core.scope.ScopeManagerImpl;
import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyProvider;
@@ -38,7 +37,6 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.servicesapi.session.SessionListener;
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.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyChange;
@@ -74,7 +72,7 @@ public class SessionImpl extends Abstrac
* @param sessionID
* the IRI to be set as unique identifier for this session
*/
- public SessionImpl(String sessionID, IRI namespace, OntologyProvider<?> ontologyProvider) {
+ public SessionImpl(String sessionID, org.semanticweb.owlapi.model.IRI namespace, OntologyProvider<?> ontologyProvider) {
super(sessionID, namespace, ontologyProvider);
backwardPathLength = 0;
// setNamespace(namespace);
@@ -93,17 +91,17 @@ public class SessionImpl extends Abstrac
fireScopeAppended(scopeId);
}
- private void attachScopeImportsClerezza(TripleCollection target, IRI prefix) {
- UriRef iri = new UriRef(prefix + _id);
+ private void attachScopeImportsClerezza(Graph target, org.semanticweb.owlapi.model.IRI prefix) {
+ IRI iri = new IRI(prefix + _id);
String scopePrefix = prefix.toString();
scopePrefix = scopePrefix.substring(0, scopePrefix.lastIndexOf("/" + shortName + "/")) + "/ontology/";
for (String scopeID : attachedScopes) {
- UriRef physIRI = new UriRef(scopePrefix + scopeID);
+ IRI physIRI = new IRI(scopePrefix + scopeID);
target.add(new TripleImpl(iri, OWL.imports, physIRI));
}
}
- private void attachScopeImportsOwlApi(OWLOntology target, IRI prefix) {
+ private void attachScopeImportsOwlApi(OWLOntology target, org.semanticweb.owlapi.model.IRI prefix) {
if (!attachedScopes.isEmpty()) {
String scopePrefix = prefix.toString();
scopePrefix = scopePrefix.substring(0, scopePrefix.lastIndexOf("/" + shortName + "/"))
@@ -113,7 +111,7 @@ public class SessionImpl extends Abstrac
OWLDataFactory df = ontologyManager.getOWLDataFactory();
// Add import declarations for attached scopes.
for (String scopeID : attachedScopes) {
- IRI physIRI = IRI.create(scopePrefix + scopeID);
+ org.semanticweb.owlapi.model.IRI physIRI = org.semanticweb.owlapi.model.IRI.create(scopePrefix + scopeID);
changes.add(new AddImport(target, df.getOWLImportsDeclaration(physIRI)));
}
// Commit
@@ -161,8 +159,8 @@ public class SessionImpl extends Abstrac
}
@Override
- protected MGraph exportToMGraph(boolean merge, IRI universalPrefix) {
- MGraph mg = super.exportToMGraph(merge, universalPrefix);
+ protected Graph exportToGraph(boolean merge, org.semanticweb.owlapi.model.IRI universalPrefix) {
+ Graph mg = super.exportToGraph(merge, universalPrefix);
attachScopeImportsClerezza(mg, universalPrefix);
return mg;
}
@@ -171,10 +169,10 @@ public class SessionImpl extends Abstrac
* TODO support merging for attached scopes as well?
*/
@Override
- protected OWLOntology exportToOWLOntology(boolean merge, IRI universalPrefix) {
+ protected OWLOntology exportToOWLOntology(boolean merge, org.semanticweb.owlapi.model.IRI universalPrefix) {
OWLOntology o = super.exportToOWLOntology(merge, universalPrefix);
- IRI iri = o.getOntologyID().getOntologyIRI();
+ org.semanticweb.owlapi.model.IRI iri = o.getOntologyID().getOntologyIRI();
if (merge) { // Re-merge
ScopeManager onm = ScopeManagerImpl.get(); // FIXME try to avoid this.
@@ -242,8 +240,8 @@ public class SessionImpl extends Abstrac
}
@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;
@@ -259,7 +257,7 @@ public class SessionImpl extends Abstrac
@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:
Modified: stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/ClerezzaOWLUtils.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/ClerezzaOWLUtils.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/ClerezzaOWLUtils.java (original)
+++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/ClerezzaOWLUtils.java Tue May 17 22:20:49 2016
@@ -16,10 +16,10 @@
*/
package org.apache.stanbol.ontologymanager.multiplexer.clerezza.ontology;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.clerezza.rdf.core.impl.TripleImpl;
+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.slf4j.Logger;
@@ -40,14 +40,14 @@ public final class ClerezzaOWLUtils {
private static Logger log = LoggerFactory.getLogger(ClerezzaOWLUtils.class);
- public static MGraph createOntology(String id, TcManager tcm) {
- UriRef name = new UriRef(id);
- MGraph ont = tcm.createMGraph(name);
+ public static Graph createOntology(String id, TcManager tcm) {
+ IRI name = new IRI(id);
+ Graph ont = tcm.createGraph(name);
ont.add(new TripleImpl(name, RDF.type, OWL.Ontology));
return ont;
}
- public static MGraph createOntology(String id) {
+ public static Graph createOntology(String id) {
return createOntology(id, TcManager.getInstance());
}