svn commit: r1089499 - /incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java

[an...@apache.org]

Author: anuzzolese
Date: Wed Apr  6 15:43:31 2011
New Revision: 1089499

URL: http://svn.apache.org/viewvc?rev=1089499&view=rev
Log:
STANBOL-145 Updated the ontology network manager.

Modified:
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java

Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java?rev=1089499&r1=1089498&r2=1089499&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java Wed Apr  6 15:43:31 2011
@@ -38,7 +38,6 @@ import org.apache.stanbol.ontologymanage
 import org.apache.stanbol.ontologymanager.ontonet.impl.registry.model.impl.RegistryLoaderImpl;
 import org.apache.stanbol.ontologymanager.ontonet.impl.session.SessionManagerImpl;
 import org.apache.stanbol.ontologymanager.ontonet.impl.session.ScopeSessionSynchronizer;
-import org.apache.stanbol.ontologymanager.store.api.PersistenceStore;
 import org.osgi.service.component.ComponentContext;
 import org.semanticweb.owlapi.apibinding.OWLManager;
 import org.semanticweb.owlapi.io.FileDocumentSource;
@@ -115,9 +114,7 @@ public class ONManagerImpl implements ON
     @Reference
     private WeightedTcProvider wtcp;
 
-    @Reference
-    private PersistenceStore persistenceStore;
-    
+    private ClerezzaOntologyStorage storage;
     //private ClerezzaOntologyStorage storage;
 
     /*
@@ -153,21 +150,17 @@ public class ONManagerImpl implements ON
          * null. So create the object only if both are not null.
          */
     	
-    	/*
-    	 * NOW WE USE THE STANBOL PERSISTENCE STORE.
-    	 * 
     	if (tcm != null && wtcp != null) storage = new ClerezzaOntologyStorage(tcm, wtcp);
         // Manage this in-memory, so it won't have to be null.
         else {
             storage = new InMemoryOntologyStorage();
         }
         
-        */
 
         // Now create everything that depends on the Storage object.
 
         // These may require the OWL cache manager
-        ontologySpaceFactory = new OntologySpaceFactoryImpl(scopeRegistry, persistenceStore);
+        ontologySpaceFactory = new OntologySpaceFactoryImpl(scopeRegistry, storage);
         ontologyScopeFactory = new OntologyScopeFactoryImpl(scopeRegistry, ontologySpaceFactory);
         ontologyScopeFactory.addScopeEventListener(oIndex);
 
@@ -179,7 +172,7 @@ public class ONManagerImpl implements ON
         // storage = new FISEPersistenceStorage();
 
         sessionManager = new SessionManagerImpl(IRI.create("http://kres.iks-project.eu/"),
-                getScopeRegistry(), persistenceStore);
+                getScopeRegistry(), storage);
         sessionManager.addSessionListener(new ScopeSessionSynchronizer(this));
     }
 
@@ -402,8 +395,8 @@ public class ONManagerImpl implements ON
         return ontologySpaceFactory;
     }
 
-    public PersistenceStore getOntologyStore() {
-        return persistenceStore;
+    public ClerezzaOntologyStorage getOntologyStore() {
+        return storage;
     }
 
     public OWLOntologyManager getOwlCacheManager() {