Modified: stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/ClerezzaCollectorFactory.java URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/ClerezzaCollectorFactory.java?rev=1395504&r1=1395503&r2=1395504&view=diff ============================================================================== --- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/ClerezzaCollectorFactory.java (original) +++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/ClerezzaCollectorFactory.java Mon Oct 8 10:25:06 2012 @@ -37,23 +37,24 @@ import org.apache.stanbol.ontologymanage import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyProvider; import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace; import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace.SpaceType; -import org.apache.stanbol.ontologymanager.servicesapi.scope.PersistentCollectorFactory; +import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpaceFactory; import org.apache.stanbol.ontologymanager.servicesapi.scope.Scope; import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeEventListener; +import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeFactory; import org.osgi.service.component.ComponentContext; import org.semanticweb.owlapi.model.IRI; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Implementation of {@link PersistentCollectorFactory} based on Clerezza. + * Implementation of {@link OntologySpaceFactory} based on Clerezza. * * @author alexdma * */ @Component(immediate = true, metatype = false) -@Service(PersistentCollectorFactory.class) -public class ClerezzaCollectorFactory implements PersistentCollectorFactory { +@Service(OntologySpaceFactory.class) +public class ClerezzaCollectorFactory implements OntologySpaceFactory, ScopeFactory { protected Collection<ScopeEventListener> listeners;
Modified: stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/ScopeImpl.java URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/ScopeImpl.java?rev=1395504&r1=1395503&r2=1395504&view=diff ============================================================================== --- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/ScopeImpl.java (original) +++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/ScopeImpl.java Mon Oct 8 10:25:06 2012 @@ -40,7 +40,7 @@ import org.apache.stanbol.ontologymanage import org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource; import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace; import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace.SpaceType; -import org.apache.stanbol.ontologymanager.servicesapi.scope.PersistentCollectorFactory; +import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpaceFactory; import org.apache.stanbol.ontologymanager.servicesapi.scope.Scope; import org.semanticweb.owlapi.apibinding.OWLManager; import org.semanticweb.owlapi.model.AddImport; @@ -93,7 +93,7 @@ public class ScopeImpl implements Scope, public ScopeImpl(String id, IRI namespace, - PersistentCollectorFactory factory, + OntologySpaceFactory factory, OntologyInputSource<?>... coreOntologies) { setID(id); setDefaultNamespace(namespace); @@ -115,13 +115,13 @@ public class ScopeImpl implements Scope, listeners.clear(); } - private void configureCoreSpace(PersistentCollectorFactory factory) { + private void configureCoreSpace(OntologySpaceFactory factory) { this.coreSpace = factory.createCoreOntologySpace(id/* , coreOntologies */); this.coreSpace.addOntologyCollectorListener(this); // Set listener before adding core ontologies } - private void configureCustomSpace(PersistentCollectorFactory factory) { + private void configureCustomSpace(OntologySpaceFactory factory) { try { setCustomSpace(factory.createCustomOntologySpace(id)); } catch (UnmodifiableOntologyCollectorException e) { Modified: stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/ClerezzaOntologyProvider.java URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/ClerezzaOntologyProvider.java?rev=1395504&r1=1395503&r2=1395504&view=diff ============================================================================== --- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/ClerezzaOntologyProvider.java (original) +++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/ClerezzaOntologyProvider.java Mon Oct 8 10:25:06 2012 @@ -88,8 +88,8 @@ import org.apache.stanbol.commons.owl.ut import org.apache.stanbol.commons.owl.util.URIUtils; import org.apache.stanbol.commons.stanboltools.offline.OfflineMode; import org.apache.stanbol.ontologymanager.multiplexer.clerezza.collector.MGraphMultiplexer; +import org.apache.stanbol.ontologymanager.ontonet.api.OntologyNetworkConfiguration; import org.apache.stanbol.ontologymanager.servicesapi.OfflineConfiguration; -import org.apache.stanbol.ontologymanager.servicesapi.OntologyNetworkConfiguration; import org.apache.stanbol.ontologymanager.servicesapi.collector.ImportManagementPolicy; import org.apache.stanbol.ontologymanager.servicesapi.io.Origin; import org.apache.stanbol.ontologymanager.servicesapi.ontology.Multiplexer; Modified: stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/SessionManagerImpl.java URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/SessionManagerImpl.java?rev=1395504&r1=1395503&r2=1395504&view=diff ============================================================================== --- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/SessionManagerImpl.java (original) +++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/SessionManagerImpl.java Mon Oct 8 10:25:06 2012 @@ -34,8 +34,8 @@ import org.apache.felix.scr.annotations. import org.apache.felix.scr.annotations.Service; import org.apache.stanbol.ontologymanager.core.session.TimestampedSessionIDGenerator; import org.apache.stanbol.ontologymanager.multiplexer.clerezza.impl.SessionImpl; +import org.apache.stanbol.ontologymanager.ontonet.api.OntologyNetworkConfiguration; import org.apache.stanbol.ontologymanager.servicesapi.OfflineConfiguration; -import org.apache.stanbol.ontologymanager.servicesapi.OntologyNetworkConfiguration; import org.apache.stanbol.ontologymanager.servicesapi.collector.MissingOntologyException; import org.apache.stanbol.ontologymanager.servicesapi.collector.OntologyCollectorListener; import org.apache.stanbol.ontologymanager.servicesapi.io.StoredOntologySource; Modified: stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/MockOsgiContext.java URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/MockOsgiContext.java?rev=1395504&r1=1395503&r2=1395504&view=diff ============================================================================== --- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/MockOsgiContext.java (original) +++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/MockOsgiContext.java Mon Oct 8 10:25:06 2012 @@ -36,7 +36,6 @@ import org.apache.stanbol.ontologymanage import org.apache.stanbol.ontologymanager.multiplexer.clerezza.session.SessionManagerImpl; import org.apache.stanbol.ontologymanager.servicesapi.OfflineConfiguration; import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyProvider; -import org.apache.stanbol.ontologymanager.servicesapi.scope.PersistentCollectorFactory; import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager; import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager; @@ -57,7 +56,7 @@ public class MockOsgiContext { public static OntologyProvider<TcProvider> ontologyProvider; - public static PersistentCollectorFactory collectorfactory; + public static ClerezzaCollectorFactory collectorfactory; public static Parser parser; @@ -97,7 +96,8 @@ public class MockOsgiContext { public static void resetManagers() { // PersistentCollectorFactory factory = new ClerezzaCollectorFactory(ontologyProvider, config); - onManager = new ScopeManagerImpl(ontologyProvider, offline, collectorfactory, config); + onManager = new ScopeManagerImpl(ontologyProvider, offline, collectorfactory, collectorfactory, + config); sessionManager = new SessionManagerImpl(ontologyProvider, offline, config); } Modified: stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/TestOntologyNetworkPersistence.java URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/TestOntologyNetworkPersistence.java?rev=1395504&r1=1395503&r2=1395504&view=diff ============================================================================== --- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/TestOntologyNetworkPersistence.java (original) +++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/TestOntologyNetworkPersistence.java Mon Oct 8 10:25:06 2012 @@ -178,8 +178,9 @@ public class TestOntologyNetworkPersiste tcp = new SimpleTcProvider(); resetOntologyProvider(); Dictionary<String,Object> empty = new Hashtable<String,Object>(); - onm = new ScopeManagerImpl(ontologyProvider, new OfflineConfigurationImpl(empty), - new ClerezzaCollectorFactory(ontologyProvider, empty), empty); + ClerezzaCollectorFactory factory = new ClerezzaCollectorFactory(ontologyProvider, empty); + onm = new ScopeManagerImpl(ontologyProvider, new OfflineConfigurationImpl(empty), factory, factory, + empty); } @Test Modified: stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/scope/TestClerezzaSpaces.java URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/scope/TestClerezzaSpaces.java?rev=1395504&r1=1395503&r2=1395504&view=diff ============================================================================== --- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/scope/TestClerezzaSpaces.java (original) +++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/scope/TestClerezzaSpaces.java Mon Oct 8 10:25:06 2012 @@ -45,7 +45,7 @@ import org.apache.stanbol.ontologymanage import org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource; import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace; import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace.SpaceType; -import org.apache.stanbol.ontologymanager.servicesapi.scope.PersistentCollectorFactory; +import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpaceFactory; import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeRegistry; import org.apache.stanbol.ontologymanager.sources.clerezza.GraphSource; import org.apache.stanbol.ontologymanager.sources.owlapi.ParentPathInputSource; @@ -68,7 +68,7 @@ public class TestClerezzaSpaces { private static OWLAxiom linusIsHuman = null; - private static PersistentCollectorFactory factory; + private static OntologySpaceFactory factory; private static OntologyInputSource<TripleCollection> minorSrc, dropSrc, nonexSrc; Modified: stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/scope/TestOntologySpaces.java URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/scope/TestOntologySpaces.java?rev=1395504&r1=1395503&r2=1395504&view=diff ============================================================================== --- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/scope/TestOntologySpaces.java (original) +++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/scope/TestOntologySpaces.java Mon Oct 8 10:25:06 2012 @@ -36,7 +36,7 @@ import org.apache.stanbol.ontologymanage import org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource; import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace; import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace.SpaceType; -import org.apache.stanbol.ontologymanager.servicesapi.scope.PersistentCollectorFactory; +import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpaceFactory; import org.apache.stanbol.ontologymanager.sources.owlapi.BlankOntologySource; import org.apache.stanbol.ontologymanager.sources.owlapi.ParentPathInputSource; import org.apache.stanbol.ontologymanager.sources.owlapi.RootOntologySource; @@ -60,7 +60,7 @@ public class TestOntologySpaces { public static IRI baseIri = IRI.create(Constants.PEANUTS_MAIN_BASE), baseIri2 = IRI .create(Constants.PEANUTS_MINOR_BASE); - private static PersistentCollectorFactory factory; + private static OntologySpaceFactory factory; private static OntologyInputSource<OWLOntology> inMemorySrc, minorSrc, dropSrc, nonexSrc; private static OWLAxiom linusIsHuman = null; @@ -79,7 +79,7 @@ public class TestOntologySpaces { @BeforeClass public static void setup() throws Exception { - factory = onManager.getPersistentCollectorFactory(); + factory = onManager.getOntologySpaceFactory(); if (factory == null) fail("Could not instantiate ontology space factory"); OWLOntologyManager mgr = OWLOntologyManagerFactory.createOWLOntologyManager(onManager Modified: stanbol/trunk/ontologymanager/registry/pom.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/registry/pom.xml?rev=1395504&r1=1395503&r2=1395504&view=diff ============================================================================== --- stanbol/trunk/ontologymanager/registry/pom.xml (original) +++ stanbol/trunk/ontologymanager/registry/pom.xml Mon Oct 8 10:25:06 2012 @@ -103,16 +103,20 @@ <version>0.10.0-SNAPSHOT</version> </dependency> - <!-- for testing --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <!-- for testing --> <dependency> <groupId>org.apache.clerezza</groupId> <artifactId>rdf.simple.storage</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + </dependency> </dependencies> Modified: stanbol/trunk/ontologymanager/sources/clerezza/pom.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/sources/clerezza/pom.xml?rev=1395504&r1=1395503&r2=1395504&view=diff ============================================================================== --- stanbol/trunk/ontologymanager/sources/clerezza/pom.xml (original) +++ stanbol/trunk/ontologymanager/sources/clerezza/pom.xml Mon Oct 8 10:25:06 2012 @@ -50,11 +50,11 @@ <extensions>true</extensions> <configuration> <instructions> - <Bundle-Activator/> + <Bundle-Activator /> <Bundle-ClassPath>.</Bundle-ClassPath> <Export-Package> - org.apache.stanbol.ontologymanager.ontonet.io.*, <!-- DEPRECATED --> - org.apache.stanbol.ontologymanager.sources.clerezza.*;version=${project.version} + org.apache.stanbol.ontologymanager.ontonet.io.*, <!-- DEPRECATED --> + org.apache.stanbol.ontologymanager.sources.clerezza.*;version=${project.version} </Export-Package> <Import-Package> org.apache.clerezza.rdf.core.*, @@ -76,7 +76,7 @@ <artifactId>org.apache.stanbol.commons.indexedgraph</artifactId> <version>0.10.0-SNAPSHOT</version> </dependency> - + <!-- Stanbol deps --> <dependency> <groupId>org.apache.stanbol</groupId> @@ -90,6 +90,14 @@ <artifactId>rdf.simple.storage</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + </dependency> </dependencies> Modified: stanbol/trunk/ontologymanager/sources/owlapi/pom.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/sources/owlapi/pom.xml?rev=1395504&r1=1395503&r2=1395504&view=diff ============================================================================== --- stanbol/trunk/ontologymanager/sources/owlapi/pom.xml (original) +++ stanbol/trunk/ontologymanager/sources/owlapi/pom.xml Mon Oct 8 10:25:06 2012 @@ -76,6 +76,16 @@ <version>0.10.0-SNAPSHOT</version> </dependency> + <!-- for testing --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + </dependency> + </dependencies> </project>
