Author: anuzzolese
Date: Wed Apr 6 14:43:02 2011
New Revision: 1089471
URL: http://svn.apache.org/viewvc?rev=1089471&view=rev
Log:
STANBOL-145 Reverted to the version without persistence store.
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/pom.xml
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java
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/session/SessionManagerImpl.java
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/pom.xml?rev=1089471&r1=1089470&r2=1089471&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/pom.xml (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/pom.xml Wed Apr 6 14:43:02
2011
@@ -14,6 +14,7 @@
the specific language governing permissions and limitations
under the
License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java?rev=1089471&r1=1089470&r2=1089471&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java
Wed Apr 6 14:43:02 2011
@@ -6,7 +6,7 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.apache.stanbol.ontologymanager.ontonet.api.registry.RegistryLoader;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
-import org.apache.stanbol.ontologymanager.store.api.PersistenceStore;
+import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.OWLOntologyAlreadyExistsException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
@@ -26,7 +26,7 @@ public interface ONManager {
*
* @return the default ontology index.
*/
- OntologyIndex getOntologyIndex();
+ public OntologyIndex getOntologyIndex();
/**
* Returns the ontology scope factory that was created along with the
@@ -34,7 +34,7 @@ public interface ONManager {
*
* @return the default ontology scope factory
*/
- OntologyScopeFactory getOntologyScopeFactory();
+ public OntologyScopeFactory getOntologyScopeFactory();
/**
* Returns the ontology space factory that was created along with the
@@ -42,14 +42,16 @@ public interface ONManager {
*
* @return the default ontology space factory.
*/
- OntologySpaceFactory getOntologySpaceFactory();
+ public OntologySpaceFactory getOntologySpaceFactory();
/**
* Returns the default ontology storage system for this KReS instance.
*
* @return the default ontology store.
*/
- public PersistenceStore getOntologyStore();
+
+
+ public ClerezzaOntologyStorage getOntologyStore();
/**
* Returns an OWL Ontology Manager that is never cleared of its
ontologies,
@@ -60,35 +62,35 @@ public interface ONManager {
*
* @return the OWL Ontology Manager used for caching ontologies.
*/
- OWLOntologyManager getOwlCacheManager();
+ public OWLOntologyManager getOwlCacheManager();
/**
* Returns a factory object that can be used for obtaining OWL API
objects.
*
* @return the default OWL data factory
*/
- OWLDataFactory getOwlFactory();
+ public OWLDataFactory getOwlFactory();
/**
* Returns the default ontology registry loader.
*
* @return the default ontology registry loader.
*/
- RegistryLoader getRegistryLoader();
+ public RegistryLoader getRegistryLoader();
/**
* Returns the unique ontology scope registry for this context.
*
* @return the ontology scope registry.
*/
- ScopeRegistry getScopeRegistry();
+ public ScopeRegistry getScopeRegistry();
/**
* Returns the unique KReS session manager for this context.
*
* @return the KreS session manager.
*/
- SessionManager getSessionManager();
+ public SessionManager getSessionManager();
/**
* Returns the list of IRIs that identify scopes that should be
activated on
@@ -96,12 +98,12 @@ public interface ONManager {
*
* @return the list of scope IDs to activate.
*/
- String[] getUrisToActivate();
+ public String[] getUrisToActivate();
/**
* Returns the String that represent the namespace used by KReS for its
ontologies
*
* @return the namespace of KReS.
*/
- String getKReSNamespace();
+ public String getKReSNamespace();
}
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=1089471&r1=1089470&r2=1089471&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 14:43:02 2011
@@ -18,7 +18,6 @@ import org.apache.stanbol.ontologymanage
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.apache.stanbol.ontologymanager.ontonet.impl.util.OntologyUtils;
import org.apache.stanbol.ontologymanager.ontonet.impl.util.StringUtils;
-import org.apache.stanbol.ontologymanager.store.api.PersistenceStore;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.io.RDFXMLOntologyFormat;
import org.semanticweb.owlapi.io.StringDocumentSource;
@@ -72,12 +71,7 @@ public abstract class AbstractOntologySp
protected OWLOntologyManager ontologyManager;
- /*
- * The ClerezzaOntologyStorage (local to OntoNet) has been changed with
- * PersistenceStore (general from Stanbol)
- */
- //protected ClerezzaOntologyStorage storage;
- protected PersistenceStore persistenceStore;
+ protected ClerezzaOntologyStorage storage;
protected IRI parentID = null;
@@ -87,8 +81,8 @@ public abstract class AbstractOntologySp
protected boolean silent = false;
- protected AbstractOntologySpaceImpl(IRI spaceID, SpaceType type/*, IRI
parentID*/, PersistenceStore persistenceStore) {
- this(spaceID, type, /*parentID,*/
persistenceStore,OWLManager.createOWLOntologyManager());
+ protected AbstractOntologySpaceImpl(IRI spaceID, SpaceType type/*, IRI
parentID*/, ClerezzaOntologyStorage storage) {
+ this(spaceID, type, /*parentID,*/ storage,
OWLManager.createOWLOntologyManager());
}
// /**
@@ -113,9 +107,10 @@ public abstract class AbstractOntologySp
* @param ontologyManager
* the default ontology manager for this space.
*/
- protected AbstractOntologySpaceImpl(IRI spaceID, SpaceType type,
PersistenceStore persistenceStore, /*IRI parentID,*/
+ protected AbstractOntologySpaceImpl(IRI spaceID, SpaceType type,
ClerezzaOntologyStorage storage, /*IRI parentID,*/
OWLOntologyManager ontologyManager) {
+
// this.parentID = parentID;
// SUFFIX = type.getIRISuffix();
@@ -125,7 +120,8 @@ public abstract class AbstractOntologySp
//
// if (parentScope != null && parentScope
instanceof OntologySpaceListener)
//
this.addOntologySpaceListener((OntologySpaceListener) parentScope);
- this.persistenceStore = persistenceStore;
+ this.storage = storage;
+
this._id = spaceID;
if (ontologyManager != null)
this.ontologyManager = ontologyManager;
@@ -320,27 +316,17 @@ public abstract class AbstractOntologySp
try {
// Store the top ontology
if (!(this instanceof SessionOntologySpace)) {
- if (persistenceStore == null)
+ if (storage == null)
log
.error("KReS ::
[NONFATAL] no ontology storage found. Ontology "
+
ontology.getOntologyID()
+ "
will be stored in-memory only.");
else {
- /*
- * If the persistence store is not null
then the ontology can be saved in the storage.
- * 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 out = new
ByteArrayOutputStream();
-
-
ontology.getOWLOntologyManager().saveOntology(ontology, out);
-
- String ontologyID =
ontology.getOntologyID().getOntologyIRI().toString();
-
- String ontologyString =
out.toString("UTF-8");
-
-
persistenceStore.saveOntology(ontologyString, ontologyID, "UTF-8");
+
+
+ //storage = new
ClerezzaOntologyStorage(tcManager, wtcProvider)
+
+ storage.store(ontology);
}
}
//
ONManager.get().getOntologyStore().load(rootOntology.getOntologyID().getOntologyIRI());
@@ -496,28 +482,13 @@ public abstract class AbstractOntologySp
// Store the top ontology
if (!(this instanceof SessionOntologySpace)) {
- if (persistenceStore == null)
+ if (storage == null)
log
.error("KReS ::
[NONFATAL] no ontology storage found. Ontology "
+
rootOntology.getOntologyID()
+ "
will be stored in-memory only.");
else {
-
- /*
- * If the persistence store is not null
then the root ontology can be saved in the storage.
- * 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 out = new
ByteArrayOutputStream();
-
-
rootOntology.getOWLOntologyManager().saveOntology(rootOntology, out);
-
- String ontologyID =
rootOntology.getOntologyID().getOntologyIRI().toString();
-
- String ontologyString =
out.toString("UTF-8");
-
-
persistenceStore.saveOntology(ontologyString, ontologyID, "UTF-8");
+ storage.store(rootOntology);
}
}
} catch (Exception ex) {
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=1089471&r1=1089470&r2=1089471&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 14:43:02 2011
@@ -17,15 +17,16 @@ public class CoreOntologySpaceImpl exten
// SUFFIX = SpaceType.CORE.getIRISuffix();
// }
- public CoreOntologySpaceImpl(IRI scopeID, PersistenceStore
persistenceStore) {
+ public CoreOntologySpaceImpl(IRI scopeID, ClerezzaOntologyStorage
storage) {
+
super(IRI.create(StringUtils.stripIRITerminator(scopeID) + "/"
- + SpaceType.CORE.getIRISuffix()),
SpaceType.CORE/*, scopeID*/, persistenceStore);
+ + SpaceType.CORE.getIRISuffix()),
SpaceType.CORE/*, scopeID*/, storage);
}
- public CoreOntologySpaceImpl(IRI scopeID, PersistenceStore
persistenceStore,
+ public CoreOntologySpaceImpl(IRI scopeID, ClerezzaOntologyStorage
storage,
OWLOntologyManager ontologyManager) {
super(IRI.create(StringUtils.stripIRITerminator(scopeID) + "/"
- + SpaceType.CORE.getIRISuffix()),
SpaceType.CORE, /*scopeID,*/ persistenceStore,
+ + SpaceType.CORE.getIRISuffix()),
SpaceType.CORE, /*scopeID,*/ storage,
ontologyManager);
}
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=1089471&r1=1089470&r2=1089471&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 14:43:02 2011
@@ -21,16 +21,16 @@ public class CustomOntologySpaceImpl ext
// SUFFIX = SpaceType.CUSTOM.getIRISuffix();
// }
- public CustomOntologySpaceImpl(IRI scopeID, PersistenceStore
persistenceStore) {
+ public CustomOntologySpaceImpl(IRI scopeID, ClerezzaOntologyStorage
storage) {
super(IRI.create(StringUtils.stripIRITerminator(scopeID) + "/"
- + SpaceType.CUSTOM.getIRISuffix()),
SpaceType.CUSTOM/*, scopeID*/, persistenceStore
+ + SpaceType.CUSTOM.getIRISuffix()),
SpaceType.CUSTOM/*, scopeID*/, storage
);
}
- public CustomOntologySpaceImpl(IRI scopeID, PersistenceStore
persistenceStore,
+ public CustomOntologySpaceImpl(IRI scopeID, ClerezzaOntologyStorage
storage,
OWLOntologyManager ontologyManager) {
super(IRI.create(StringUtils.stripIRITerminator(scopeID) + "/"
- + SpaceType.CUSTOM.getIRISuffix()),
SpaceType.CUSTOM, persistenceStore, /*scopeID,*/
+ + SpaceType.CUSTOM.getIRISuffix()),
SpaceType.CUSTOM, storage, /*scopeID,*/
ontologyManager);
}
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=1089471&r1=1089470&r2=1089471&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 14:43:02 2011
@@ -35,11 +35,11 @@ public class OntologySpaceFactoryImpl im
*
*/
//protected ClerezzaOntologyStorage storage;
- protected PersistenceStore persistenceStore;
+ protected ClerezzaOntologyStorage storage;
- public OntologySpaceFactoryImpl(ScopeRegistry registry,
PersistenceStore persistenceStore) {
+ public OntologySpaceFactoryImpl(ScopeRegistry registry,
ClerezzaOntologyStorage storage) {
this.registry = registry;
- this.persistenceStore = persistenceStore;
+ this.storage = storage;
}
/*
@@ -49,7 +49,7 @@ public class OntologySpaceFactoryImpl im
@Override
public CoreOntologySpace createCoreOntologySpace(IRI scopeID,
OntologyInputSource coreSource) {
- CoreOntologySpace s = new CoreOntologySpaceImpl(scopeID,
persistenceStore);
+ CoreOntologySpace s = new CoreOntologySpaceImpl(scopeID,
storage);
setupSpace(s, scopeID, coreSource);
return s;
}
@@ -61,7 +61,7 @@ public class OntologySpaceFactoryImpl im
@Override
public CustomOntologySpace createCustomOntologySpace(IRI scopeID,
OntologyInputSource customSource) {
- CustomOntologySpace s = new CustomOntologySpaceImpl(scopeID,
persistenceStore);
+ CustomOntologySpace s = new CustomOntologySpaceImpl(scopeID,
storage);
setupSpace(s, scopeID, customSource);
return s;
}
@@ -72,7 +72,7 @@ public class OntologySpaceFactoryImpl im
*/
@Override
public SessionOntologySpace createSessionOntologySpace(IRI scopeID) {
- SessionOntologySpace s = new SessionOntologySpaceImpl(scopeID,
persistenceStore);
+ SessionOntologySpace s = new SessionOntologySpaceImpl(scopeID,
storage);
// s.setUp();
return s;
}
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=1089471&r1=1089470&r2=1089471&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 14:43:02 2011
@@ -80,6 +80,7 @@ public class SessionManagerImpl implemen
listeners.add(listener);
}
+
/*
* (non-Javadoc)
*
