You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by al...@apache.org on 2011/03/10 11:55:31 UTC
svn commit: r1080180 [1/2] - in /incubator/stanbol/trunk/kres:
eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/
eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/ontology/
eu.iksproject.kres.api/src/main/java/eu...
Author: alexdma
Date: Thu Mar 10 10:55:30 2011
New Revision: 1080180
URL: http://svn.apache.org/viewvc?rev=1080180&view=rev
Log:
STANBOL-112 :
- Moved OntologyInputSource to kres.api.manager.io
- Moved all OntologyInputSource default implementations (except for OntologyRegistryIRISource) from kres.manager.io to kres.api.manager.io
- Deprecated unnecessary OntologyInputSource implementations in kres.semion.reengineer
- Deprecated createOntologyInputSource() methods in kres.jersey.resource.KReSSessionResource
- Replaced calls to deprecated API with instantiations of RootOntologySource and RootOntologyIRISource
Added:
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/AbstractOntologyInputSource.java (with props)
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/BlankOntologySource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/OntologyInputSource.java (with props)
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/RootOntologyIRISource.java (with props)
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/RootOntologySource.java (with props)
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/ScopeOntologySource.java (with props)
Removed:
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/ontology/OntologyInputSource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/io/AbstractOntologyInputSource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/io/BlankOntologySource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/io/RootOntologyIRISource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/io/RootOntologySource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/io/ScopeOntologySource.java
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/ontology/OntologyScopeFactory.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/ontology/OntologySpace.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/ontology/OntologySpaceFactory.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/semion/util/OntologyInputSourceDBS_L1.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/semion/util/OntologyInputSourceOXML.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionResource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ONManager.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/io/OntologyRegistryIRISource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/AbstractOntologySpaceImpl.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CoreOntologySpaceImpl.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CustomOntologySpaceImpl.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeFactoryImpl.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeImpl.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologySpaceFactoryImpl.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/SessionOntologySpaceImpl.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/util/OntologyUtils.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestIndexing.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologyScope.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologySpaces.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/session/TestSessions.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/KReSConf/rmi_config.owl
incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/util/RuleOntologyInputSource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/DBExtractor.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.xml/src/main/java/eu/iksproject/kres/semion/reengineer/xml/XMLExtractor.java
Added: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/AbstractOntologyInputSource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/AbstractOntologyInputSource.java?rev=1080180&view=auto
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/AbstractOntologyInputSource.java (added)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/AbstractOntologyInputSource.java Thu Mar 10 10:55:30 2011
@@ -0,0 +1,77 @@
+package eu.iksproject.kres.api.manager.io;
+
+import org.semanticweb.owlapi.model.IRI;
+import org.semanticweb.owlapi.model.OWLOntology;
+
+
+/**
+ * Abstract implementation of {@link OntologyInputSource} with the basic methods
+ * for obtaining root ontologies and their physical IRIs where applicable.
+ *
+ * @author alessandro
+ *
+ */
+public abstract class AbstractOntologyInputSource implements
+ OntologyInputSource {
+
+ protected IRI physicalIri = null;
+
+ protected OWLOntology rootOntology = null;
+
+ /*
+ * (non-Javadoc)
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof OntologyInputSource))
+ return false;
+ OntologyInputSource src = (OntologyInputSource) obj;
+ return this.physicalIri.equals(src.getPhysicalIRI())
+ && this.rootOntology.equals(src.getRootOntology());
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see eu.iksproject.kres.api.manager.ontology.OntologyInputSource#getPhysicalIRI()
+ */
+ @Override
+ public IRI getPhysicalIRI() {
+ return physicalIri;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see eu.iksproject.kres.api.manager.ontology.OntologyInputSource#getRootOntology()
+ */
+ @Override
+ public OWLOntology getRootOntology() {
+ return rootOntology;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see eu.iksproject.kres.api.manager.ontology.OntologyInputSource#hasPhysicalIRI()
+ */
+ @Override
+ public boolean hasPhysicalIRI() {
+ return physicalIri != null;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see eu.iksproject.kres.api.manager.ontology.OntologyInputSource#hasRootOntology()
+ */
+ @Override
+ public boolean hasRootOntology() {
+ return rootOntology != null;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public abstract String toString();
+
+}
Propchange: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/AbstractOntologyInputSource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/AbstractOntologyInputSource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Added: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/BlankOntologySource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/BlankOntologySource.java?rev=1080180&view=auto
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/BlankOntologySource.java (added)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/BlankOntologySource.java Thu Mar 10 10:55:30 2011
@@ -0,0 +1,29 @@
+package eu.iksproject.kres.api.manager.io;
+
+import org.semanticweb.owlapi.apibinding.OWLManager;
+import org.semanticweb.owlapi.model.OWLOntologyCreationException;
+import org.semanticweb.owlapi.model.OWLOntologyManager;
+
+/**
+ * A utility input source that contains an unnamed, empty ontology.
+ *
+ * @author alessandro
+ *
+ */
+public class BlankOntologySource extends AbstractOntologyInputSource {
+
+ public BlankOntologySource() {
+ OWLOntologyManager manager = OWLManager.createOWLOntologyManager();
+ try {
+ this.rootOntology = manager.createOntology();
+ } catch (OWLOntologyCreationException e) {
+ this.rootOntology = null;
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "";
+ }
+
+}
Added: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/OntologyInputSource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/OntologyInputSource.java?rev=1080180&view=auto
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/OntologyInputSource.java (added)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/OntologyInputSource.java Thu Mar 10 10:55:30 2011
@@ -0,0 +1,63 @@
+package eu.iksproject.kres.api.manager.io;
+
+import org.semanticweb.owlapi.model.IRI;
+import org.semanticweb.owlapi.model.OWLOntology;
+
+/**
+ * An ontology input source provides a point for loading an ontology. Currently
+ * it provides two ways of obtaining an ontology document:
+ *
+ * <ol>
+ * <li>From an OWLOntology.
+ * <li>By dereferencing an physical IRI.
+ * </ol>
+ *
+ * Consumers that use an ontology input source will attempt to obtain a concrete
+ * representation of an ontology in the above order. Implementations of this
+ * interface may try to dereference the IRI internally and just provide the
+ * OWLOntology, or directly provide the physical IRI for other classes to
+ * dereference. Implementations should allow multiple attempts at loading an
+ * ontology.
+ *
+ * @author alessandro
+ *
+ */
+public interface OntologyInputSource {
+
+ /**
+ * Returns the IRI by dereferencing which it should be possible to obtain
+ * the ontology. This method is supposed to return null if the ontology
+ * lives in-memory and was not or is not going to be stored publicly.
+ *
+ * @return the physical location for this ontology source, or null if
+ * unknown.
+ */
+ public IRI getPhysicalIRI();
+
+ /**
+ * Returns the OWL Ontology that imports the whole ontology network
+ * addressed by this input source.
+ *
+ * @return the ontology network root.
+ */
+ public OWLOntology getRootOntology();
+
+ /**
+ * Determines if a physical IRI is known for this ontology source. Note that
+ * an anonymous ontology may have been fetched from a physical location,
+ * just as a named ontology may have been stored in memory and have no
+ * physical location.
+ *
+ * @return true if a physical location is known for this ontology source.
+ */
+ public boolean hasPhysicalIRI();
+
+ /**
+ * Determines if a root ontology that imports the entire network is
+ * available.
+ *
+ * @return true if a root ontology is available, false otherwise.
+ */
+ public boolean hasRootOntology();
+
+}
Propchange: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/OntologyInputSource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/OntologyInputSource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Added: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/RootOntologyIRISource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/RootOntologyIRISource.java?rev=1080180&view=auto
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/RootOntologyIRISource.java (added)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/RootOntologyIRISource.java Thu Mar 10 10:55:30 2011
@@ -0,0 +1,42 @@
+package eu.iksproject.kres.api.manager.io;
+
+import org.semanticweb.owlapi.apibinding.OWLManager;
+import org.semanticweb.owlapi.model.IRI;
+import org.semanticweb.owlapi.model.OWLOntologyCreationException;
+import org.semanticweb.owlapi.model.OWLOntologyManager;
+
+/**
+ * An input source that provides the OWL Ontology loaded from the supplied
+ * physical IRI, as well as the physical IRI itself for consumers that need to
+ * load the ontology themselves.<br>
+ * <br>
+ * For convenience, an existing OWL ontology manager can be supplied for loading
+ * the ontology.
+ *
+ * @author alessandro
+ *
+ */
+public class RootOntologyIRISource extends AbstractOntologyInputSource {
+
+ public RootOntologyIRISource(IRI rootPhysicalIri)
+ throws OWLOntologyCreationException {
+ this(rootPhysicalIri, OWLManager.createOWLOntologyManager());
+ }
+
+ public RootOntologyIRISource(IRI rootPhysicalIri, OWLOntologyManager manager)
+ throws OWLOntologyCreationException {
+ physicalIri = rootPhysicalIri;
+ rootOntology = manager
+ .loadOntologyFromOntologyDocument(rootPhysicalIri);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see eu.iksproject.kres.manager.io.AbstractOntologyInputSource#toString()
+ */
+ @Override
+ public String toString() {
+ return "ROOT_ONT_IRI<" + getPhysicalIRI() + ">";
+ }
+
+}
Propchange: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/RootOntologyIRISource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/RootOntologyIRISource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Added: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/RootOntologySource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/RootOntologySource.java?rev=1080180&view=auto
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/RootOntologySource.java (added)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/RootOntologySource.java Thu Mar 10 10:55:30 2011
@@ -0,0 +1,41 @@
+package eu.iksproject.kres.api.manager.io;
+
+import org.semanticweb.owlapi.model.IRI;
+import org.semanticweb.owlapi.model.OWLOntology;
+
+/**
+ * An input source that provides the supplied OWL ontology straight away. The
+ * physical IRI is either obtained from the default document IRI in the
+ * ontology, or supplied manually using the appropriate constructor (e.g.
+ * retrieved from the ontology manager that actually loaded the ontology).
+ *
+ * @author alessandro
+ *
+ */
+public class RootOntologySource extends AbstractOntologyInputSource {
+
+ public RootOntologySource(OWLOntology rootOntology) {
+ this.rootOntology = rootOntology;
+ try {
+ physicalIri = rootOntology.getOntologyID().getDefaultDocumentIRI();
+ } catch (Exception e) {
+ // Ontology might be anonymous, no physical IRI then...
+ }
+
+ }
+
+ public RootOntologySource(OWLOntology rootOntology, IRI phyicalIRI) {
+ this.rootOntology = rootOntology;
+ this.physicalIri = phyicalIRI;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see eu.iksproject.kres.manager.io.AbstractOntologyInputSource#toString()
+ */
+ @Override
+ public String toString() {
+ return "ROOT_ONT<" + rootOntology.getOntologyID() + ">";
+ }
+
+}
Propchange: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/RootOntologySource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/RootOntologySource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Added: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/ScopeOntologySource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/ScopeOntologySource.java?rev=1080180&view=auto
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/ScopeOntologySource.java (added)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/ScopeOntologySource.java Thu Mar 10 10:55:30 2011
@@ -0,0 +1,31 @@
+package eu.iksproject.kres.api.manager.io;
+
+import org.semanticweb.owlapi.model.IRI;
+import org.semanticweb.owlapi.model.OWLOntology;
+import org.slf4j.LoggerFactory;
+
+/**
+ * An ontology source that rewrites the physical IRI by appending the logical
+ * one to the scope ID. If the ontology is anonymous, the original physical IRI
+ * is retained.
+ *
+ * @author alessandro
+ *
+ */
+public class ScopeOntologySource extends AbstractOntologyInputSource {
+
+ public ScopeOntologySource(IRI scopeIri, OWLOntology ontology, IRI origin) {
+ rootOntology = ontology;
+ LoggerFactory.getLogger(ScopeOntologySource.class).debug(
+ "[KReS] :: REWRITING " + origin + " TO " + scopeIri + "/"
+ + ontology.getOntologyID().getOntologyIRI());
+ physicalIri = !ontology.isAnonymous() ? IRI.create(scopeIri + "/"
+ + ontology.getOntologyID().getOntologyIRI()) : origin;
+ }
+
+ @Override
+ public String toString() {
+ return "SCOPE_ONT_IRI<" + getPhysicalIRI() + ">";
+ }
+
+}
Propchange: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/ScopeOntologySource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/io/ScopeOntologySource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/ontology/OntologyScopeFactory.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/ontology/OntologyScopeFactory.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/ontology/OntologyScopeFactory.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/ontology/OntologyScopeFactory.java Thu Mar 10 10:55:30 2011
@@ -3,6 +3,7 @@ package eu.iksproject.kres.api.manager.o
import org.semanticweb.owlapi.model.IRI;
import eu.iksproject.kres.api.manager.DuplicateIDException;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
/**
* An ontology scope factory is responsible for the creation of new ontology
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/ontology/OntologySpace.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/ontology/OntologySpace.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/ontology/OntologySpace.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/ontology/OntologySpace.java Thu Mar 10 10:55:30 2011
@@ -6,6 +6,8 @@ import java.util.Set;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
+
/**
* An ontology space identifies the set of OWL ontologies that should be
* "active" in a given context, e.g. for a certain user session or a specific
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/ontology/OntologySpaceFactory.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/ontology/OntologySpaceFactory.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/ontology/OntologySpaceFactory.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/ontology/OntologySpaceFactory.java Thu Mar 10 10:55:30 2011
@@ -2,6 +2,8 @@ package eu.iksproject.kres.api.manager.o
import org.semanticweb.owlapi.model.IRI;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
+
/**
* An ontology space factory is responsible for the creation of new, readily
* specialized ontology spaces from supplied ontology input sources.
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/semion/util/OntologyInputSourceDBS_L1.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/semion/util/OntologyInputSourceDBS_L1.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/semion/util/OntologyInputSourceDBS_L1.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/semion/util/OntologyInputSourceDBS_L1.java Thu Mar 10 10:55:30 2011
@@ -3,12 +3,12 @@ package eu.iksproject.kres.api.semion.ut
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
-import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
-import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
import eu.iksproject.kres.ontologies.DBS_L1;
+@Deprecated
public class OntologyInputSourceDBS_L1 implements OntologyInputSource {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/semion/util/OntologyInputSourceOXML.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/semion/util/OntologyInputSourceOXML.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/semion/util/OntologyInputSourceOXML.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/semion/util/OntologyInputSourceOXML.java Thu Mar 10 10:55:30 2011
@@ -5,9 +5,10 @@ import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
-import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
import eu.iksproject.kres.ontologies.XML_OWL;
+@Deprecated
public class OntologyInputSourceOXML implements OntologyInputSource {
@Override
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionResource.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionResource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionResource.java Thu Mar 10 10:55:30 2011
@@ -1,5 +1,7 @@
package eu.iksproject.kres.jersey.resource;
+import static javax.ws.rs.core.Response.Status.*;
+
import java.io.InputStream;
import javax.servlet.ServletContext;
@@ -23,7 +25,9 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import eu.iksproject.kres.api.manager.KReSONManager;
-import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
+import eu.iksproject.kres.api.manager.io.RootOntologyIRISource;
+import eu.iksproject.kres.api.manager.io.RootOntologySource;
import eu.iksproject.kres.api.manager.ontology.OntologyScope;
import eu.iksproject.kres.api.manager.ontology.OntologySpaceFactory;
import eu.iksproject.kres.api.manager.ontology.OntologySpaceModificationException;
@@ -39,227 +43,233 @@ import eu.iksproject.kres.manager.render
@Path("/session")
public class KReSSessionResource extends NavigationMixin {
- /*
- * Placeholder for the KReSONManager to be fetched from the servlet context.
- */
- protected KReSONManager onm;
-
- protected ServletContext servletContext;
-
- public KReSSessionResource(@Context ServletContext servletContext) {
- this.servletContext = servletContext;
- onm = (KReSONManager) this.servletContext
- .getAttribute(KReSONManager.class.getName());
- if (onm == null) {
- System.err
- .println("[KReS] :: No KReS Ontology Network Manager provided by Servlet Context. Instantiating now...");
- onm = new ONManager();
- }
- }
-
- @POST
- @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
- @Produces(value = { KReSFormat.RDF_XML, KReSFormat.OWL_XML,
- KReSFormat.TURTLE, KReSFormat.FUNCTIONAL_OWL,
- KReSFormat.MANCHESTER_OWL, KReSFormat.RDF_JSON })
- public Response createSession(@FormParam("scope") String scope,
- @Context UriInfo uriInfo,
- @Context HttpHeaders headers) {
-
-
- KReSSession ses = null;
- KReSSessionManager mgr = onm.getSessionManager();
-
-
- /*
- * Create the KReS session to associate to the scope.
- */
- ses = mgr.createSession();
-
- /*
- * First get the scope registry.
- */
- ScopeRegistry scopeRegistry = onm.getScopeRegistry();
-
- /*
- * Then retrieve the ontology scope.
- */
- IRI scopeIRI = IRI.create(scope);
- OntologyScope ontologyScope = scopeRegistry.getScope(scopeIRI);
-
- /*
- * Finally associate the KReS session to the scope.
- */
- OntologySpaceFactory ontologySpaceFactory = onm.getOntologySpaceFactory();
- SessionOntologySpace sessionOntologySpace = ontologySpaceFactory.createSessionOntologySpace(scopeIRI);
- ontologyScope.addSessionSpace(sessionOntologySpace, ses.getID());
-
- return Response.ok(SessionRenderer.getSessionMetadataRDF(ses)).build();
-
-
-
- }
-
- @PUT
- @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
- public Response addOntology(
- @QueryParam("scope") String scope,
- @QueryParam("session") String session,
- @QueryParam("location") String location,
- @Context UriInfo uriInfo,
- @Context HttpHeaders headers,
- @Context ServletContext servletContext){
-
- IRI scopeIRI = IRI.create(scope);
- IRI sessionIRI = IRI.create(session);
- IRI ontologyIRI = IRI.create(location);
- ScopeRegistry scopeRegistry = onm.getScopeRegistry();
-
- OntologyScope ontologyScope = scopeRegistry.getScope(scopeIRI);
- SessionOntologySpace sos = ontologyScope.getSessionSpace(sessionIRI);
- try {
- sos.addOntology(createOntologyInputSource(ontologyIRI));
- return Response.ok().build();
- } catch (UnmodifiableOntologySpaceException e) {
- return Response.ok(500).build();
- } catch (OWLOntologyCreationException e) {
- return Response.ok(500).build();
- }
-
- }
-
- @PUT
- @Consumes(MediaType.MULTIPART_FORM_DATA)
- public Response addOntology(
- @QueryParam("scope") String scope,
- @QueryParam("import") InputStream importOntology,
- @QueryParam("session") String session,
- @Context UriInfo uriInfo,
- @Context HttpHeaders headers,
- @Context ServletContext servletContext){
-
-
- IRI scopeIRI = IRI.create(scope);
- IRI sessionIRI = IRI.create(session);
-
- OWLOntology ontology;
- try {
- ontology = onm.getOwlCacheManager().loadOntologyFromOntologyDocument(importOntology);
-
-
- ScopeRegistry scopeRegistry = onm.getScopeRegistry();
-
- OntologyScope ontologyScope = scopeRegistry.getScope(scopeIRI);
- SessionOntologySpace sos = ontologyScope.getSessionSpace(sessionIRI);
- try {
- sos.addOntology(createOntologyInputSource(ontology));
- return Response.ok().build();
- } catch (UnmodifiableOntologySpaceException e) {
- return Response.status(500).build();
- } catch (OWLOntologyCreationException e) {
- return Response.status(500).build();
- }
- } catch (OWLOntologyCreationException e1) {
- return Response.status(404).build();
- }
-
- }
-
-
- @DELETE
- public Response deleteSession(
- @PathParam("scope") String scope,
- @PathParam("session") String session,
- @PathParam("delete") String deleteOntology,
- @Context UriInfo uriInfo,
- @Context HttpHeaders headers) {
-
-
- IRI scopeID = IRI.create(scope);
- IRI sessionID = IRI.create(session);
-
- if(deleteOntology != null){
- IRI ontologyIRI = IRI.create(deleteOntology);
-
- ScopeRegistry scopeRegistry = onm.getScopeRegistry();
-
- OntologyScope ontologyScope = scopeRegistry.getScope(scopeID);
- SessionOntologySpace sos = ontologyScope.getSessionSpace(sessionID);
-
- try {
- sos.removeOntology(createOntologyInputSource(ontologyIRI));
- return Response.ok().build();
- } catch (OWLOntologyCreationException e) {
- return Response.status(500).build();
- } catch (OntologySpaceModificationException e) {
- return Response.status(500).build();
- }
- }
- else{
- onm.getSessionManager().destroySession(sessionID);
- return Response.ok().build();
- }
-
-
- }
-
- private OntologyInputSource createOntologyInputSource(final IRI iri) throws OWLOntologyCreationException {
-
- final OWLOntology ontology = onm.getOwlCacheManager().loadOntology(iri);
- OntologyInputSource ontologyInputSource = new OntologyInputSource() {
-
- @Override
- public boolean hasRootOntology() {
- return ontology == null ? false : true;
- }
-
- @Override
- public boolean hasPhysicalIRI() {
- return iri == null ? false : true;
- }
-
- @Override
- public OWLOntology getRootOntology() {
- return ontology;
- }
-
- @Override
- public IRI getPhysicalIRI() {
- return iri;
- }
- };
-
- return ontologyInputSource;
- }
-
-
- private OntologyInputSource createOntologyInputSource(final OWLOntology ontology) throws OWLOntologyCreationException {
-
- final IRI iri = ontology.getOntologyID().getOntologyIRI();
- OntologyInputSource ontologyInputSource = new OntologyInputSource() {
-
- @Override
- public boolean hasRootOntology() {
- return ontology == null ? false : true;
- }
-
- @Override
- public boolean hasPhysicalIRI() {
- return iri == null ? false : true;
- }
-
- @Override
- public OWLOntology getRootOntology() {
- return ontology;
- }
-
- @Override
- public IRI getPhysicalIRI() {
- return iri;
- }
- };
-
- return ontologyInputSource;
- }
+ /*
+ * Placeholder for the KReSONManager to be fetched from the servlet context.
+ */
+ protected KReSONManager onm;
+
+ protected ServletContext servletContext;
+
+ public KReSSessionResource(@Context ServletContext servletContext) {
+ this.servletContext = servletContext;
+ onm = (KReSONManager) this.servletContext.getAttribute(KReSONManager.class.getName());
+ if (onm == null) {
+ System.err
+ .println("[KReS] :: No KReS Ontology Network Manager provided by Servlet Context. Instantiating now...");
+ onm = new ONManager();
+ }
+ }
+
+ @PUT
+ @Consumes(MediaType.MULTIPART_FORM_DATA)
+ public Response addOntology(@QueryParam("scope") String scope,
+ @QueryParam("import") InputStream importOntology,
+ @QueryParam("session") String session,
+ @Context UriInfo uriInfo,
+ @Context HttpHeaders headers,
+ @Context ServletContext servletContext) {
+
+ IRI scopeIRI = IRI.create(scope);
+ IRI sessionIRI = IRI.create(session);
+
+ OWLOntology ontology;
+ try {
+ ontology = onm.getOwlCacheManager().loadOntologyFromOntologyDocument(importOntology);
+
+ ScopeRegistry scopeRegistry = onm.getScopeRegistry();
+
+ OntologyScope ontologyScope = scopeRegistry.getScope(scopeIRI);
+ SessionOntologySpace sos = ontologyScope.getSessionSpace(sessionIRI);
+ try {
+ sos.addOntology(new RootOntologySource(ontology)/*
+ * createOntologyInputSource( ontology)
+ */);
+ return Response.ok().build();
+ } catch (UnmodifiableOntologySpaceException e) {
+ return Response.status(INTERNAL_SERVER_ERROR).build();
+ }
+ } catch (OWLOntologyCreationException e1) {
+ return Response.status(NOT_FOUND).build();
+ }
+
+ }
+
+ @PUT
+ @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+ public Response addOntology(@QueryParam("scope") String scope,
+ @QueryParam("session") String session,
+ @QueryParam("location") String location,
+ @Context UriInfo uriInfo,
+ @Context HttpHeaders headers,
+ @Context ServletContext servletContext) {
+
+ IRI scopeIRI = IRI.create(scope);
+ IRI sessionIRI = IRI.create(session);
+ IRI ontologyIRI = IRI.create(location);
+ ScopeRegistry scopeRegistry = onm.getScopeRegistry();
+
+ OntologyScope ontologyScope = scopeRegistry.getScope(scopeIRI);
+ SessionOntologySpace sos = ontologyScope.getSessionSpace(sessionIRI);
+ try {
+ sos.addOntology(new RootOntologyIRISource(ontologyIRI)/*
+ * createOntologyInputSource( ontologyIRI)
+ */);
+ return Response.ok().build();
+ } catch (UnmodifiableOntologySpaceException e) {
+ return Response.status(INTERNAL_SERVER_ERROR).build();
+ } catch (OWLOntologyCreationException e) {
+ return Response.status(INTERNAL_SERVER_ERROR).build();
+ }
+
+ }
+
+ @Deprecated
+ private OntologyInputSource createOntologyInputSource(final IRI iri) throws OWLOntologyCreationException {
+
+ final OWLOntology ontology = onm.getOwlCacheManager().loadOntology(iri);
+ OntologyInputSource ontologyInputSource = new OntologyInputSource() {
+
+ @Override
+ public IRI getPhysicalIRI() {
+ return iri;
+ }
+
+ @Override
+ public OWLOntology getRootOntology() {
+ return ontology;
+ }
+
+ @Override
+ public boolean hasPhysicalIRI() {
+ return iri == null ? false : true;
+ }
+
+ @Override
+ public boolean hasRootOntology() {
+ return ontology == null ? false : true;
+ }
+ };
+
+ return ontologyInputSource;
+ }
+
+ @Deprecated
+ private OntologyInputSource createOntologyInputSource(final OWLOntology ontology) throws OWLOntologyCreationException {
+
+ final IRI iri = ontology.getOntologyID().getOntologyIRI();
+ OntologyInputSource ontologyInputSource = new OntologyInputSource() {
+
+ @Override
+ public IRI getPhysicalIRI() {
+ return iri;
+ }
+
+ @Override
+ public OWLOntology getRootOntology() {
+ return ontology;
+ }
+
+ @Override
+ public boolean hasPhysicalIRI() {
+ return iri == null ? false : true;
+ }
+
+ @Override
+ public boolean hasRootOntology() {
+ return ontology == null ? false : true;
+ }
+ };
+
+ return ontologyInputSource;
+ }
+
+ @POST
+ @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+ @Produces(value = {KReSFormat.RDF_XML, KReSFormat.OWL_XML, KReSFormat.TURTLE, KReSFormat.FUNCTIONAL_OWL,
+ KReSFormat.MANCHESTER_OWL, KReSFormat.RDF_JSON})
+ public Response createSession(@FormParam("scope") String scope,
+ @Context UriInfo uriInfo,
+ @Context HttpHeaders headers) {
+
+ KReSSession ses = null;
+ KReSSessionManager mgr = onm.getSessionManager();
+
+ /*
+ * Create the KReS session to associate to the scope.
+ */
+ ses = mgr.createSession();
+
+ /*
+ * First get the scope registry.
+ */
+ ScopeRegistry scopeRegistry = onm.getScopeRegistry();
+
+ /*
+ * Then retrieve the ontology scope.
+ */
+ IRI scopeIRI = IRI.create(scope);
+ OntologyScope ontologyScope = scopeRegistry.getScope(scopeIRI);
+
+ /*
+ * Finally associate the KReS session to the scope.
+ */
+ OntologySpaceFactory ontologySpaceFactory = onm.getOntologySpaceFactory();
+ SessionOntologySpace sessionOntologySpace = ontologySpaceFactory.createSessionOntologySpace(scopeIRI);
+ ontologyScope.addSessionSpace(sessionOntologySpace, ses.getID());
+
+ return Response.ok(SessionRenderer.getSessionMetadataRDF(ses)).build();
+
+ }
+
+ /**
+ * FIXME what are these path params anyway?
+ *
+ * @param scope
+ * @param session
+ * @param deleteOntology
+ * @param uriInfo
+ * @param headers
+ * @return
+ */
+ @DELETE
+ public Response deleteSession(@PathParam("scope") String scope,
+ @PathParam("session") String session,
+ @PathParam("delete") String deleteOntology,
+ @Context UriInfo uriInfo,
+ @Context HttpHeaders headers) {
+
+ IRI scopeID = IRI.create(scope);
+ IRI sessionID = IRI.create(session);
+
+ if (deleteOntology != null) {
+ IRI ontologyIRI = IRI.create(deleteOntology);
+
+ ScopeRegistry scopeRegistry = onm.getScopeRegistry();
+
+ OntologyScope ontologyScope = scopeRegistry.getScope(scopeID);
+ SessionOntologySpace sos = ontologyScope.getSessionSpace(sessionID);
+
+ try {
+ /*
+ * TODO : previous implementation reloaded the whole ontology before deleting it, thus
+ * treating this as a physical IRI. See if it still works this way
+ */
+ OWLOntology o = sos.getOntology(ontologyIRI);
+ if (o != null) sos.removeOntology(new RootOntologySource(o)/*
+ * createOntologyInputSource(
+ * ontologyIRI)
+ */);
+ return Response.ok().build();
+ // } catch (OWLOntologyCreationException e) {
+ // return Response.status(INTERNAL_SERVER_ERROR).build();
+ } catch (OntologySpaceModificationException e) {
+ return Response.status(INTERNAL_SERVER_ERROR).build();
+ }
+ } else {
+ onm.getSessionManager().destroySession(sessionID);
+ return Response.ok().build();
+ }
+
+ }
}
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java Thu Mar 10 10:55:30 2011
@@ -1,7 +1,6 @@
package eu.iksproject.kres.jersey.resource;
-import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
+import static javax.ws.rs.core.Response.Status.*;
import java.net.URI;
import java.util.Hashtable;
@@ -33,6 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import eu.iksproject.kres.api.manager.KReSONManager;
+import eu.iksproject.kres.api.manager.io.RootOntologySource;
import eu.iksproject.kres.api.manager.ontology.OntologyScope;
import eu.iksproject.kres.api.manager.ontology.OntologySpace;
import eu.iksproject.kres.api.manager.ontology.OntologySpaceModificationException;
@@ -41,7 +41,6 @@ import eu.iksproject.kres.api.storage.On
import eu.iksproject.kres.jersey.format.KReSFormat;
import eu.iksproject.kres.jersey.util.OntologyRenderUtils;
import eu.iksproject.kres.manager.ONManager;
-import eu.iksproject.kres.manager.io.RootOntologySource;
import eu.iksproject.kres.storage.provider.OntologyStorageProviderImpl;
/**
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java Thu Mar 10 10:55:30 2011
@@ -31,7 +31,8 @@ import org.slf4j.LoggerFactory;
import eu.iksproject.kres.api.manager.DuplicateIDException;
import eu.iksproject.kres.api.manager.KReSONManager;
-import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
+import eu.iksproject.kres.api.manager.io.RootOntologyIRISource;
import eu.iksproject.kres.api.manager.ontology.OntologyScope;
import eu.iksproject.kres.api.manager.ontology.OntologyScopeFactory;
import eu.iksproject.kres.api.manager.ontology.OntologySpace;
@@ -41,7 +42,6 @@ import eu.iksproject.kres.api.storage.On
import eu.iksproject.kres.jersey.format.KReSFormat;
import eu.iksproject.kres.manager.ONManager;
import eu.iksproject.kres.manager.io.OntologyRegistryIRISource;
-import eu.iksproject.kres.manager.io.RootOntologyIRISource;
import eu.iksproject.kres.storage.provider.OntologyStorageProviderImpl;
@Path("/ontology/{scopeid}")
@@ -61,23 +61,23 @@ public class ONMScopeResource extends Na
this.servletContext = servletContext;
this.onm = (KReSONManager) servletContext
.getAttribute(KReSONManager.class.getName());
-this.storeProvider = (OntologyStoreProvider) servletContext
- .getAttribute(OntologyStoreProvider.class.getName());
-// Contingency code for missing components follows.
-/*
- * FIXME! The following code is required only for the tests. This should
- * be removed and the test should work without this code.
- */
-if (storeProvider == null) {
- log
- .warn("No OntologyStoreProvider in servlet context. Instantiating manually...");
- storeProvider = new OntologyStorageProviderImpl();
-}
+ this.storeProvider = (OntologyStoreProvider) servletContext
+ .getAttribute(OntologyStoreProvider.class.getName());
+ // Contingency code for missing components follows.
+ /*
+ * FIXME! The following code is required only for the tests. This should
+ * be removed and the test should work without this code.
+ */
+ if (storeProvider == null) {
+ log
+ .warn("No OntologyStoreProvider in servlet context. Instantiating manually...");
+ storeProvider = new OntologyStorageProviderImpl();
+ }
if (onm == null) {
- log
- .warn("No KReSONManager in servlet context. Instantiating manually...");
- onm = new ONManager(storeProvider.getActiveOntologyStorage(),
- new Hashtable<String, Object>());
+ log
+ .warn("No KReSONManager in servlet context. Instantiating manually...");
+ onm = new ONManager(storeProvider.getActiveOntologyStorage(),
+ new Hashtable<String, Object>());
}
}
@@ -213,7 +213,7 @@ if (storeProvider == null) {
coreSrc = new RootOntologyIRISource(IRI.create(coreOntology));
} catch (Exception e2) {
// If this fails too, throw a bad request.
- System.out.println("1.1");
+ // System.out.println("1.1");
e2.printStackTrace();
throw new WebApplicationException(e2, BAD_REQUEST);
}
@@ -233,7 +233,7 @@ if (storeProvider == null) {
.create(customOntology));
} catch (Exception e2) {
// If this fails too, throw a bad request.
- System.out.println("1.2");
+ // System.out.println("1.2");
e2.printStackTrace();
throw new WebApplicationException(e2, BAD_REQUEST);
}
@@ -241,7 +241,7 @@ if (storeProvider == null) {
}
// If we weren't able to build core source, throw bad request.
if (coreSrc == null) {
- System.out.println("1.3");
+ // System.out.println("1.3");
throw new WebApplicationException(BAD_REQUEST);
}
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ONManager.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ONManager.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ONManager.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ONManager.java Thu Mar 10 10:55:30 2011
@@ -27,11 +27,13 @@ import org.slf4j.LoggerFactory;
import eu.iksproject.kres.api.manager.DuplicateIDException;
import eu.iksproject.kres.api.manager.KReSONManager;
+import eu.iksproject.kres.api.manager.io.BlankOntologySource;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
+import eu.iksproject.kres.api.manager.io.RootOntologyIRISource;
import eu.iksproject.kres.api.manager.ontology.CoreOntologySpace;
import eu.iksproject.kres.api.manager.ontology.CustomOntologySpace;
import eu.iksproject.kres.api.manager.ontology.NoSuchScopeException;
import eu.iksproject.kres.api.manager.ontology.OntologyIndex;
-import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
import eu.iksproject.kres.api.manager.ontology.OntologyScope;
import eu.iksproject.kres.api.manager.ontology.OntologyScopeFactory;
import eu.iksproject.kres.api.manager.ontology.OntologySpace;
@@ -40,8 +42,6 @@ import eu.iksproject.kres.api.manager.on
import eu.iksproject.kres.api.manager.ontology.UnmodifiableOntologySpaceException;
import eu.iksproject.kres.api.manager.session.KReSSessionManager;
import eu.iksproject.kres.api.storage.OntologyStorage;
-import eu.iksproject.kres.manager.io.BlankOntologySource;
-import eu.iksproject.kres.manager.io.RootOntologyIRISource;
import eu.iksproject.kres.manager.ontology.OntologyIndexImpl;
import eu.iksproject.kres.manager.ontology.OntologyScopeFactoryImpl;
import eu.iksproject.kres.manager.ontology.OntologySpaceFactoryImpl;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/io/OntologyRegistryIRISource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/io/OntologyRegistryIRISource.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/io/OntologyRegistryIRISource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/io/OntologyRegistryIRISource.java Thu Mar 10 10:55:30 2011
@@ -13,7 +13,8 @@ import org.slf4j.LoggerFactory;
import org.stlab.xd.registry.models.Registry;
import org.stlab.xd.registry.models.RegistryItem;
-import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
+import eu.iksproject.kres.api.manager.io.AbstractOntologyInputSource;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
import eu.iksproject.kres.api.manager.registry.KReSRegistryLoader;
import eu.iksproject.kres.manager.util.OntologyUtils;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/AbstractOntologySpaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/AbstractOntologySpaceImpl.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/AbstractOntologySpaceImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/AbstractOntologySpaceImpl.java Thu Mar 10 10:55:30 2011
@@ -21,9 +21,10 @@ import org.semanticweb.owlapi.model.Remo
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
+import eu.iksproject.kres.api.manager.io.RootOntologySource;
import eu.iksproject.kres.api.manager.ontology.IrremovableOntologyException;
import eu.iksproject.kres.api.manager.ontology.MissingOntologyException;
-import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
import eu.iksproject.kres.api.manager.ontology.OntologyScope;
import eu.iksproject.kres.api.manager.ontology.OntologySpace;
import eu.iksproject.kres.api.manager.ontology.OntologySpaceListener;
@@ -33,7 +34,6 @@ import eu.iksproject.kres.api.manager.on
import eu.iksproject.kres.api.manager.ontology.UnmodifiableOntologySpaceException;
import eu.iksproject.kres.api.storage.OntologyStorage;
import eu.iksproject.kres.manager.ONManager;
-import eu.iksproject.kres.manager.io.RootOntologySource;
import eu.iksproject.kres.manager.util.OntologyUtils;
import eu.iksproject.kres.manager.util.StringUtils;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CoreOntologySpaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CoreOntologySpaceImpl.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CoreOntologySpaceImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CoreOntologySpaceImpl.java Thu Mar 10 10:55:30 2011
@@ -3,8 +3,8 @@ package eu.iksproject.kres.manager.ontol
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntologyManager;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
import eu.iksproject.kres.api.manager.ontology.CoreOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
import eu.iksproject.kres.api.manager.ontology.SpaceType;
import eu.iksproject.kres.api.storage.OntologyStorage;
import eu.iksproject.kres.manager.util.StringUtils;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CustomOntologySpaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CustomOntologySpaceImpl.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CustomOntologySpaceImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CustomOntologySpaceImpl.java Thu Mar 10 10:55:30 2011
@@ -4,13 +4,13 @@ import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyManager;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
+import eu.iksproject.kres.api.manager.io.RootOntologySource;
import eu.iksproject.kres.api.manager.ontology.CoreOntologySpace;
import eu.iksproject.kres.api.manager.ontology.CustomOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
import eu.iksproject.kres.api.manager.ontology.SpaceType;
import eu.iksproject.kres.api.manager.ontology.UnmodifiableOntologySpaceException;
import eu.iksproject.kres.api.storage.OntologyStorage;
-import eu.iksproject.kres.manager.io.RootOntologySource;
import eu.iksproject.kres.manager.util.StringUtils;
public class CustomOntologySpaceImpl extends AbstractOntologySpaceImpl
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeFactoryImpl.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeFactoryImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeFactoryImpl.java Thu Mar 10 10:55:30 2011
@@ -7,7 +7,7 @@ import java.util.Set;
import org.semanticweb.owlapi.model.IRI;
import eu.iksproject.kres.api.manager.DuplicateIDException;
-import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
import eu.iksproject.kres.api.manager.ontology.OntologyScope;
import eu.iksproject.kres.api.manager.ontology.OntologyScopeFactory;
import eu.iksproject.kres.api.manager.ontology.OntologySpaceFactory;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeImpl.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeImpl.java Thu Mar 10 10:55:30 2011
@@ -9,9 +9,9 @@ import java.util.Set;
import org.semanticweb.owlapi.model.IRI;
import org.slf4j.LoggerFactory;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
import eu.iksproject.kres.api.manager.ontology.CoreOntologySpace;
import eu.iksproject.kres.api.manager.ontology.CustomOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
import eu.iksproject.kres.api.manager.ontology.OntologyScope;
import eu.iksproject.kres.api.manager.ontology.OntologySpace;
import eu.iksproject.kres.api.manager.ontology.OntologySpaceFactory;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologySpaceFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologySpaceFactoryImpl.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologySpaceFactoryImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologySpaceFactoryImpl.java Thu Mar 10 10:55:30 2011
@@ -4,9 +4,9 @@ import org.semanticweb.owlapi.model.IRI;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
import eu.iksproject.kres.api.manager.ontology.CoreOntologySpace;
import eu.iksproject.kres.api.manager.ontology.CustomOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
import eu.iksproject.kres.api.manager.ontology.OntologyScope;
import eu.iksproject.kres.api.manager.ontology.OntologySpace;
import eu.iksproject.kres.api.manager.ontology.OntologySpaceFactory;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/SessionOntologySpaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/SessionOntologySpaceImpl.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/SessionOntologySpaceImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/SessionOntologySpaceImpl.java Thu Mar 10 10:55:30 2011
@@ -8,11 +8,11 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import eu.iksproject.kres.api.manager.io.RootOntologySource;
import eu.iksproject.kres.api.manager.ontology.SessionOntologySpace;
import eu.iksproject.kres.api.manager.ontology.SpaceType;
import eu.iksproject.kres.api.manager.ontology.UnmodifiableOntologySpaceException;
import eu.iksproject.kres.api.storage.OntologyStorage;
-import eu.iksproject.kres.manager.io.RootOntologySource;
import eu.iksproject.kres.manager.util.StringUtils;
public class SessionOntologySpaceImpl extends AbstractOntologySpaceImpl
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/util/OntologyUtils.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/util/OntologyUtils.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/util/OntologyUtils.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/util/OntologyUtils.java Thu Mar 10 10:55:30 2011
@@ -23,8 +23,8 @@ import org.semanticweb.owlapi.model.Unkn
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
-import eu.iksproject.kres.manager.io.RootOntologySource;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
+import eu.iksproject.kres.api.manager.io.RootOntologySource;
/**
* A set of static utility methods for managing ontologies in KReS.
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestIndexing.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestIndexing.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestIndexing.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestIndexing.java Thu Mar 10 10:55:30 2011
@@ -14,14 +14,14 @@ import org.semanticweb.owlapi.model.OWLO
import eu.iksproject.kres.api.manager.DuplicateIDException;
import eu.iksproject.kres.api.manager.KReSONManager;
+import eu.iksproject.kres.api.manager.io.RootOntologyIRISource;
+import eu.iksproject.kres.api.manager.io.RootOntologySource;
import eu.iksproject.kres.api.manager.ontology.OntologyIndex;
import eu.iksproject.kres.api.manager.ontology.OntologyScope;
import eu.iksproject.kres.api.manager.ontology.OntologySpaceModificationException;
import eu.iksproject.kres.api.manager.ontology.UnmodifiableOntologySpaceException;
import eu.iksproject.kres.manager.ONManager;
import eu.iksproject.kres.manager.io.OntologyRegistryIRISource;
-import eu.iksproject.kres.manager.io.RootOntologyIRISource;
-import eu.iksproject.kres.manager.io.RootOntologySource;
import eu.iksproject.kres.manager.util.OntologyUtils;
public class TestIndexing {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologyScope.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologyScope.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologyScope.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologyScope.java Thu Mar 10 10:55:30 2011
@@ -17,13 +17,13 @@ import org.semanticweb.owlapi.model.OWLO
import eu.iksproject.kres.api.manager.DuplicateIDException;
import eu.iksproject.kres.api.manager.KReSONManager;
-import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
+import eu.iksproject.kres.api.manager.io.RootOntologySource;
import eu.iksproject.kres.api.manager.ontology.OntologyScope;
import eu.iksproject.kres.api.manager.ontology.OntologyScopeFactory;
import eu.iksproject.kres.api.manager.ontology.ScopeRegistry;
import eu.iksproject.kres.manager.Constants;
import eu.iksproject.kres.manager.ONManager;
-import eu.iksproject.kres.manager.io.RootOntologySource;
public class TestOntologyScope {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologySpaces.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologySpaces.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologySpaces.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologySpaces.java Thu Mar 10 10:55:30 2011
@@ -18,17 +18,17 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.model.OWLOntologyManager;
import eu.iksproject.kres.api.manager.KReSONManager;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
+import eu.iksproject.kres.api.manager.io.RootOntologyIRISource;
+import eu.iksproject.kres.api.manager.io.RootOntologySource;
import eu.iksproject.kres.api.manager.ontology.CoreOntologySpace;
import eu.iksproject.kres.api.manager.ontology.CustomOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
import eu.iksproject.kres.api.manager.ontology.OntologySpaceFactory;
import eu.iksproject.kres.api.manager.ontology.OntologySpaceModificationException;
import eu.iksproject.kres.api.manager.ontology.SessionOntologySpace;
import eu.iksproject.kres.api.manager.ontology.UnmodifiableOntologySpaceException;
import eu.iksproject.kres.manager.Constants;
import eu.iksproject.kres.manager.ONManager;
-import eu.iksproject.kres.manager.io.RootOntologyIRISource;
-import eu.iksproject.kres.manager.io.RootOntologySource;
import eu.iksproject.kres.manager.util.OntologyUtils;
public class TestOntologySpaces {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/session/TestSessions.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/session/TestSessions.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/session/TestSessions.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/session/TestSessions.java Thu Mar 10 10:55:30 2011
@@ -15,7 +15,8 @@ import org.semanticweb.owlapi.model.OWLO
import eu.iksproject.kres.api.manager.DuplicateIDException;
import eu.iksproject.kres.api.manager.KReSONManager;
-import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
+import eu.iksproject.kres.api.manager.io.RootOntologySource;
import eu.iksproject.kres.api.manager.ontology.OntologyScope;
import eu.iksproject.kres.api.manager.ontology.OntologyScopeFactory;
import eu.iksproject.kres.api.manager.ontology.OntologySpaceFactory;
@@ -26,7 +27,6 @@ import eu.iksproject.kres.api.manager.se
import eu.iksproject.kres.api.manager.session.KReSSession.State;
import eu.iksproject.kres.manager.Constants;
import eu.iksproject.kres.manager.ONManager;
-import eu.iksproject.kres.manager.io.RootOntologySource;
public class TestSessions {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/KReSConf/rmi_config.owl
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/KReSConf/rmi_config.owl?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/KReSConf/rmi_config.owl (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/KReSConf/rmi_config.owl Thu Mar 10 10:55:30 2011
@@ -116,7 +116,7 @@
<owl:NamedIndividual rdf:about="http://kres.iks-project.eu/ontology/meta/rmi_config.owl#MyRecipeA">
<rdf:type rdf:resource="http://kres.iks-project.eu/ontology/meta/rmi.owl#Recipe"/>
<rmi:hasDescription rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Some description here</rmi:hasDescription>
- <rmi:hasSequence rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://eu.iksproject.kres/KReSOntologyRules.owl#MyRuleB,http://eu.iksproject.kres/KReSOntologyRules.owl#MyRuleA</rmi:hasSequence>
+ <rmi:hasSequence rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://kres.iks-project.eu/ontology/meta/rmi_config.owl#MyRuleB, http://kres.iks-project.eu/ontology/meta/rmi_config.owl#MyRuleA</rmi:hasSequence>
<rmi:hasRule rdf:resource="http://kres.iks-project.eu/ontology/meta/rmi_config.owl#MyRuleA"/>
<rmi:endWith rdf:resource="http://kres.iks-project.eu/ontology/meta/rmi_config.owl#MyRuleA"/>
<rmi:hasRule rdf:resource="http://kres.iks-project.eu/ontology/meta/rmi_config.owl#MyRuleB"/>
@@ -151,7 +151,7 @@
<owl:NamedIndividual rdf:about="http://kres.iks-project.eu/ontology/meta/rmi_config.owl#ProvaParentRecipe">
<rdf:type rdf:resource="http://kres.iks-project.eu/ontology/meta/rmi.owl#Recipe"/>
<rmi:hasDescription rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A single rule recipe.</rmi:hasDescription>
- <rmi:hasSequence rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://kres.iks-project.eu/ontology/meta/rmi.owl#ProvaParentRule</rmi:hasSequence>
+ <rmi:hasSequence rdf:datatype="http://www.w3.org/2001/XMLSchema#string">http://kres.iks-project.eu/ontology/meta/rmi_config.owl#ProvaParentRule</rmi:hasSequence>
<rmi:endWith rdf:resource="http://kres.iks-project.eu/ontology/meta/rmi_config.owl#ProvaParentRule"/>
<rmi:hasRule rdf:resource="http://kres.iks-project.eu/ontology/meta/rmi_config.owl#ProvaParentRule"/>
<rmi:startWith rdf:resource="http://kres.iks-project.eu/ontology/meta/rmi_config.owl#ProvaParentRule"/>
@@ -170,5 +170,5 @@
-<!-- Generated by the OWL API (version 3.0.0.1413) http://owlapi.sourceforge.net -->
+<!-- Generated by the OWL API (version [Not Released]) http://owlapi.sourceforge.net -->
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/util/RuleOntologyInputSource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/util/RuleOntologyInputSource.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/util/RuleOntologyInputSource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/util/RuleOntologyInputSource.java Thu Mar 10 10:55:30 2011
@@ -15,8 +15,7 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
-import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
-import eu.iksproject.kres.ontologies.DBS_L1;
+import eu.iksproject.kres.api.manager.io.OntologyInputSource;
public class RuleOntologyInputSource implements OntologyInputSource {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/DBExtractor.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/DBExtractor.java?rev=1080180&r1=1080179&r2=1080180&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/DBExtractor.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/DBExtractor.java Thu Mar 10 10:55:30 2011
@@ -24,6 +24,7 @@ import org.slf4j.LoggerFactory;
import eu.iksproject.kres.api.manager.DuplicateIDException;
import eu.iksproject.kres.api.manager.KReSONManager;
+import eu.iksproject.kres.api.manager.io.RootOntologyIRISource;
import eu.iksproject.kres.api.manager.ontology.OntologyScope;
import eu.iksproject.kres.api.manager.ontology.OntologyScopeFactory;
import eu.iksproject.kres.api.manager.ontology.OntologySpaceFactory;
@@ -39,19 +40,20 @@ import eu.iksproject.kres.api.semion.uti
import eu.iksproject.kres.api.semion.util.ReengineerType;
import eu.iksproject.kres.api.semion.util.UnsupportedReengineerException;
import eu.iksproject.kres.ontologies.DBS_L1;
+import eu.iksproject.kres.ontologies.XML_OWL;
/**
* The {@code DBExtractor} is an implementation of the {@link SemionReengineer}
* for relational databases.
*
* @author andrea.nuzzolese
- *
+ *
*/
@Component(immediate = true, metatype = true)
@Service(SemionReengineer.class)
public class DBExtractor implements SemionReengineer {
-
+
public static final String _DB_DATA_REENGINEERING_SESSION_DEFAULT = "/db-data-reengineering-session";
public static final String _DB_DATA_REENGINEERING_SESSION_SPACE_DEFAULT = "/db-data-reengineering-session-space";
public static final String _DB_REENGINEERING_SESSION_SPACE_DEFAULT = "/db-schema-reengineering-session-space";
@@ -59,55 +61,55 @@ public class DBExtractor implements Semi
public static final String _DB_SCHEMA_REENGINEERING_SESSION_DEFAULT = "/db-schema-reengineering-session";
public static final String _HOST_NAME_AND_PORT_DEFAULT = "localhost:8080";
public static final String _REENGINEERING_SCOPE_DEFAULT = "db_reengineering";
-
+
@Property(value = _DB_DATA_REENGINEERING_SESSION_DEFAULT)
public static final String DB_DATA_REENGINEERING_SESSION = "eu.iksproject.kres.semion.reengineer.db.data";
@Property(value = _DB_DATA_REENGINEERING_SESSION_SPACE_DEFAULT)
public static final String DB_DATA_REENGINEERING_SESSION_SPACE = "eu.iksproject.kres.semion.reengineer.space.db.data";
-
+
@Property(value = _DB_REENGINEERING_SESSION_SPACE_DEFAULT)
- public static final String DB_REENGINEERING_SESSION_SPACE = "http://kres.iks-project.eu/space/reengineering/db";
-
+ public static final String DB_REENGINEERING_SESSION_SPACE = "http://kres.iks-project.eu/space/reengineering/db";
+
@Property(value = _DB_SCHEMA_REENGINEERING_ONTOLOGY_SPACE_DEFAULT)
- public static final String DB_SCHEMA_REENGINEERING_ONTOLOGY_SPACE = "eu.iksproject.kres.semion.reengineer.ontology.space.db";
-
+ public static final String DB_SCHEMA_REENGINEERING_ONTOLOGY_SPACE = "eu.iksproject.kres.semion.reengineer.ontology.space.db";
+
@Property(value = _DB_SCHEMA_REENGINEERING_SESSION_DEFAULT)
- public static final String DB_SCHEMA_REENGINEERING_SESSION = "eu.iksproject.kres.semion.reengineer.db.schema";
-
+ public static final String DB_SCHEMA_REENGINEERING_SESSION = "eu.iksproject.kres.semion.reengineer.db.schema";
+
@Property(value = _HOST_NAME_AND_PORT_DEFAULT)
public static final String HOST_NAME_AND_PORT = "host.name.port";
-
+
@Property(value = _REENGINEERING_SCOPE_DEFAULT)
- public static final String REENGINEERING_SCOPE = "db.reengineering.scope";
-
+ public static final String REENGINEERING_SCOPE = "db.reengineering.scope";
+
ConnectionSettings connectionSettings;
-
+
String databaseURI;
-
+
private IRI kReSSessionID;
private final Logger log = LoggerFactory.getLogger(getClass());
-
+
@Reference
KReSONManager onManager;
-
+
@Reference
SemionManager reengineeringManager;
private IRI reengineeringScopeIRI;
-
+
private IRI reengineeringSpaceIRI;
-
+
MGraph schemaGraph;
protected OntologyScope scope;
-
+
@Reference
TcManager tcManager;
-
+
@Reference
WeightedTcProvider weightedTcProvider;
-
+
/**
* This default constructor is <b>only</b> intended to be used by the OSGI
* environment with Service Component Runtime support.
@@ -119,9 +121,9 @@ public class DBExtractor implements Semi
* OSGI environment.
*/
public DBExtractor() {
-
+
}
-
+
/**
*
* Create a new {@link DBExtractor} that is formally a
@@ -139,7 +141,7 @@ public class DBExtractor implements Semi
this.weightedTcProvider = weightedTcProvider;
activate(configuration);
}
-
+
/**
* Create a new {@link DBExtractor} that is formally a
* {@link SemionReengineer}.
@@ -168,7 +170,7 @@ public class DBExtractor implements Semi
this.connectionSettings = connectionSettings;
activate(configuration);
}
-
+
/**
* Used to configure an instance within an OSGi container.
*
@@ -196,28 +198,28 @@ public class DBExtractor implements Semi
if (hostNameAndPort == null)
hostNameAndPort = _HOST_NAME_AND_PORT_DEFAULT;
// TODO: Manage the other properties
-
+
hostNameAndPort = "http://" + hostNameAndPort;
-
+
reengineeringScopeIRI = IRI.create(hostNameAndPort + "/kres/ontology/"
+ reengineeringScopeID);
reengineeringSpaceIRI = IRI.create(DB_REENGINEERING_SESSION_SPACE);
-
+
reengineeringManager.bindReengineer(this);
-
+
KReSSessionManager kReSSessionManager = onManager.getSessionManager();
KReSSession kReSSession = kReSSessionManager.createSession();
-
+
kReSSessionID = kReSSession.getID();
-
+
OntologyScopeFactory ontologyScopeFactory = onManager
.getOntologyScopeFactory();
-
+
ScopeRegistry scopeRegistry = onManager.getScopeRegistry();
-
+
OntologySpaceFactory ontologySpaceFactory = onManager
.getOntologySpaceFactory();
-
+
scope = null;
try {
log.info("Semion DBExtractor : created scope with IRI "
@@ -226,16 +228,20 @@ public class DBExtractor implements Semi
OWLOntologyManager ontologyManager = OWLManager
.createOWLOntologyManager();
OWLOntology owlOntology = ontologyManager.createOntology(iri);
-
+
System.out.println("Created ONTOLOGY OWL");
-
+
scope = ontologyScopeFactory.createOntologyScope(
- reengineeringScopeIRI, new OntologyInputSourceDBS_L1());
-
- //scope.setUp();
-
+ reengineeringScopeIRI, new RootOntologyIRISource(IRI
+ .create(DBS_L1.URI))/*
+ * new
+ * OntologyInputSourceDBS_L1()
+ */);
+
+ // scope.setUp();
+
scopeRegistry.registerScope(scope);
-
+
} catch (DuplicateIDException e) {
log.info("Semion DBExtractor : already existing scope for IRI "
+ REENGINEERING_SCOPE);
@@ -247,21 +253,21 @@ public class DBExtractor implements Semi
log
.error("Semion DBExtractor : No OntologyInputSource for ONManager.");
}
-
- if(scope != null){
+
+ if (scope != null) {
scope.addSessionSpace(ontologySpaceFactory
.createSessionOntologySpace(reengineeringSpaceIRI),
kReSSession.getID());
-
+
scopeRegistry.setScopeActive(reengineeringScopeIRI, true);
}
-
+
log.info("Activated KReS Semion RDB Reengineer");
}
-
+
@Override
public boolean canPerformReengineering(DataSource dataSource) {
- if(dataSource.getDataSourceType() == getReengineerType()){
+ if (dataSource.getDataSourceType() == getReengineerType()) {
return true;
} else {
return false;
@@ -270,13 +276,13 @@ public class DBExtractor implements Semi
@Override
public boolean canPerformReengineering(int dataSourceType) {
- if(dataSourceType == getReengineerType()){
+ if (dataSourceType == getReengineerType()) {
return true;
} else {
return false;
}
}
-
+
@Override
public boolean canPerformReengineering(OWLOntology schemaOntology) {
// TODO Auto-generated method stub
@@ -311,15 +317,15 @@ public class DBExtractor implements Semi
public int getReengineerType() {
return ReengineerType.RDB;
}
-
+
private OntologyScope getScope() {
OntologyScope ontologyScope = null;
-
+
ScopeRegistry scopeRegistry = onManager.getScopeRegistry();
if (scopeRegistry.isScopeActive(reengineeringScopeIRI)) {
ontologyScope = scopeRegistry.getScope(reengineeringScopeIRI);
- }
+ }
return ontologyScope;
}
@@ -328,14 +334,14 @@ public class DBExtractor implements Semi
public OWLOntology reengineering(String graphNS, IRI outputIRI,
DataSource dataSource) throws ReengineeringException {
IRI schemaIRI;
- if(outputIRI != null){
+ if (outputIRI != null) {
schemaIRI = IRI.create(outputIRI.toString() + "/schema");
} else {
schemaIRI = IRI.create("/schema");
}
OWLOntology schemaOntology = schemaReengineering(graphNS + "/schema",
schemaIRI, dataSource);
-
+
return dataReengineering(graphNS, outputIRI, dataSource, schemaOntology);
}
@@ -343,8 +349,8 @@ public class DBExtractor implements Semi
public OWLOntology schemaReengineering(String graphNS, IRI outputIRI,
DataSource dataSource) {
OWLOntology schemaOntology = null;
-
- if(outputIRI != null){
+
+ if (outputIRI != null) {
log
.info("Semion DBExtractor : starting to generate RDF graph with URI "
+ outputIRI.toString() + " of a db schema ");
@@ -352,27 +358,27 @@ public class DBExtractor implements Semi
log
.info("Semion DBExtractor : starting to generate RDF graph of a db schema ");
}
-
+
OntologyScope reengineeringScope = getScope();
- if(reengineeringScope != null){
+ if (reengineeringScope != null) {
ConnectionSettings connectionSettings = (ConnectionSettings) dataSource
.getDataSource();
SemionDBSchemaGenerator schemaGenerator = new SemionDBSchemaGenerator(
outputIRI, connectionSettings);
-
- System.out.println("OWL MANAGER IN SEMION: "+onManager);
+
+ System.out.println("OWL MANAGER IN SEMION: " + onManager);
OWLOntologyManager ontologyManager = onManager.getOwlCacheManager();
OWLDataFactory dataFactory = onManager.getOwlFactory();
schemaOntology = schemaGenerator.getSchema(ontologyManager,
dataFactory);
-
- if(outputIRI != null){
+
+ if (outputIRI != null) {
log.info("Created graph with URI " + outputIRI.toString()
+ " of DB Schema.");
} else {
log.info("Created graph of DB Schema.");
}
-
+
}
return schemaOntology;
}