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/11/03 20:03:13 UTC
svn commit: r1197271 [2/3] - in /incubator/stanbol/trunk:
ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/
ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/
ontologymanag...
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyScopeFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyScopeFactoryImpl.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyScopeFactoryImpl.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyScopeFactoryImpl.java Thu Nov 3 19:03:11 2011
@@ -40,10 +40,9 @@ import org.slf4j.LoggerFactory;
public class OntologyScopeFactoryImpl implements OntologyScopeFactory {
private Set<ScopeEventListener> listeners = new HashSet<ScopeEventListener>();
-
private Logger log = LoggerFactory.getLogger(getClass());
-
protected IRI namespace;
+
protected ScopeRegistry registry;
protected OntologySpaceFactory spaceFactory;
@@ -69,14 +68,8 @@ public class OntologyScopeFactoryImpl im
listeners.clear();
}
- // @Override
- // public OntologyScope createOntologyScope(String scopeID, OntologyInputSource coreSource) throws
- // DuplicateIDException {
- // return createOntologyScope(scopeID, coreSource, null);
- // }
-
@Override
- public OntologyScope createOntologyScope(String scopeID, OntologyInputSource... coreSources) throws DuplicateIDException {
+ public OntologyScope createOntologyScope(String scopeID, OntologyInputSource<?>... coreSources) throws DuplicateIDException {
if (registry.containsScope(scopeID)) throw new DuplicateIDException(scopeID,
"Scope registry already contains ontology scope with ID " + scopeID);
@@ -93,6 +86,16 @@ public class OntologyScopeFactoryImpl im
}
@Override
+ public String getID() {
+ return this.toString();
+ }
+
+ @Override
+ public IRI getNamespace() {
+ return this.namespace;
+ }
+
+ @Override
public Collection<ScopeEventListener> getScopeEventListeners() {
return listeners;
}
@@ -103,11 +106,6 @@ public class OntologyScopeFactoryImpl im
}
@Override
- public IRI getNamespace() {
- return this.namespace;
- }
-
- @Override
public void setNamespace(IRI namespace) {
this.namespace = namespace;
}
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyScopeImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyScopeImpl.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyScopeImpl.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyScopeImpl.java Thu Nov 3 19:03:11 2011
@@ -144,6 +144,8 @@ public class OntologyScopeImpl implement
*/
@Override
public OWLOntology asOWLOntology(boolean merge) {
+ if (merge) throw new UnsupportedOperationException(
+ "Ontology merging not implemented yet. Please set merge parameter to false.");
// Create an ontology manager on the fly. We don't really need a permanent one.
OWLOntologyManager mgr = OWLManager.createOWLOntologyManager();
OWLDataFactory df = mgr.getOWLDataFactory();
@@ -223,13 +225,13 @@ public class OntologyScopeImpl implement
}
@Override
- public void onOntologyAdded(IRI spaceId, IRI addedOntology) {
+ public void onOntologyAdded(String collectorId, IRI addedOntology) {
// Propagate events to scope listeners
fireOntologyAdded(addedOntology);
}
@Override
- public void onOntologyRemoved(IRI spaceId, IRI removedOntology) {
+ public void onOntologyRemoved(String collectorId, IRI removedOntology) {
// Propagate events to scope listeners
fireOntologyRemoved(removedOntology);
}
@@ -248,7 +250,7 @@ public class OntologyScopeImpl implement
else {
this.customSpace = (CustomOntologySpace) customSpace;
this.customSpace.addListener(this);
- this.customSpace.attachCoreSpace(this.coreSpace, true);
+ // this.customSpace.attachCoreSpace(this.coreSpace, true);
}
}
@@ -304,7 +306,6 @@ public class OntologyScopeImpl implement
@Override
public void synchronizeSpaces() {
// TODO Auto-generated method stub
-
}
@Override
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/AbstractOntologySpaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/AbstractOntologySpaceImpl.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/AbstractOntologySpaceImpl.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/AbstractOntologySpaceImpl.java Thu Nov 3 19:03:11 2011
@@ -33,7 +33,6 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SpaceType;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologyCollectorException;
-import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.apache.stanbol.owl.util.OWLUtils;
import org.apache.stanbol.owl.util.URIUtils;
import org.semanticweb.owlapi.apibinding.OWLManager;
@@ -88,19 +87,14 @@ public abstract class AbstractOntologySp
*/
protected OWLOntologyManager ontologyManager;
- protected boolean silent = false;
-
- protected ClerezzaOntologyStorage storage;
-
protected Set<Class<?>> supportedTypes;
protected SpaceType type;
- protected AbstractOntologySpaceImpl(String spaceID,
- IRI namespace,
- SpaceType type,
- ClerezzaOntologyStorage storage) {
- this(spaceID, namespace, type, storage, OWLManager.createOWLOntologyManager());
+ protected AbstractOntologySpaceImpl(String spaceID, IRI namespace, SpaceType type
+
+ ) {
+ this(spaceID, namespace, type, OWLManager.createOWLOntologyManager());
}
/**
@@ -114,7 +108,6 @@ public abstract class AbstractOntologySp
protected AbstractOntologySpaceImpl(String spaceID,
IRI namespace,
SpaceType type,
- ClerezzaOntologyStorage storage,
OWLOntologyManager ontologyManager) {
supportedTypes = new HashSet<Class<?>>();
@@ -123,7 +116,7 @@ public abstract class AbstractOntologySp
setID(spaceID);
setNamespace(namespace);
this.type = type;
- this.storage = storage;
+ // this.storage = storage;
if (ontologyManager != null) this.ontologyManager = ontologyManager;
else this.ontologyManager = OWLManager.createOWLOntologyManager();
@@ -168,6 +161,8 @@ public abstract class AbstractOntologySp
*/
@Override
public OWLOntology asOWLOntology(boolean merge) {
+ if (merge) throw new UnsupportedOperationException(
+ "Ontology merging not implemented yet. Please set merge parameter to false.");
OWLOntology root;
IRI iri = IRI.create(namespace + _id);
try {
@@ -230,7 +225,7 @@ public abstract class AbstractOntologySp
*/
protected void fireOntologyAdded(IRI ontologyIri) {
for (OntologyCollectorListener listener : listeners)
- listener.onOntologyAdded(IRI.create(namespace + _id), ontologyIri);
+ listener.onOntologyAdded(this.getID(), ontologyIri);
}
/**
@@ -241,7 +236,7 @@ public abstract class AbstractOntologySp
*/
protected void fireOntologyRemoved(IRI ontologyIri) {
for (OntologyCollectorListener listener : listeners)
- listener.onOntologyRemoved(IRI.create(namespace + _id), ontologyIri);
+ listener.onOntologyRemoved(this.getID(), ontologyIri);
}
@Override
@@ -293,11 +288,6 @@ public abstract class AbstractOntologySp
return locked;
}
- @Override
- public boolean isSilentMissingOntologyHandling() {
- return silent;
- }
-
private void performAdd(OntologyInputSource<?> ontSrc) {
Object obj = ontSrc.getRootOntology();
@@ -313,12 +303,13 @@ public abstract class AbstractOntologySp
try {
// Store the top ontology
if (!(this instanceof SessionOntologySpace)) {
- if (storage == null) log.warn(
- "No ontology storage found. Ontology {} will be stored in-memory only.", ontology);
- else {
- // storage = new ClerezzaOntologyStorage(tcManager, wtcProvider)
- storage.store(ontology);
- }
+ // No longer storing in OWLAPI implementation!
+ // if (storage == null) log.warn(
+ // "No ontology storage found. Ontology {} will be stored in-memory only.", ontology);
+ // else {
+ // // storage = new ClerezzaOntologyStorage(tcManager, wtcProvider)
+ // storage.store(ontology);
+ // }
}
// ONManager.get().getOntologyStore().load(rootOntology.getOntologyID().getOntologyIRI());
} catch (Exception ex) {
@@ -551,9 +542,4 @@ public abstract class AbstractOntologySp
this.namespace = namespace;
}
- @Override
- public void setSilentMissingOntologyHandling(boolean silent) {
- this.silent = silent;
- }
-
}
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/CoreOntologySpaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/CoreOntologySpaceImpl.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/CoreOntologySpaceImpl.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/CoreOntologySpaceImpl.java Thu Nov 3 19:03:11 2011
@@ -18,7 +18,6 @@ package org.apache.stanbol.ontologymanag
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.CoreOntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SpaceType;
-import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntologyManager;
@@ -35,15 +34,12 @@ public class CoreOntologySpaceImpl exten
return (scopeID != null ? scopeID : "") + "/" + SUFFIX;
}
- public CoreOntologySpaceImpl(String scopeID, IRI namespace, ClerezzaOntologyStorage storage) {
- super(buildId(scopeID), namespace, SpaceType.CORE, storage);
+ public CoreOntologySpaceImpl(String scopeID, IRI namespace) {
+ super(buildId(scopeID), namespace, SpaceType.CORE);
}
- public CoreOntologySpaceImpl(String scopeID,
- IRI namespace,
- ClerezzaOntologyStorage storage,
- OWLOntologyManager ontologyManager) {
- super(buildId(scopeID), namespace, SpaceType.CORE, storage, ontologyManager);
+ public CoreOntologySpaceImpl(String scopeID, IRI namespace, OWLOntologyManager ontologyManager) {
+ super(buildId(scopeID), namespace, SpaceType.CORE, ontologyManager);
}
/**
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/CustomOntologySpaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/CustomOntologySpaceImpl.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/CustomOntologySpaceImpl.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/CustomOntologySpaceImpl.java Thu Nov 3 19:03:11 2011
@@ -20,12 +20,14 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.CustomOntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SpaceType;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologyCollectorException;
-import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntologyManager;
/**
* Default implementation of the custom ontology space.
+ *
+ * @author alexdma
+ *
*/
public class CustomOntologySpaceImpl extends AbstractOntologySpaceImpl implements CustomOntologySpace {
@@ -35,20 +37,16 @@ public class CustomOntologySpaceImpl ext
return (scopeID != null ? scopeID : "") + "/" + SUFFIX;
}
- public CustomOntologySpaceImpl(String scopeID, IRI namespace, ClerezzaOntologyStorage storage) {
- super(buildId(scopeID), namespace, SpaceType.CUSTOM, storage);
+ public CustomOntologySpaceImpl(String scopeID, IRI namespace) {
+ super(buildId(scopeID), namespace, SpaceType.CUSTOM);
}
- public CustomOntologySpaceImpl(String scopeID,
- IRI namespace,
- ClerezzaOntologyStorage storage,
- OWLOntologyManager ontologyManager) {
- super(buildId(scopeID), namespace, SpaceType.CUSTOM, storage, ontologyManager);
+ public CustomOntologySpaceImpl(String scopeID, IRI namespace, OWLOntologyManager ontologyManager) {
+ super(buildId(scopeID), namespace, SpaceType.CUSTOM, ontologyManager);
}
@Override
public void attachCoreSpace(CoreOntologySpace coreSpace, boolean skipRoot) throws UnmodifiableOntologyCollectorException {
- // FIXME re-implement!
// OWLOntology o = coreSpace.getTopOntology();
// // This does the append thingy
// log.debug("Attaching " + o + " TO " + getTopOntology() + " ...");
@@ -60,7 +58,6 @@ public class CustomOntologySpaceImpl ext
// } catch (Exception ex) {
// log.error("FAILED", ex);
// }
-
}
/**
@@ -71,6 +68,9 @@ public class CustomOntologySpaceImpl ext
locked = true;
}
+ /**
+ * Once it is torn down, a custom space is write-unlocked.
+ */
@Override
public synchronized void tearDown() {
locked = false;
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/OWLAPIOntologyProvider.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/OWLAPIOntologyProvider.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/OWLAPIOntologyProvider.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/OWLAPIOntologyProvider.java Thu Nov 3 19:03:11 2011
@@ -35,6 +35,8 @@ import org.slf4j.LoggerFactory;
/**
* OWLAPI-based (in-memory) ontology cache implementation.
*
+ * TODO re-introduce SCR annotations, just avoid loading the component
+ *
* @author alexdma
*
*/
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/OntologySpaceFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/OntologySpaceFactoryImpl.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/OntologySpaceFactoryImpl.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/OntologySpaceFactoryImpl.java Thu Nov 3 19:03:11 2011
@@ -20,15 +20,14 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.CoreOntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.CustomOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyCollectorListener;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceFactory;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyCollectorListener;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SpaceType;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologyCollectorException;
-import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.apache.stanbol.owl.OWLOntologyManagerFactory;
import org.semanticweb.owlapi.model.IRI;
import org.slf4j.Logger;
@@ -42,24 +41,17 @@ public class OntologySpaceFactoryImpl im
protected Logger log = LoggerFactory.getLogger(getClass());
+ protected IRI namespace;
+
protected OfflineConfiguration offline;
protected ScopeRegistry registry;
- protected IRI namespace;
-
- /*
- * The ClerezzaOntologyStorage (local to OntoNet) has been changed with PersistenceStore (general from
- * Stanbol)
- */
- protected ClerezzaOntologyStorage storage;
-
public OntologySpaceFactoryImpl(ScopeRegistry registry,
- ClerezzaOntologyStorage storage,
- OfflineConfiguration offline,
- IRI namespace) {
+
+ OfflineConfiguration offline, IRI namespace) {
this.registry = registry;
- this.storage = storage;
+
this.offline = offline;
this.namespace = namespace;
}
@@ -71,7 +63,7 @@ public class OntologySpaceFactoryImpl im
* @param scopeID
* @param rootSource
*/
- private void configureSpace(OntologySpace s, String scopeID, OntologyInputSource... ontologySources) {
+ private void configureSpace(OntologySpace s, String scopeID, OntologyInputSource<?>... ontologySources) {
// FIXME: ensure that this is not null AND convert to using Strings for scope IDs
OntologyScope parentScope = registry.getScope(scopeID);
@@ -79,7 +71,7 @@ public class OntologySpaceFactoryImpl im
.addListener((OntologyCollectorListener) parentScope);
// Set the supplied ontology's parent as the root for this space.
if (ontologySources != null) try {
- for (OntologyInputSource src : ontologySources)
+ for (OntologyInputSource<?> src : ontologySources)
s.addOntology(src);
} catch (UnmodifiableOntologyCollectorException e) {
log.error("Ontology space " + s.getID() + " was found locked at creation time!", e);
@@ -88,19 +80,20 @@ public class OntologySpaceFactoryImpl im
}
@Override
- public CoreOntologySpace createCoreOntologySpace(String scopeId, OntologyInputSource... coreSources) {
- CoreOntologySpace s = new CoreOntologySpaceImpl(scopeId, namespace, storage,
- OWLOntologyManagerFactory.createOWLOntologyManager(offline.getOntologySourceLocations()
- .toArray(new IRI[0])));
+ public CoreOntologySpace createCoreOntologySpace(String scopeId, OntologyInputSource<?>... coreSources) {
+ CoreOntologySpace s = new CoreOntologySpaceImpl(scopeId, namespace, /* storage, */
+ OWLOntologyManagerFactory.createOWLOntologyManager(offline.getOntologySourceLocations().toArray(
+ new IRI[0])));
configureSpace(s, scopeId, coreSources);
return s;
}
@Override
- public CustomOntologySpace createCustomOntologySpace(String scopeId, OntologyInputSource... customSources) {
- CustomOntologySpace s = new CustomOntologySpaceImpl(scopeId, namespace, storage,
- OWLOntologyManagerFactory.createOWLOntologyManager(offline.getOntologySourceLocations()
- .toArray(new IRI[0])));
+ public CustomOntologySpace createCustomOntologySpace(String scopeId,
+ OntologyInputSource<?>... customSources) {
+ CustomOntologySpace s = new CustomOntologySpaceImpl(scopeId, namespace, /* storage, */
+ OWLOntologyManagerFactory.createOWLOntologyManager(offline.getOntologySourceLocations().toArray(
+ new IRI[0])));
configureSpace(s, scopeId, customSources);
return s;
}
@@ -108,7 +101,7 @@ public class OntologySpaceFactoryImpl im
@Override
public OntologySpace createOntologySpace(String scopeId,
SpaceType type,
- OntologyInputSource... ontologySources) {
+ OntologyInputSource<?>... ontologySources) {
switch (type) {
case CORE:
return createCoreOntologySpace(scopeId, ontologySources);
@@ -123,11 +116,11 @@ public class OntologySpaceFactoryImpl im
@Override
public SessionOntologySpace createSessionOntologySpace(String scopeId,
- OntologyInputSource... sessionSources) {
- SessionOntologySpace s = new SessionOntologySpaceImpl(scopeId, namespace, storage,
- OWLOntologyManagerFactory.createOWLOntologyManager(offline.getOntologySourceLocations()
- .toArray(new IRI[0])));
- for (OntologyInputSource src : sessionSources)
+ OntologyInputSource<?>... sessionSources) {
+ SessionOntologySpace s = new SessionOntologySpaceImpl(scopeId, namespace, /* storage, */
+ OWLOntologyManagerFactory.createOWLOntologyManager(offline.getOntologySourceLocations().toArray(
+ new IRI[0])));
+ for (OntologyInputSource<?> src : sessionSources)
try {
s.addOntology(src);
} catch (UnmodifiableOntologyCollectorException e) {
@@ -139,6 +132,11 @@ public class OntologySpaceFactoryImpl im
}
@Override
+ public String getID() {
+ return this.toString();
+ }
+
+ @Override
public IRI getNamespace() {
return this.namespace;
}
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/SessionOntologySpaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/SessionOntologySpaceImpl.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/SessionOntologySpaceImpl.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/SessionOntologySpaceImpl.java Thu Nov 3 19:03:11 2011
@@ -22,12 +22,13 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SpaceType;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologyCollectorException;
-import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntologyManager;
/**
* Default implementation of the session ontology space.
+ *
+ * @deprecated obsolete, as is its implemented type {@link SessionOntologySpace}.
*/
public class SessionOntologySpaceImpl extends AbstractOntologySpaceImpl implements SessionOntologySpace {
@@ -38,17 +39,18 @@ public class SessionOntologySpaceImpl ex
+ new Random().nextLong();
}
- public SessionOntologySpaceImpl(String scopeID, IRI namespace, ClerezzaOntologyStorage store) {
+ public SessionOntologySpaceImpl(String scopeID, IRI namespace
+ // , ClerezzaOntologyStorage store
+ ) {
// FIXME : sync session id with session space ID
- super(buildId(scopeID), namespace, SpaceType.SESSION, store);
+ super(buildId(scopeID), namespace, SpaceType.SESSION/* , store */);
}
- public SessionOntologySpaceImpl(String scopeID,
- IRI namespace,
- ClerezzaOntologyStorage store,
+ public SessionOntologySpaceImpl(String scopeID, IRI namespace,
+ // ClerezzaOntologyStorage store,
OWLOntologyManager ontologyManager) {
// FIXME : sync session id with session space ID
- super(buildId(scopeID), namespace, SpaceType.SESSION, store, ontologyManager);
+ super(buildId(scopeID), namespace, SpaceType.SESSION, /* store, */ontologyManager);
}
@Override
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionImpl.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionImpl.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionImpl.java Thu Nov 3 19:03:11 2011
@@ -73,33 +73,16 @@ public class SessionImpl implements Sess
else setActive(initialState == State.ACTIVE);
}
- /*
- * (non-Javadoc)
- *
- * @see eu.iksproject.kres.api.manager.session.SessionListenable#addSessionListener
- * (eu.iksproject.kres.api.manager.session.SessionListener)
- */
@Override
public void addSessionListener(SessionListener listener) {
listeners.add(listener);
}
- /*
- * (non-Javadoc)
- *
- * @seeeu.iksproject.kres.api.manager.session.SessionListenable# clearSessionListeners()
- */
@Override
public void clearSessionListeners() {
listeners.clear();
-
}
- /*
- * (non-Javadoc)
- *
- * @see eu.iksproject.kres.api.manager.session.Session#close()
- */
@Override
public void close() throws NonReferenceableSessionException {
// if (getSessionState() == State.ZOMBIE)
@@ -108,41 +91,21 @@ public class SessionImpl implements Sess
this.setActive(false);
}
- /*
- * (non-Javadoc)
- *
- * @see eu.iksproject.kres.api.manager.session.Session#getID()
- */
@Override
public String getID() {
return id.toString();
}
- /*
- * (non-Javadoc)
- *
- * @see eu.iksproject.kres.api.manager.session.SessionListenable#getSessionListeners ()
- */
@Override
public Collection<SessionListener> getSessionListeners() {
return listeners;
}
- /*
- * (non-Javadoc)
- *
- * @see eu.iksproject.kres.api.manager.session.Session#getSessionState()
- */
@Override
public State getSessionState() {
return state;
}
- /*
- * (non-Javadoc)
- *
- * @see eu.iksproject.kres.api.manager.session.Session#isActive()
- */
@Override
public boolean isActive() {
return state == State.ACTIVE;
@@ -153,11 +116,6 @@ public class SessionImpl implements Sess
listeners.remove(listener);
}
- /*
- * (non-Javadoc)
- *
- * @see eu.iksproject.kres.api.manager.session.Session#setActive(boolean)
- */
@Override
public State setActive(boolean active) throws NonReferenceableSessionException {
if (getSessionState() == State.ZOMBIE) throw new NonReferenceableSessionException();
@@ -165,11 +123,6 @@ public class SessionImpl implements Sess
return getSessionState();
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
@Override
public String toString() {
return getID().toString();
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java Thu Nov 3 19:03:11 2011
@@ -1,19 +1,19 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.stanbol.ontologymanager.ontonet.impl.session;
import java.io.OutputStream;
@@ -27,15 +27,14 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.session.DuplicateSessionIDException;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionIDGenerator;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
import org.apache.stanbol.ontologymanager.ontonet.api.session.NonReferenceableSessionException;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionEvent;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionListener;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
import org.apache.stanbol.ontologymanager.ontonet.api.session.Session.State;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionEvent;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionEvent.OperationType;
-import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionIDGenerator;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionListener;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyStorageException;
@@ -63,14 +62,14 @@ public class SessionManagerImpl implemen
protected ScopeRegistry scopeRegistry;
- protected ClerezzaOntologyStorage store;
+ // protected ClerezzaOntologyStorage store;
- public SessionManagerImpl(IRI baseIri, ScopeRegistry scopeRegistry, ClerezzaOntologyStorage store) {
+ public SessionManagerImpl(IRI baseIri, ScopeRegistry scopeRegistry/* , ClerezzaOntologyStorage store */) {
idgen = new TimestampedSessionIDGenerator(baseIri);
listeners = new HashSet<SessionListener>();
sessionsByID = new HashMap<String,Session>();
this.scopeRegistry = scopeRegistry;
- this.store = store;
+ // this.store = store;
}
/*
@@ -260,14 +259,14 @@ public class SessionManagerImpl implemen
*/
@Override
public void storeSession(String sessionID, OutputStream out) throws NonReferenceableSessionException,
- OWLOntologyStorageException {
+ OWLOntologyStorageException {
/*
* For each gession space in the session save all the ontologies contained in the space.
*/
for (SessionOntologySpace so : getSessionSpaces(sessionID)) {
for (OWLOntology owlOntology : so.getOntologies(true)) {
- store.store(owlOntology);
+ // store.store(owlOntology);
}
}
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/util/OntologyUtils.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/util/OntologyUtils.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/util/OntologyUtils.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/util/OntologyUtils.java Thu Nov 3 19:03:11 2011
@@ -54,33 +54,6 @@ public class OntologyUtils {
private static final Logger logger = LoggerFactory.getLogger(OntologyUtils.class);
- // /**
- // * Creates an ontology with the specified IRI and only the import
- // statements
- // * for linking to all the ontologies in the subtrees set. Useful for
- // running
- // * reasoners on an ontology set, as reasoners are instantiated on a single
- // * ontology.
- // *
- // * @param rootIri
- // * @param subtrees
- // * @return
- // */
- // public static OWLOntology buildImportTree(IRI rootIri,
- // Set<OWLOntology> subtrees, OWLOntologyManager mgr) {
- // OWLOntology root = null;
- // try {
- // root = rootIri != null ? mgr.createOntology(rootIri) : mgr
- // .createOntology();
- // } catch (OWLOntologyAlreadyExistsException e) {
- // root = mgr.getOntology(rootIri);
- // } catch (OWLOntologyCreationException e) {
- // e.printStackTrace();
- // return root;
- // }
- // return buildImportTree(root, subtrees, mgr);
- // }
-
public static OWLOntology appendOntology(OntologyInputSource<OWLOntology> parentSrc,
OntologyInputSource<OWLOntology> childSrc,
OWLOntologyManager ontologyManager) {
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestOWLAPIInputSources.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestOWLAPIInputSources.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestOWLAPIInputSources.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestOWLAPIInputSources.java Thu Nov 3 19:03:11 2011
@@ -17,7 +17,10 @@
package org.apache.stanbol.ontologymanager.ontonet.io;
import static org.apache.stanbol.ontologymanager.ontonet.MockOsgiContext.reset;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.FileWriter;
@@ -38,6 +41,7 @@ import org.apache.stanbol.owl.OWLOntolog
import org.junit.After;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.io.WriterDocumentTarget;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLClass;
@@ -59,7 +63,7 @@ public class TestOWLAPIInputSources {
public static void setUp() {
Dictionary<String,Object> onmconf = new Hashtable<String,Object>();
onm = new ONManagerImpl(null, null, new OfflineConfigurationImpl(onmconf), onmconf);
- df = onm.getOwlFactory();
+ df = OWLManager.getOWLDataFactory();
}
@Test
@@ -151,7 +155,7 @@ public class TestOWLAPIInputSources {
OWLClass cPerzon = df.getOWLClass(IRI.create("http://xmlns.com/foaf/0.1/Perzon"));
assertTrue(coreSource.getRootOntology().getClassesInSignature().contains(cPerzon));
}
-
+
@After
public void cleanup() {
reset();
Modified: incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntonetFragment.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntonetFragment.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntonetFragment.java (original)
+++ incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntonetFragment.java Thu Nov 3 19:03:11 2011
@@ -22,6 +22,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
@@ -76,6 +77,9 @@ public class OntonetFragment implements
@Reference
RegistryManager regMgr;
+
+ @Reference
+ TcManager tcManager;
@Override
public BundleContext getBundleContext() {
Modified: incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntologyIndexResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntologyIndexResource.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntologyIndexResource.java (original)
+++ incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntologyIndexResource.java Thu Nov 3 19:03:11 2011
@@ -16,7 +16,8 @@
*/
package org.apache.stanbol.ontologymanager.web.resources;
-import static javax.ws.rs.core.Response.Status.*;
+import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+import static javax.ws.rs.core.Response.Status.NOT_FOUND;
import javax.servlet.ServletContext;
import javax.ws.rs.GET;
@@ -33,7 +34,6 @@ import org.apache.stanbol.commons.web.ba
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.OfflineConfiguration;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyIndex;
-import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.apache.stanbol.owl.OWLOntologyManagerFactory;
import org.coode.owlapi.turtle.TurtleOntologyFormat;
import org.semanticweb.owlapi.io.RDFXMLOntologyFormat;
@@ -58,13 +58,9 @@ public class OntologyIndexResource exten
protected Serializer serializer;
- protected ClerezzaOntologyStorage storage;
-
public OntologyIndexResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
this.onm = (ONManager) ContextHelper.getServiceFromContext(ONManager.class, servletContext);
- this.storage = (ClerezzaOntologyStorage) ContextHelper.getServiceFromContext(
- ClerezzaOntologyStorage.class, servletContext);
this.serializer = (Serializer) ContextHelper.getServiceFromContext(Serializer.class, servletContext);
}
@@ -75,11 +71,10 @@ public class OntologyIndexResource exten
OWLOntologyManager tmpmgr;
OfflineConfiguration offline = (OfflineConfiguration) ContextHelper.getServiceFromContext(
OfflineConfiguration.class, servletContext);
- if (offline == null) throw new IllegalStateException(
- "OfflineConfiguration missing in ServletContext");
- else tmpmgr = OWLOntologyManagerFactory.createOWLOntologyManager(offline
- .getOntologySourceLocations().toArray(new IRI[0]));
-
+ if (offline == null) throw new IllegalStateException("OfflineConfiguration missing in ServletContext");
+ else tmpmgr = OWLOntologyManagerFactory.createOWLOntologyManager(offline.getOntologySourceLocations()
+ .toArray(new IRI[0]));
+
IRI iri = null;
try {
iri = IRI.create(ontologyIri);
@@ -109,11 +104,10 @@ public class OntologyIndexResource exten
OWLOntologyManager tmpmgr;
OfflineConfiguration offline = (OfflineConfiguration) ContextHelper.getServiceFromContext(
OfflineConfiguration.class, servletContext);
- if (offline == null) throw new IllegalStateException(
- "OfflineConfiguration missing in ServletContext");
- else tmpmgr = OWLOntologyManagerFactory.createOWLOntologyManager(offline
- .getOntologySourceLocations().toArray(new IRI[0]));
-
+ if (offline == null) throw new IllegalStateException("OfflineConfiguration missing in ServletContext");
+ else tmpmgr = OWLOntologyManagerFactory.createOWLOntologyManager(offline.getOntologySourceLocations()
+ .toArray(new IRI[0]));
+
IRI iri = null;
try {
iri = IRI.create(ontologyIri);
Modified: incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntologyNetworkResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntologyNetworkResource.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntologyNetworkResource.java (original)
+++ incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntologyNetworkResource.java Thu Nov 3 19:03:11 2011
@@ -1,19 +1,19 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.stanbol.ontologymanager.web.resources;
import static javax.ws.rs.core.MediaType.TEXT_HTML;
@@ -31,13 +31,13 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
+import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.format.KRFormat;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
-import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.apache.stanbol.ontologymanager.ontonet.impl.renderers.ScopeSetRenderer;
import org.semanticweb.owlapi.model.OWLOntology;
import org.slf4j.Logger;
@@ -60,19 +60,20 @@ public class OntologyNetworkResource ext
@SuppressWarnings("unused")
private Logger log = LoggerFactory.getLogger(getClass());
-
+
/*
* Placeholder for the ONManager to be fetched from the servlet context.
*/
protected ONManager onm;
protected ServletContext servletContext;
- protected ClerezzaOntologyStorage storage;
+
+ protected TcManager tcManager;
public OntologyNetworkResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
this.onm = (ONManager) ContextHelper.getServiceFromContext(ONManager.class, servletContext);
- this.storage = (ClerezzaOntologyStorage) ContextHelper.getServiceFromContext(ClerezzaOntologyStorage.class, servletContext);
+ this.tcManager = (TcManager) ContextHelper.getServiceFromContext(TcManager.class, servletContext);
}
/**
@@ -86,7 +87,6 @@ public class OntologyNetworkResource ext
reg.deregisterScope(scope);
// ...then clear the store.
// TODO : the other way around?
- onm.getOntologyStore().clear();
}
/**
Modified: incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeOntologyResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeOntologyResource.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeOntologyResource.java (original)
+++ incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeOntologyResource.java Thu Nov 3 19:03:11 2011
@@ -40,11 +40,10 @@ import org.apache.stanbol.commons.web.ba
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.OfflineConfiguration;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyCollectorModificationException;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyCollectorModificationException;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
-import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.apache.stanbol.ontologymanager.web.util.OntologyRenderUtils;
import org.apache.stanbol.owl.OWLOntologyManagerFactory;
import org.semanticweb.owlapi.apibinding.OWLManager;
@@ -77,13 +76,9 @@ public class ScopeOntologyResource exten
*/
protected ONManager onm;
- protected ClerezzaOntologyStorage storage;
-
public ScopeOntologyResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
this.onm = (ONManager) ContextHelper.getServiceFromContext(ONManager.class, servletContext);
- this.storage = (ClerezzaOntologyStorage) ContextHelper.getServiceFromContext(
- ClerezzaOntologyStorage.class, servletContext);
}
/**
@@ -130,8 +125,8 @@ public class ScopeOntologyResource exten
return Response.ok(scope.getCoreSpace().asOWLOntology()).build();
} else if (temp.equals(scope.getCustomSpace().getID())) {
return Response.ok(scope.getCustomSpace().asOWLOntology()).build();
-// } else if (scope.getSessionSpace(IRI.create(temp)) != null) {
-// return Response.ok(scope.getSessionSpace(IRI.create(temp)).asOWLOntology()).build();
+ // } else if (scope.getSessionSpace(IRI.create(temp)) != null) {
+ // return Response.ok(scope.getSessionSpace(IRI.create(temp)).asOWLOntology()).build();
}
/*
@@ -163,7 +158,7 @@ public class ScopeOntologyResource exten
.getOntologySourceLocations().toArray(new IRI[0]));
final Set<OWLOntology> ontologies = scope.getCustomSpace().getOntologies(true);
-// scope.getSessionSpace(ontiri).getOntologies(true);
+ // scope.getSessionSpace(ontiri).getOntologies(true);
OWLOntologySetProvider provider = new OWLOntologySetProvider() {
@Override
Modified: incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java (original)
+++ incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java Thu Nov 3 19:03:11 2011
@@ -58,7 +58,6 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologyCollectorException;
-import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.apache.stanbol.ontologymanager.registry.api.RegistryManager;
import org.apache.stanbol.ontologymanager.registry.io.LibrarySource;
import org.semanticweb.owlapi.model.IRI;
@@ -83,15 +82,11 @@ public class ScopeResource extends BaseS
*/
protected RegistryManager regMgr;
- protected ClerezzaOntologyStorage storage;
-
public ScopeResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
this.onm = (ONManager) ContextHelper.getServiceFromContext(ONManager.class, servletContext);
this.regMgr = (RegistryManager) ContextHelper.getServiceFromContext(RegistryManager.class,
servletContext);
- this.storage = (ClerezzaOntologyStorage) ContextHelper.getServiceFromContext(
- ClerezzaOntologyStorage.class, servletContext);
}
@DELETE
Modified: incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/StoredGraphsResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/StoredGraphsResource.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/StoredGraphsResource.java (original)
+++ incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/StoredGraphsResource.java Thu Nov 3 19:03:11 2011
@@ -18,7 +18,6 @@ package org.apache.stanbol.ontologymanag
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.NO_CONTENT;
import java.io.InputStream;
import java.util.ArrayList;
@@ -39,15 +38,17 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
+import org.apache.clerezza.rdf.core.MGraph;
+import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.format.KRFormat;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.OfflineConfiguration;
-import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.NoSuchStoreException;
import org.apache.stanbol.owl.OWLOntologyManagerFactory;
+import org.apache.stanbol.owl.transformation.JenaToClerezzaConverter;
+import org.apache.stanbol.owl.transformation.JenaToOwlConvert;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.AddAxiom;
import org.semanticweb.owlapi.model.IRI;
@@ -61,6 +62,7 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.hp.hpl.jena.ontology.OntModel;
import com.sun.jersey.api.view.ImplicitProduces;
import com.sun.jersey.multipart.FormDataParam;
@@ -72,23 +74,13 @@ public class StoredGraphsResource extend
private final Logger log = LoggerFactory.getLogger(getClass());
protected ONManager onManager;
- protected ClerezzaOntologyStorage storage;
protected TcManager tcManager;
public StoredGraphsResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
- storage = (ClerezzaOntologyStorage) (servletContext.getAttribute(ClerezzaOntologyStorage.class
- .getName()));
tcManager = (TcManager) servletContext.getAttribute(TcManager.class.getName());
-
onManager = (ONManager) ContextHelper.getServiceFromContext(ONManager.class, servletContext);
- // onManager = (ONManager) (servletContext.getAttribute(ONManager.class.getName()));
- if (onManager == null) {
- throw new IllegalStateException("OntologyStorage missing in ServletContext");
- } else {
- storage = onManager.getOntologyStore();
- }
}
@GET
@@ -98,14 +90,7 @@ public class StoredGraphsResource extend
@Context HttpHeaders headers) {
IRI ontologyID = IRI.create(graphid);
-
- // return Response.ok(tcManager.getMGraph(new UriRef(graphid))).build();
- try {
- return Response.ok(storage.getGraph(ontologyID)).build();
- } catch (NoSuchStoreException e) {
- return Response.status(NO_CONTENT).build();
- }
-
+ return Response.ok(tcManager.getGraph(new UriRef(ontologyID.toString()))).build();
}
public String getNamespace() {
@@ -113,11 +98,11 @@ public class StoredGraphsResource extend
}
public List<String> getStoredGraphs() {
- Set<IRI> iris = storage.listGraphs();
+ Set<UriRef> iris = tcManager.listGraphs();
ArrayList<String> graphs = new ArrayList<String>();
- for (IRI iri : iris) {
- graphs.add(iri.toString());
+ for (UriRef iri : iris) {
+ graphs.add(iri.getUnicodeString());
}
return graphs;
}
@@ -127,7 +112,7 @@ public class StoredGraphsResource extend
@Produces({KRFormat.FUNCTIONAL_OWL, KRFormat.MANCHESTER_OWL, KRFormat.OWL_XML, KRFormat.RDF_XML,
KRFormat.TURTLE, KRFormat.RDF_JSON})
public Response graphs(@Context HttpHeaders headers, @Context ServletContext servletContext) {
- Set<IRI> iris = storage.listGraphs();
+ Set<UriRef> iris = tcManager.listGraphs();
if (iris != null) {
// OWLOntologyManager manager = onManager.getOntologyManagerFactory().createOntologyManager(true);
@@ -151,9 +136,11 @@ public class StoredGraphsResource extend
OWLObjectProperty p = factory.getOWLObjectProperty(IRI.create(ns + "hasGraph"));
- for (IRI iri : iris) {
- iri = IRI.create(iri.toString().replace("<", "").replace(">", ""));
- OWLNamedIndividual graph = factory.getOWLNamedIndividual(iri);
+ for (UriRef iri : iris) {
+ // iri = IRI.create(iri.toString().replace("<", "").replace(">", ""));
+ // This should remove quotes
+ OWLNamedIndividual graph = factory.getOWLNamedIndividual(IRI.create(iri
+ .getUnicodeString()));
OWLObjectPropertyAssertionAxiom axiom = factory.getOWLObjectPropertyAssertionAxiom(p,
storage, graph);
manager.applyChange(new AddAxiom(ontology, axiom));
@@ -182,10 +169,20 @@ public class StoredGraphsResource extend
try {
OWLOntology ontology = manager.loadOntologyFromOntologyDocument(graph);
- storage.store(ontology, IRI.create(id));
+ /* storage. */store(ontology, IRI.create(id));
return Response.ok().build();
} catch (OWLOntologyCreationException e) {
throw new WebApplicationException(e, INTERNAL_SERVER_ERROR);
}
}
+
+ private void store(OWLOntology o, IRI ontologyID) {
+
+ JenaToOwlConvert converter = new JenaToOwlConvert();
+ OntModel om = converter.ModelOwlToJenaConvert(o, "RDF/XML");
+ MGraph mg = JenaToClerezzaConverter.jenaModelToClerezzaMGraph(om);
+ // MGraph mg = OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(o);
+ MGraph mg2 = tcManager.createMGraph(new UriRef(ontologyID.toString()));
+ mg2.addAll(mg);
+ }
}
Modified: incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/PhonyIRIMapper.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/PhonyIRIMapper.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/PhonyIRIMapper.java (original)
+++ incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/PhonyIRIMapper.java Thu Nov 3 19:03:11 2011
@@ -22,16 +22,31 @@ import java.util.Set;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntologyIRIMapper;
+/**
+ * An ontology IRI mapper that can be used to trick an OWLOntologyManager into believing all imports are
+ * loaded except for those indicated in the exclusions set. It can be used when imported ontologies have to be
+ * provided in other ways than by dereferencing URLs, for example when we want to load the same ontology from
+ * a triple store programmatically.
+ *
+ * @author alexdma
+ *
+ */
public class PhonyIRIMapper implements OWLOntologyIRIMapper {
- private Set<IRI> notMapped;
+ private Set<IRI> exclusions;
private IRI blankIri = null;
private String blankResourcePath = "/ontologies/blank.owl";
- public PhonyIRIMapper(Set<IRI> notMapped) {
- this.notMapped = notMapped;
+ /**
+ *
+ * @param notMapped
+ * the set of IRIs that will not be mapped by this object, so that the ontology manager will
+ * only try to load from these IRIs, unless another attached IRI mapper specifies otherwise.
+ */
+ public PhonyIRIMapper(Set<IRI> exclusions) {
+ this.exclusions = exclusions;
try {
blankIri = IRI.create(this.getClass().getResource(blankResourcePath));
} catch (URISyntaxException e) {
@@ -41,7 +56,7 @@ public class PhonyIRIMapper implements O
@Override
public IRI getDocumentIRI(IRI arg0) {
- if (notMapped.contains(arg0)) return null;
+ if (exclusions.contains(arg0)) return null;
else return blankIri;
}
Modified: incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java (original)
+++ incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java Thu Nov 3 19:03:11 2011
@@ -12,6 +12,7 @@ import org.apache.stanbol.reengineer.bas
import org.apache.stanbol.reengineer.db.connection.DatabaseConnection;
import org.apache.stanbol.reengineer.db.vocab.DBS_L1;
import org.apache.stanbol.reengineer.db.vocab.DBS_L1_OWL;
+import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.AddAxiom;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLClass;
@@ -56,7 +57,7 @@ public class DBDataTransformer extends R
if(schemaOntology != null){
OWLOntologyManager manager = onManager.getOwlCacheManager();
- OWLDataFactory factory = onManager.getOwlFactory();
+ OWLDataFactory factory = OWLManager.getOWLDataFactory();
graphNS = graphNS.replace("#", "");
String schemaNS = graphNS + "/schema#";
Modified: incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/resources/ReengineerResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/resources/ReengineerResource.java?rev=1197271&r1=1197270&r2=1197271&view=diff
==============================================================================
--- incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/resources/ReengineerResource.java (original)
+++ incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/resources/ReengineerResource.java Thu Nov 3 19:03:11 2011
@@ -1,19 +1,19 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.stanbol.reengineer.web.resources;
@@ -39,13 +39,16 @@ import javax.ws.rs.core.Response;
import org.apache.clerezza.rdf.core.Literal;
import org.apache.clerezza.rdf.core.LiteralFactory;
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.access.EntityAlreadyExistsException;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
-import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
+import org.apache.stanbol.owl.transformation.OWLAPIToClerezzaConverter;
+import org.apache.stanbol.owl.util.OWLUtils;
import org.apache.stanbol.reengineer.base.api.DataSource;
import org.apache.stanbol.reengineer.base.api.Reengineer;
import org.apache.stanbol.reengineer.base.api.ReengineerManager;
@@ -67,44 +70,62 @@ import com.sun.jersey.api.view.ImplicitP
import com.sun.jersey.api.view.Viewable;
import com.sun.jersey.multipart.FormDataParam;
-
@Path("/reengineer")
@ImplicitProduces(MediaType.TEXT_HTML + ";qs=2")
public class ReengineerResource extends BaseStanbolResource {
- protected ReengineerManager reengineeringManager;
- protected TcManager tcManager;
- protected ClerezzaOntologyStorage storage;
-
private final Logger log = LoggerFactory.getLogger(getClass());
+ protected ReengineerManager reengineeringManager;
+ protected TcManager tcManager;
public ReengineerResource(@Context ServletContext servletContext) {
tcManager = (TcManager) ContextHelper.getServiceFromContext(TcManager.class, servletContext);
- storage = (ClerezzaOntologyStorage) servletContext.getAttribute(ClerezzaOntologyStorage.class.getName());
- reengineeringManager = (ReengineerManager) ContextHelper.getServiceFromContext(ReengineerManager.class, servletContext);
+ reengineeringManager = (ReengineerManager) ContextHelper.getServiceFromContext(
+ ReengineerManager.class, servletContext);
if (reengineeringManager == null) {
- throw new IllegalStateException(
- "ReengineeringManager missing in ServletContext");
+ throw new IllegalStateException("ReengineeringManager missing in ServletContext");
}
}
@GET
+ @Path("/reengineers/count")
+ public Response countReengineers(@Context HttpHeaders headers) {
+
+ return Response.ok(reengineeringManager.countReengineers()).build();
+ }
+
+ @GET
@Produces(TEXT_HTML)
public Response get() {
return Response.ok(new Viewable("index", this), TEXT_HTML).build();
}
+ @GET
+ @Path("/reengineers")
+ public Response listReengineers(@Context HttpHeaders headers) {
+ Collection<Reengineer> reengineers = reengineeringManager.listReengineers();
+ MGraph mGraph = new SimpleMGraph();
+ UriRef semionRef = new UriRef("http://semion.kres.iksproject.eu#Semion");
+ for (Reengineer semionReengineer : reengineers) {
+ UriRef hasReengineer = new UriRef("http://semion.kres.iksproject.eu#hasReengineer");
+ Literal reenginnerLiteral = LiteralFactory.getInstance().createTypedLiteral(
+ semionReengineer.getClass().getCanonicalName());
+ mGraph.add(new TripleImpl(semionRef, hasReengineer, reenginnerLiteral));
+ }
+
+ return Response.ok(mGraph).build();
+ }
+
@POST
@Consumes(MediaType.MULTIPART_FORM_DATA)
- public Response reengineering(
- @FormDataParam("output-graph") String outputGraph,
- @FormDataParam("input-type") String inputType,
+ public Response reengineering(@FormDataParam("output-graph") String outputGraph,
+ @FormDataParam("input-type") String inputType,
@FormDataParam("input") InputStream input,
- @Context HttpHeaders headers, @Context HttpServletRequest httpServletRequest){
-
+ @Context HttpHeaders headers,
+ @Context HttpServletRequest httpServletRequest) {
- System.out.println("Reengineering: "+inputType);
+ System.out.println("Reengineering: " + inputType);
int reengineerType = -1;
try {
reengineerType = ReengineerType.getType(inputType);
@@ -117,19 +138,20 @@ public class ReengineerResource extends
try {
OWLOntology ontology;
- System.out.println("STORE PROVIDER : "+storage);
- System.out.println("OUTGRAPH: "+outputGraph);
+ // System.out.println("STORE PROVIDER : "+storage);
+ // System.out.println("OUTGRAPH: "+outputGraph);
String servletPath = httpServletRequest.getLocalAddr();
- System.out.println("SERVER PATH : "+servletPath);
- servletPath = "http://"+servletPath+"/kres/graphs/"+outputGraph+":"+httpServletRequest.getLocalPort();
- if(outputGraph == null || outputGraph.equals("")){
+ // System.out.println("SERVER PATH : "+servletPath);
+ servletPath = "http://" + servletPath + "/kres/graphs/" + outputGraph + ":"
+ + httpServletRequest.getLocalPort();
+ if (outputGraph == null || outputGraph.equals("")) {
ontology = reengineeringManager.performReengineering(servletPath, null, dataSource);
return Response.ok().build();
- }
- else{
- ontology = reengineeringManager.performReengineering(servletPath, IRI.create(outputGraph), dataSource);
+ } else {
+ ontology = reengineeringManager.performReengineering(servletPath,
+ IRI.create(outputGraph), dataSource);
- storage.store(ontology);
+ store(ontology);
return Response.ok(ontology).build();
}
} catch (ReengineeringException e) {
@@ -145,113 +167,92 @@ public class ReengineerResource extends
}
-
@POST
- @Consumes(MediaType.MULTIPART_FORM_DATA)
- @Path("/schema")
- public Response schemaReengineering(
- @FormDataParam("output-graph") String outputGraph,
- @FormDataParam("input-type") String inputType,
- @FormDataParam("input") InputStream input,
- @Context HttpHeaders headers,
- @Context HttpServletRequest httpServletRequest){
+ @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+ @Path("/db")
+ public Response reengineeringDB(@QueryParam("db") String physicalDBName,
+ @QueryParam("jdbc") String jdbcDriver,
+ @QueryParam("protocol") String protocol,
+ @QueryParam("host") String host,
+ @QueryParam("port") String port,
+ @QueryParam("username") String username,
+ @QueryParam("password") String password,
+ @QueryParam("output-graph") String outputGraph,
+ @Context HttpHeaders headers,
+ @Context HttpServletRequest httpServletRequest) {
- int reengineerType = -1;
- try {
- reengineerType = ReengineerType.getType(inputType);
- } catch (UnsupportedReengineerException e) {
- Response.status(404).build();
- }
+ log.info("There are " + tcManager.listMGraphs().size() + " mGraphs");
+ System.out.println("There are " + tcManager.listMGraphs().size() + " mGraphs");
- try {
- DataSource dataSource = DataSourceFactory.createDataSource(reengineerType, input);
+ // UriRef uri = ContentItemHelper.makeDefaultUri(databaseURI, databaseURI.getBytes());
+ ConnectionSettings connectionSettings = new DBConnectionSettings(protocol, host, port,
+ physicalDBName, username, password, null, jdbcDriver);
+ DataSource dataSource = new RDB(connectionSettings);
- try {
- OWLOntology ontology;
+ String servletPath = httpServletRequest.getLocalAddr();
+ servletPath = "http://" + servletPath + "/kres/graphs/" + outputGraph + ":"
+ + httpServletRequest.getLocalPort();
- String servletPath = httpServletRequest.getLocalAddr();
- servletPath = "http://"+servletPath+"/kres/graphs/"+outputGraph+":"+httpServletRequest.getLocalPort();
- if(outputGraph == null){
- ontology = reengineeringManager.performSchemaReengineering(servletPath, null, dataSource);
- return Response.ok().build();
- }
- else{
- ontology = reengineeringManager.performSchemaReengineering(servletPath, IRI.create(outputGraph), dataSource);
- return Response.ok(ontology).build();
- }
+ if (outputGraph != null && !outputGraph.equals("")) {
+ OWLOntology ontology;
+ try {
+ ontology = reengineeringManager.performReengineering(servletPath, IRI.create(outputGraph),
+ dataSource);
+ return Response.ok(ontology).build();
} catch (ReengineeringException e) {
return Response.status(500).build();
}
- } catch (NoSuchDataSourceExpection e) {
- return Response.status(415).build();
- } catch (InvalidDataSourceForTypeSelectedException e) {
- return Response.status(204).build();
- }
-
- }
-
-
-
- @GET
- @Path("/reengineers")
- public Response listReengineers(@Context HttpHeaders headers){
- Collection<Reengineer> reengineers = reengineeringManager.listReengineers();
- MGraph mGraph = new SimpleMGraph();
- UriRef semionRef = new UriRef("http://semion.kres.iksproject.eu#Semion");
- for(Reengineer semionReengineer : reengineers){
- UriRef hasReengineer = new UriRef("http://semion.kres.iksproject.eu#hasReengineer");
- Literal reenginnerLiteral = LiteralFactory.getInstance().createTypedLiteral(semionReengineer.getClass().getCanonicalName());
- mGraph.add(new TripleImpl(semionRef, hasReengineer, reenginnerLiteral));
+ } else {
+ try {
+ reengineeringManager.performReengineering(servletPath, null, dataSource);
+ return Response.ok().build();
+ } catch (ReengineeringException e) {
+ return Response.status(500).build();
+ }
}
-
- return Response.ok(mGraph).build();
- }
-
-
- @GET
- @Path("/reengineers/count")
- public Response countReengineers(@Context HttpHeaders headers){
-
- return Response.ok(reengineeringManager.countReengineers()).build();
}
-
-
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@Path("/db/schema")
- public Response reengineeringDBSchema(
- @FormParam("output-graph") String outputGraph,
- @FormParam("db") String physicalDBName, @FormParam("jdbc") String jdbcDriver,
- @FormParam("protocol") String protocol, @FormParam("host") String host,
- @FormParam("port") String port, @FormParam("username") String username, @FormParam("password") String password,
- @Context HttpHeaders headers,
- @Context HttpServletRequest httpServletRequest){
-
+ public Response reengineeringDBSchema(@FormParam("output-graph") String outputGraph,
+ @FormParam("db") String physicalDBName,
+ @FormParam("jdbc") String jdbcDriver,
+ @FormParam("protocol") String protocol,
+ @FormParam("host") String host,
+ @FormParam("port") String port,
+ @FormParam("username") String username,
+ @FormParam("password") String password,
+ @Context HttpHeaders headers,
+ @Context HttpServletRequest httpServletRequest) {
log.info("There are " + tcManager.listMGraphs().size() + " mGraphs");
System.out.println("There are " + tcManager.listMGraphs().size() + " mGraphs");
- //UriRef uri = ContentItemHelper.makeDefaultUri(databaseURI, databaseURI.getBytes());
- ConnectionSettings connectionSettings = new DBConnectionSettings(protocol, host, port, physicalDBName, username, password, null, jdbcDriver);
+ // UriRef uri = ContentItemHelper.makeDefaultUri(databaseURI, databaseURI.getBytes());
+ ConnectionSettings connectionSettings = new DBConnectionSettings(protocol, host, port,
+ physicalDBName, username, password, null, jdbcDriver);
DataSource dataSource = new RDB(connectionSettings);
String servletPath = httpServletRequest.getLocalAddr();
- servletPath = "http://"+servletPath+"/kres/graphs/"+outputGraph+":"+httpServletRequest.getLocalPort();
+ servletPath = "http://" + servletPath + "/kres/graphs/" + outputGraph + ":"
+ + httpServletRequest.getLocalPort();
- if(outputGraph != null && !outputGraph.equals("")){
+ if (outputGraph != null && !outputGraph.equals("")) {
OWLOntology ontology;
try {
- ontology = reengineeringManager.performSchemaReengineering(servletPath, IRI.create(outputGraph), dataSource);
- /*MediaType mediaType = headers.getMediaType();
- String res = OntologyRenderUtils.renderOntology(ontology, mediaType.getType());*/
+ ontology = reengineeringManager.performSchemaReengineering(servletPath,
+ IRI.create(outputGraph), dataSource);
+ /*
+ * MediaType mediaType = headers.getMediaType(); String res =
+ * OntologyRenderUtils.renderOntology(ontology, mediaType.getType());
+ */
return Response.ok(ontology).build();
} catch (ReengineeringException e) {
return Response.status(500).build();
}
- }
- else{
+ } else {
try {
reengineeringManager.performSchemaReengineering(servletPath, null, dataSource);
return Response.ok().build();
@@ -260,51 +261,75 @@ public class ReengineerResource extends
}
}
-
}
-
@POST
- @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
- @Path("/db")
- public Response reengineeringDB(
- @QueryParam("db") String physicalDBName, @QueryParam("jdbc") String jdbcDriver,
- @QueryParam("protocol") String protocol, @QueryParam("host") String host,
- @QueryParam("port") String port, @QueryParam("username") String username, @QueryParam("password") String password,
- @QueryParam("output-graph") String outputGraph,
- @Context HttpHeaders headers,
- @Context HttpServletRequest httpServletRequest){
-
-
- log.info("There are " + tcManager.listMGraphs().size() + " mGraphs");
- System.out.println("There are " + tcManager.listMGraphs().size() + " mGraphs");
+ @Consumes(MediaType.MULTIPART_FORM_DATA)
+ @Path("/schema")
+ public Response schemaReengineering(@FormDataParam("output-graph") String outputGraph,
+ @FormDataParam("input-type") String inputType,
+ @FormDataParam("input") InputStream input,
+ @Context HttpHeaders headers,
+ @Context HttpServletRequest httpServletRequest) {
- //UriRef uri = ContentItemHelper.makeDefaultUri(databaseURI, databaseURI.getBytes());
- ConnectionSettings connectionSettings = new DBConnectionSettings(protocol, host, port, physicalDBName, username, password, null, jdbcDriver);
- DataSource dataSource = new RDB(connectionSettings);
+ int reengineerType = -1;
+ try {
+ reengineerType = ReengineerType.getType(inputType);
+ } catch (UnsupportedReengineerException e) {
+ Response.status(404).build();
+ }
- String servletPath = httpServletRequest.getLocalAddr();
- servletPath = "http://"+servletPath+"/kres/graphs/"+outputGraph+":"+httpServletRequest.getLocalPort();
+ try {
+ DataSource dataSource = DataSourceFactory.createDataSource(reengineerType, input);
- if(outputGraph != null && !outputGraph.equals("")){
- OWLOntology ontology;
try {
- ontology = reengineeringManager.performReengineering(servletPath, IRI.create(outputGraph), dataSource);
- return Response.ok(ontology).build();
- } catch (ReengineeringException e) {
- return Response.status(500).build();
- }
+ OWLOntology ontology;
- }
- else{
- try {
- reengineeringManager.performReengineering(servletPath, null, dataSource);
- return Response.ok().build();
+ String servletPath = httpServletRequest.getLocalAddr();
+ servletPath = "http://" + servletPath + "/kres/graphs/" + outputGraph + ":"
+ + httpServletRequest.getLocalPort();
+ if (outputGraph == null) {
+ ontology = reengineeringManager.performSchemaReengineering(servletPath, null, dataSource);
+ return Response.ok().build();
+ } else {
+ ontology = reengineeringManager.performSchemaReengineering(servletPath,
+ IRI.create(outputGraph), dataSource);
+ return Response.ok(ontology).build();
+ }
} catch (ReengineeringException e) {
return Response.status(500).build();
}
+
+ } catch (NoSuchDataSourceExpection e) {
+ return Response.status(415).build();
+ } catch (InvalidDataSourceForTypeSelectedException e) {
+ return Response.status(204).build();
}
+
}
+ /**
+ * Borrowed from ontonet. TODO avoid explicitly storing from the Web resource
+ *
+ * @param o
+ */
+ private void store(OWLOntology o) {
+ // // Why was it using two converters earlier?
+ // JenaToOwlConvert converter = new JenaToOwlConvert();
+ // OntModel om = converter.ModelOwlToJenaConvert(o, "RDF/XML");
+ // MGraph mg = JenaToClerezzaConverter.jenaModelToClerezzaMGraph(om);
+ TripleCollection mg = OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(o);
+ MGraph mg2 = null;
+ IRI iri = OWLUtils.guessOntologyIdentifier(o);
+ UriRef ref = new UriRef(iri.toString());
+ try {
+ mg2 = tcManager.createMGraph(ref);
+ } catch (EntityAlreadyExistsException ex) {
+ log.info("Entity " + ref + " already exists in store. Replacing...");
+ mg2 = tcManager.getMGraph(ref);
+ }
+
+ mg2.addAll(mg);
+ }
}