Author: anuzzolese
Date: Wed Apr 6 15:00:19 2011
New Revision: 1089475
URL: http://svn.apache.org/viewvc?rev=1089475&view=rev
Log:
STANBOL-145 Removed any persistence store reference.
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/AbstractOntologySpaceImpl.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/CoreOntologySpaceImpl.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/CustomOntologySpaceImpl.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologySpaceFactoryImpl.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/SessionOntologySpaceImpl.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionImpl.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/AbstractOntologySpaceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/AbstractOntologySpaceImpl.java?rev=1089475&r1=1089474&r2=1089475&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/AbstractOntologySpaceImpl.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/AbstractOntologySpaceImpl.java
Wed Apr 6 15:00:19 2011
@@ -1,6 +1,5 @@
package org.apache.stanbol.ontologymanager.ontonet.impl.ontology;
-import java.io.ByteArrayOutputStream;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/CoreOntologySpaceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/CoreOntologySpaceImpl.java?rev=1089475&r1=1089474&r2=1089475&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/CoreOntologySpaceImpl.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/CoreOntologySpaceImpl.java
Wed Apr 6 15:00:19 2011
@@ -4,7 +4,6 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SpaceType;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.apache.stanbol.ontologymanager.ontonet.impl.util.StringUtils;
-import org.apache.stanbol.ontologymanager.store.api.PersistenceStore;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntologyManager;
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/CustomOntologySpaceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/CustomOntologySpaceImpl.java?rev=1089475&r1=1089474&r2=1089475&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/CustomOntologySpaceImpl.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/CustomOntologySpaceImpl.java
Wed Apr 6 15:00:19 2011
@@ -7,7 +7,6 @@ import org.apache.stanbol.ontologymanage
import
org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.apache.stanbol.ontologymanager.ontonet.impl.util.StringUtils;
-import org.apache.stanbol.ontologymanager.store.api.PersistenceStore;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyManager;
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologySpaceFactoryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologySpaceFactoryImpl.java?rev=1089475&r1=1089474&r2=1089475&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologySpaceFactoryImpl.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologySpaceFactoryImpl.java
Wed Apr 6 15:00:19 2011
@@ -11,7 +11,6 @@ import org.apache.stanbol.ontologymanage
import
org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
import
org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
-import org.apache.stanbol.ontologymanager.store.api.PersistenceStore;
import org.semanticweb.owlapi.model.IRI;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/SessionOntologySpaceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/SessionOntologySpaceImpl.java?rev=1089475&r1=1089474&r2=1089475&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/SessionOntologySpaceImpl.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/SessionOntologySpaceImpl.java
Wed Apr 6 15:00:19 2011
@@ -8,7 +8,6 @@ import org.apache.stanbol.ontologymanage
import
org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.apache.stanbol.ontologymanager.ontonet.impl.util.StringUtils;
-import org.apache.stanbol.ontologymanager.store.api.PersistenceStore;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
@@ -25,11 +24,11 @@ public class SessionOntologySpaceImpl ex
// SUFFIX = SpaceType.SESSION.getIRISuffix();
// }
- public SessionOntologySpaceImpl(IRI scopeID, PersistenceStore
persistenceStore) {
+ public SessionOntologySpaceImpl(IRI scopeID, ClerezzaOntologyStorage
store) {
// FIXME : sync session id with session space ID
super(IRI.create(StringUtils.stripIRITerminator(scopeID) + "/"
+ SpaceType.SESSION.getIRISuffix() + "-"
- + new Random().nextLong()), SpaceType.SESSION,
persistenceStore/*, scopeID*/);
+ + new Random().nextLong()), SpaceType.SESSION,
store/*, scopeID*/);
IRI iri = IRI.create(StringUtils.stripIRITerminator(getID())
+ "/root.owl");
@@ -50,13 +49,13 @@ public class SessionOntologySpaceImpl ex
}
}
- public SessionOntologySpaceImpl(IRI scopeID, PersistenceStore
persistenceStore,
+ public SessionOntologySpaceImpl(IRI scopeID, ClerezzaOntologyStorage
store,
OWLOntologyManager ontologyManager) {
// FIXME : sync session id with session space ID
super(IRI.create(StringUtils.stripIRITerminator(scopeID) + "/"
+ SpaceType.SESSION.getIRISuffix() + "-"
- + new Random().nextLong()), SpaceType.SESSION,
persistenceStore, /*scopeID,*/ ontologyManager);
+ + new Random().nextLong()), SpaceType.SESSION,
store, /*scopeID,*/ ontologyManager);
Logger log = LoggerFactory.getLogger(getClass());
IRI iri = IRI.create(StringUtils.stripIRITerminator(getID())
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=1089475&r1=1089474&r2=1089475&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
Wed Apr 6 15:00:19 2011
@@ -8,7 +8,6 @@ import org.apache.stanbol.ontologymanage
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.State;
import
org.apache.stanbol.ontologymanager.ontonet.api.session.SessionEvent.OperationType;
import org.semanticweb.owlapi.model.IRI;
import org.slf4j.LoggerFactory;
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=1089475&r1=1089474&r2=1089475&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
Wed Apr 6 15:00:19 2011
@@ -1,8 +1,6 @@
package org.apache.stanbol.ontologymanager.ontonet.impl.session;
-import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -22,7 +20,6 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.session.Session.State;
import
org.apache.stanbol.ontologymanager.ontonet.api.session.SessionEvent.OperationType;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
-import org.apache.stanbol.ontologymanager.store.api.PersistenceStore;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyStorageException;
@@ -51,21 +48,14 @@ public class SessionManagerImpl implemen
protected ScopeRegistry scopeRegistry;
- /*
- *
- * The local ClerezzaOntologyStorage has been changed with the global
Stanbol component
- * PersistenceStore.
- *
- */
- //protected ClerezzaOntologyStorage store;
- protected PersistenceStore persistenceStore;
-
- public SessionManagerImpl(IRI baseIri, ScopeRegistry scopeRegistry,
PersistenceStore persistenceStore) {
+ protected ClerezzaOntologyStorage store;
+
+ public SessionManagerImpl(IRI baseIri, ScopeRegistry scopeRegistry,
ClerezzaOntologyStorage store) {
idgen = new TimestampedSessionIDGenerator(baseIri);
listeners = new HashSet<SessionListener>();
sessionsByID = new HashMap<IRI, Session>();
this.scopeRegistry = scopeRegistry;
- this.persistenceStore = persistenceStore;
+ this.store = store;
}
/*
@@ -283,30 +273,7 @@ public class SessionManagerImpl implemen
for (SessionOntologySpace so : getSessionSpaces(sessionID)){
for (OWLOntology owlOntology : so.getOntologies()){
- /*
- * As the store saves ontology as string
serializations first it is needed to convert the ontology content
- * to a string (the UTF-8 charset is used) and
then it is possible to save the ontology specifying to the storage
- * the ontology ID.
- */
- ByteArrayOutputStream outStream = new
ByteArrayOutputStream();
-
-
owlOntology.getOWLOntologyManager().saveOntology(owlOntology, outStream);
-
- String ontologyID =
owlOntology.getOntologyID().getOntologyIRI().toString();
-
- String ontologyString;
- try {
- ontologyString =
outStream.toString("UTF-8");
-
persistenceStore.saveOntology(ontologyString, ontologyID, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
-
+ store.store(owlOntology);
}
}
