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 2012/10/05 17:35:30 UTC
svn commit: r1394594 [1/9] - in /stanbol/trunk:
commons/authentication.basic/ commons/security/ contrib/reengineer/base/
contrib/reengineer/db/
contrib/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/
contrib/reengineer/db/src/test/java/or...
Author: alexdma
Date: Fri Oct 5 15:35:22 2012
New Revision: 1394594
URL: http://svn.apache.org/viewvc?rev=1394594&view=rev
Log:
First big batch of renaming to get rid of the ontonet name in STANBOL-672. Probably due to a bug in svnX, it's not allowing me to commit directories that I moved earlier with svn mv. Will do the remainder in the next commit.
Added:
stanbol/trunk/ontologymanager/generic/
stanbol/trunk/ontologymanager/multiplexer/
stanbol/trunk/ontologymanager/multiplexer/clerezza/ (with props)
stanbol/trunk/ontologymanager/multiplexer/clerezza/pom.xml
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/license/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/license/THIRD-PARTY.properties
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/ClerezzaCollectorFactory.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/MGraphMultiplexer.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/AbstractOntologyCollectorImpl.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/AbstractOntologySpaceImpl.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/CoreSpaceImpl.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/CustomSpaceImpl.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/ScopeImpl.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/impl/SessionImpl.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/ClerezzaOWLUtils.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/ClerezzaOntologyProvider.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/MetaGraphManager.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/SessionManagerImpl.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/resources/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/Constants.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/Locations.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/MockOsgiContext.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/StructureTest.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/TestOntologyCollectors.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/TestOntologyNetworkPersistence.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/io/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/io/TestStorage.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/TestClerezzaProvider.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/TestOntologyReconciliation.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/scope/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/scope/TestAxiomInterpretation.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/scope/TestClerezzaSpaces.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/scope/TestOntologySpaces.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/TestSessions.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/log4j.properties
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/ontologies/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/ontologies/characters_all.owl
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/ontologies/droppedcharacters.owl
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/ontologies/imports-disconnected/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/ontologies/imports-disconnected/abox.owl
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/ontologies/imports-disconnected/tbox.owl
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/ontologies/maincharacters.owl
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/ontologies/minorcharacters.owl
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/ontologies/mockfoaf.rdf
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/ontologies/nameless_ontology.owl
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/ontologies/naming/
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/ontologies/naming/named-1.owl
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/ontologies/naming/named-2.owl
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/ontologies/naming/versionedonly.owl
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/ontologies/nonexistentcharacters.owl
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/ontologies/test1.owl
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/ontologies/versiontest_v1.owl
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/resources/ontologies/versiontest_v2.owl
stanbol/trunk/ontologymanager/sources/
stanbol/trunk/ontologymanager/sources/clerezza/ (with props)
stanbol/trunk/ontologymanager/sources/clerezza/pom.xml
stanbol/trunk/ontologymanager/sources/clerezza/src/
stanbol/trunk/ontologymanager/sources/clerezza/src/license/
stanbol/trunk/ontologymanager/sources/clerezza/src/license/THIRD-PARTY.properties
stanbol/trunk/ontologymanager/sources/clerezza/src/main/
stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/
stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/
stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/
stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/
stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/
stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/ontonet/
stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/
stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/
stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/AbstractClerezzaGraphInputSource.java
stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/GraphContentInputSource.java
stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/GraphSource.java
stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/sources/
stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/sources/clerezza/
stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/sources/clerezza/AbstractClerezzaGraphInputSource.java
stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/sources/clerezza/GraphContentInputSource.java
stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/sources/clerezza/GraphSource.java
stanbol/trunk/ontologymanager/sources/clerezza/src/test/
stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/
stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/
stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/
stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/
stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/
stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/
stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/
stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/Locations.java
stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/MockOsgiContext.java
stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/TestClerezzaInputSources.java
stanbol/trunk/ontologymanager/sources/clerezza/src/test/resources/
stanbol/trunk/ontologymanager/sources/clerezza/src/test/resources/ontologies/
stanbol/trunk/ontologymanager/sources/clerezza/src/test/resources/ontologies/characters_all.owl
stanbol/trunk/ontologymanager/sources/clerezza/src/test/resources/ontologies/maincharacters.owl
stanbol/trunk/ontologymanager/sources/clerezza/src/test/resources/ontologies/minorcharacters.owl
stanbol/trunk/ontologymanager/sources/owlapi/ (with props)
stanbol/trunk/ontologymanager/sources/owlapi/pom.xml
stanbol/trunk/ontologymanager/sources/owlapi/src/
stanbol/trunk/ontologymanager/sources/owlapi/src/license/
stanbol/trunk/ontologymanager/sources/owlapi/src/license/THIRD-PARTY.properties
stanbol/trunk/ontologymanager/sources/owlapi/src/main/
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/AbstractOWLOntologyInputSource.java
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/BlankOntologySource.java
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyContentInputSource.java
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologySpaceSource.java
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/ParentPathInputSource.java
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/RootOntologyIRISource.java
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/RootOntologySource.java
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/util/
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/util/OntologyImportUtils.java
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/sources/
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/sources/owlapi/
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/sources/owlapi/AbstractOWLOntologyInputSource.java
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/sources/owlapi/BlankOntologySource.java
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/sources/owlapi/OntologyContentInputSource.java
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/sources/owlapi/OntologySpaceSource.java
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/sources/owlapi/ParentPathInputSource.java
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/sources/owlapi/RootOntologyIRISource.java
stanbol/trunk/ontologymanager/sources/owlapi/src/main/java/org/apache/stanbol/ontologymanager/sources/owlapi/RootOntologySource.java
stanbol/trunk/ontologymanager/sources/owlapi/src/test/
stanbol/trunk/ontologymanager/sources/owlapi/src/test/java/
stanbol/trunk/ontologymanager/sources/owlapi/src/test/java/org/
stanbol/trunk/ontologymanager/sources/owlapi/src/test/java/org/apache/
stanbol/trunk/ontologymanager/sources/owlapi/src/test/java/org/apache/stanbol/
stanbol/trunk/ontologymanager/sources/owlapi/src/test/java/org/apache/stanbol/ontologymanager/
stanbol/trunk/ontologymanager/sources/owlapi/src/test/java/org/apache/stanbol/ontologymanager/sources/
stanbol/trunk/ontologymanager/sources/owlapi/src/test/java/org/apache/stanbol/ontologymanager/sources/owlapi/
stanbol/trunk/ontologymanager/sources/owlapi/src/test/java/org/apache/stanbol/ontologymanager/sources/owlapi/Constants.java
stanbol/trunk/ontologymanager/sources/owlapi/src/test/java/org/apache/stanbol/ontologymanager/sources/owlapi/TestOWLAPIInputSources.java
stanbol/trunk/ontologymanager/sources/owlapi/src/test/resources/
stanbol/trunk/ontologymanager/sources/owlapi/src/test/resources/ontologies/
stanbol/trunk/ontologymanager/sources/owlapi/src/test/resources/ontologies/maincharacters.owl
stanbol/trunk/ontologymanager/sources/owlapi/src/test/resources/ontologies/mockfoaf.rdf
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeManagerResource.java
- copied, changed from r1393978, stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntologyNetworkResource.java
stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ScopeManagerResource/
- copied from r1393978, stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/OntologyNetworkResource/
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntologyManagerInputProvider.java
- copied, changed from r1394426, stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntonetInputProvider.java
Removed:
stanbol/trunk/commons/authentication.basic/.classpath
stanbol/trunk/commons/authentication.basic/.project
stanbol/trunk/commons/security/.classpath
stanbol/trunk/commons/security/.project
stanbol/trunk/ontologymanager/ontonet/
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntologyNetworkResource.java
stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/OntologyNetworkResource/
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntonetInputProvider.java
Modified:
stanbol/trunk/contrib/reengineer/base/pom.xml
stanbol/trunk/contrib/reengineer/db/pom.xml
stanbol/trunk/contrib/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java
stanbol/trunk/contrib/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java
stanbol/trunk/contrib/reengineer/web/pom.xml
stanbol/trunk/contrib/reengineer/xml/pom.xml
stanbol/trunk/contrib/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java
stanbol/trunk/contrib/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java
stanbol/trunk/enhancer/engines/refactor/pom.xml
stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java
stanbol/trunk/enhancer/engines/uimalocal-template/ (props changed)
stanbol/trunk/enhancer/engines/uimaremote/ (props changed)
stanbol/trunk/enhancer/engines/uimatotriples/ (props changed)
stanbol/trunk/ontologymanager/bundlelist/src/main/bundles/list.xml
stanbol/trunk/ontologymanager/pom.xml
stanbol/trunk/ontologymanager/registry/pom.xml
stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/api/RegistryManager.java
stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/api/model/Library.java
stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/api/model/RegistryOntology.java
stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/RegistryItemFactoryImpl.java
stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/RegistryManagerImpl.java
stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/model/LibraryImpl.java
stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/io/LibrarySource.java
stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyLibrary.java
stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyRegistry.java
stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestRegistryManager.java
stanbol/trunk/ontologymanager/web/pom.xml
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerWebFragment.java
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/AbstractOntologyAccessResource.java
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource.java
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyPrettyPrintResource.java
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyStatsResource.java
stanbol/trunk/reasoners/web/pom.xml
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/impl/RESTInputFactory.java
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
stanbol/trunk/rules/manager/pom.xml
stanbol/trunk/rules/web/pom.xml
Modified: stanbol/trunk/contrib/reengineer/base/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/contrib/reengineer/base/pom.xml?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/contrib/reengineer/base/pom.xml (original)
+++ stanbol/trunk/contrib/reengineer/base/pom.xml Fri Oct 5 15:35:22 2012
@@ -82,15 +82,15 @@
<!-- Stanbol deps -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
+ <artifactId>org.apache.stanbol.commons.owl</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.owl</artifactId>
+ <artifactId>org.apache.stanbol.ontologymanager.servicesapi</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
-
+
<!-- OSGi deps -->
<dependency>
<groupId>org.apache.felix</groupId>
Modified: stanbol/trunk/contrib/reengineer/db/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/contrib/reengineer/db/pom.xml?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/contrib/reengineer/db/pom.xml (original)
+++ stanbol/trunk/contrib/reengineer/db/pom.xml Fri Oct 5 15:35:22 2012
@@ -84,15 +84,21 @@
</build>
<dependencies>
+
<!-- Stanbol deps -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
+ <artifactId>org.apache.stanbol.commons.owl</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.owl</artifactId>
+ <artifactId>org.apache.stanbol.ontologymanager.servicesapi</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.sources.owlapi</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -167,6 +173,12 @@
<artifactId>rdf.simple.storage</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.multiplexer.clerezza</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: stanbol/trunk/contrib/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/contrib/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/contrib/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java (original)
+++ stanbol/trunk/contrib/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java Fri Oct 5 15:35:22 2012
@@ -12,10 +12,11 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.collector.DuplicateIDException;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
-import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.DuplicateIDException;
+import org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.Scope;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager;
+import org.apache.stanbol.ontologymanager.sources.owlapi.RootOntologyIRISource;
import org.apache.stanbol.reengineer.base.api.DataSource;
import org.apache.stanbol.reengineer.base.api.Reengineer;
import org.apache.stanbol.reengineer.base.api.ReengineerManager;
@@ -88,7 +89,7 @@ public class DBExtractor implements Reen
private final Logger log = LoggerFactory.getLogger(getClass());
@Reference
- ONManager onManager;
+ ScopeManager onManager;
@Reference
ReengineerManager reengineeringManager;
@@ -98,15 +99,15 @@ public class DBExtractor implements Reen
private IRI reengineeringSpaceIRI;
MGraph schemaGraph;
- protected OntologyScope scope;
+ protected Scope scope;
/**
* This default constructor is <b>only</b> intended to be used by the OSGI environment with Service
* Component Runtime support.
* <p>
* DO NOT USE to manually create instances - the DBExtractor instances do need to be configured! YOU NEED
- * TO USE {@link #DBExtractor(ONManager)} or its overloads, to parse the configuration and then initialise
- * the rule store if running outside a OSGI environment.
+ * TO USE {@link #DBExtractor(ScopeManager)} or its overloads, to parse the configuration and then
+ * initialise the rule store if running outside a OSGI environment.
*/
public DBExtractor() {
@@ -118,7 +119,7 @@ public class DBExtractor implements Reen
*
*/
public DBExtractor(ReengineerManager reengineeringManager,
- ONManager onManager,
+ ScopeManager onManager,
TcManager tcManager,
WeightedTcProvider weightedTcProvider,
Dictionary<String,Object> configuration) {
@@ -139,7 +140,7 @@ public class DBExtractor implements Reen
* {@link ConnectionSettings}
*/
public DBExtractor(ReengineerManager reengineeringManager,
- ONManager onManager,
+ ScopeManager onManager,
TcManager tcManager,
WeightedTcProvider weightedTcProvider,
Dictionary<String,Object> configuration,
@@ -198,7 +199,7 @@ public class DBExtractor implements Reen
log.info("Ontology {} created.", iri);
scope = onManager.createOntologyScope(reengineeringScopeID,
- new RootOntologyIRISource(IRI.create(DBS_L1.URI)));
+ (OntologyInputSource<?>) new RootOntologyIRISource(IRI.create(DBS_L1.URI)));
// scope.setUp();
@@ -267,7 +268,7 @@ public class DBExtractor implements Reen
return ReengineerType.RDB;
}
- private OntologyScope getScope() {
+ private Scope getScope() {
if (onManager.isScopeActive(reengineeringScopeID)) return onManager.getScope(reengineeringScopeID);
return null;
}
@@ -299,7 +300,7 @@ public class DBExtractor implements Reen
/*
* Fetch the reengineering scope.
*/
- OntologyScope reengineeringScope = getScope();
+ Scope reengineeringScope = getScope();
if (reengineeringScope != null) {
ConnectionSettings connectionSettings = (ConnectionSettings) dataSource.getDataSource();
DBSchemaGenerator schemaGenerator = new DBSchemaGenerator(outputIRI, connectionSettings);
Modified: stanbol/trunk/contrib/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/contrib/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/contrib/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java (original)
+++ stanbol/trunk/contrib/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java Fri Oct 5 15:35:22 2012
@@ -10,14 +10,14 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.clerezza.rdf.core.sparql.QueryEngine;
import org.apache.clerezza.rdf.jena.sparql.JenaSparqlEngine;
import org.apache.clerezza.rdf.simple.storage.SimpleTcProvider;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.OfflineConfiguration;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyProvider;
-import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologySpaceFactory;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
-import org.apache.stanbol.ontologymanager.ontonet.impl.OfflineConfigurationImpl;
-import org.apache.stanbol.ontologymanager.ontonet.impl.clerezza.ClerezzaOntologyProvider;
-import org.apache.stanbol.ontologymanager.ontonet.impl.clerezza.OntologySpaceFactoryImpl;
+import org.apache.stanbol.ontologymanager.core.OfflineConfigurationImpl;
+import org.apache.stanbol.ontologymanager.core.scope.ScopeManagerImpl;
+import org.apache.stanbol.ontologymanager.multiplexer.clerezza.collector.ClerezzaCollectorFactory;
+import org.apache.stanbol.ontologymanager.multiplexer.clerezza.ontology.ClerezzaOntologyProvider;
+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.reengineer.base.impl.ReengineerManagerImpl;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -28,7 +28,7 @@ public class DBExtractorTest {
static DBExtractor dbExtractor;
static String graphNS;
- static ONManager onManager;
+ static ScopeManager onManager;
static IRI outputIRI;
@BeforeClass
@@ -51,9 +51,9 @@ public class DBExtractorTest {
new Parser());
// Two different ontology storages, the same sparql engine and tcprovider
- OntologySpaceFactory sf = new OntologySpaceFactoryImpl(ontologyProvider, emptyConf);
+ PersistentCollectorFactory sf = new ClerezzaCollectorFactory(ontologyProvider, emptyConf);
- onManager = new ONManagerImpl(ontologyProvider, offline, sf, emptyConf);
+ onManager = new ScopeManagerImpl(ontologyProvider, offline, sf, emptyConf);
dbExtractor = new DBExtractor(new ReengineerManagerImpl(emptyConf), onManager, tcm, wtcp, emptyConf);
graphNS = "http://kres.iks-project.eu/reengineering/test";
outputIRI = IRI.create(graphNS);
Modified: stanbol/trunk/contrib/reengineer/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/contrib/reengineer/web/pom.xml?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/contrib/reengineer/web/pom.xml (original)
+++ stanbol/trunk/contrib/reengineer/web/pom.xml Fri Oct 5 15:35:22 2012
@@ -85,7 +85,7 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
+ <artifactId>org.apache.stanbol.ontologymanager.servicesapi</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
Modified: stanbol/trunk/contrib/reengineer/xml/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/contrib/reengineer/xml/pom.xml?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/contrib/reengineer/xml/pom.xml (original)
+++ stanbol/trunk/contrib/reengineer/xml/pom.xml Fri Oct 5 15:35:22 2012
@@ -91,12 +91,17 @@
<!-- Stanbol deps -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
+ <artifactId>org.apache.stanbol.commons.owl</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.owl</artifactId>
+ <artifactId>org.apache.stanbol.ontologymanager.servicesapi</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.sources.owlapi</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -171,6 +176,18 @@
<artifactId>rdf.simple.storage</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.core</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.multiplexer.clerezza</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified: stanbol/trunk/contrib/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/contrib/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/contrib/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java (original)
+++ stanbol/trunk/contrib/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java Fri Oct 5 15:35:22 2012
@@ -38,11 +38,11 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.commons.owl.OWLOntologyManagerFactory;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.collector.DuplicateIDException;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
-import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.DuplicateIDException;
+import org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.Scope;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager;
+import org.apache.stanbol.ontologymanager.sources.owlapi.RootOntologyIRISource;
import org.apache.stanbol.reengineer.base.api.DataSource;
import org.apache.stanbol.reengineer.base.api.Reengineer;
import org.apache.stanbol.reengineer.base.api.ReengineerManager;
@@ -109,12 +109,12 @@ public class XMLExtractor extends Reengi
public final Logger log = LoggerFactory.getLogger(getClass());
@Reference
- ONManager onManager;
+ ScopeManager onManager;
@Reference
ReengineerManager reengineeringManager;
- private OntologyScope scope;
+ private Scope scope;
private String scopeID;
/**
@@ -122,13 +122,13 @@ public class XMLExtractor extends Reengi
* Component Runtime support.
* <p>
* DO NOT USE to manually create instances - the XMLExtractor instances do need to be configured! YOU NEED
- * TO USE {@link #XMLExtractor(ONManager)} or its overloads, to parse the configuration and then
+ * TO USE {@link #XMLExtractor(ScopeManager)} or its overloads, to parse the configuration and then
* initialise the rule store if running outside a OSGI environment.
*/
public XMLExtractor() {}
public XMLExtractor(ReengineerManager reengineeringManager,
- ONManager onManager,
+ ScopeManager onManager,
Dictionary<String,Object> configuration) {
this();
this.reengineeringManager = reengineeringManager;
Modified: stanbol/trunk/contrib/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/contrib/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/contrib/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java (original)
+++ stanbol/trunk/contrib/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java Fri Oct 5 15:35:22 2012
@@ -29,13 +29,13 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.clerezza.rdf.core.sparql.QueryEngine;
import org.apache.clerezza.rdf.jena.sparql.JenaSparqlEngine;
import org.apache.clerezza.rdf.simple.storage.SimpleTcProvider;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.OfflineConfiguration;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyProvider;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
-import org.apache.stanbol.ontologymanager.ontonet.impl.OfflineConfigurationImpl;
-import org.apache.stanbol.ontologymanager.ontonet.impl.clerezza.ClerezzaOntologyProvider;
-import org.apache.stanbol.ontologymanager.ontonet.impl.clerezza.OntologySpaceFactoryImpl;
+import org.apache.stanbol.ontologymanager.core.OfflineConfigurationImpl;
+import org.apache.stanbol.ontologymanager.core.scope.ScopeManagerImpl;
+import org.apache.stanbol.ontologymanager.multiplexer.clerezza.collector.ClerezzaCollectorFactory;
+import org.apache.stanbol.ontologymanager.multiplexer.clerezza.ontology.ClerezzaOntologyProvider;
+import org.apache.stanbol.ontologymanager.servicesapi.OfflineConfiguration;
+import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyProvider;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager;
import org.apache.stanbol.reengineer.base.api.DataSource;
import org.apache.stanbol.reengineer.base.api.Reengineer;
import org.apache.stanbol.reengineer.base.api.util.ReengineerType;
@@ -127,8 +127,8 @@ public class XMLReengineerTest {
// Two different ontology storages, the same sparql engine and tcprovider
OntologyProvider<TcProvider> provider = new ClerezzaOntologyProvider(tcm, offline, new Parser());
- ONManager onManager = new ONManagerImpl(provider, offline, new OntologySpaceFactoryImpl(provider,
- emptyConf), emptyConf);
+ ScopeManager onManager = new ScopeManagerImpl(provider, offline, new ClerezzaCollectorFactory(
+ provider, emptyConf), emptyConf);
xmlExtractor = new XMLExtractor(new ReengineerManagerImpl(emptyConf), onManager, emptyConf);
}
Modified: stanbol/trunk/enhancer/engines/refactor/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/refactor/pom.xml?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/enhancer/engines/refactor/pom.xml (original)
+++ stanbol/trunk/enhancer/engines/refactor/pom.xml Fri Oct 5 15:35:22 2012
@@ -96,6 +96,7 @@
</dependency>
<!-- KReS dependencies -->
+ <!--
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
@@ -119,6 +120,7 @@
</exclusion>
</exclusions>
</dependency>
+ -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.owl</artifactId>
@@ -127,6 +129,21 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.servicesapi</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.sources.clerezza</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.sources.owlapi</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.base</artifactId>
<version>0.10.0-SNAPSHOT</version>
<scope>provided</scope>
@@ -134,7 +151,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.manager</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java (original)
+++ stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java Fri Oct 5 15:35:22 2012
@@ -58,20 +58,20 @@ import org.apache.stanbol.entityhub.mode
import org.apache.stanbol.entityhub.model.clerezza.RdfValueFactory;
import org.apache.stanbol.entityhub.servicesapi.model.Entity;
import org.apache.stanbol.entityhub.servicesapi.site.SiteManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.collector.DuplicateIDException;
-import org.apache.stanbol.ontologymanager.ontonet.api.collector.UnmodifiableOntologyCollectorException;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.GraphContentInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.GraphSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.Origin;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyProvider;
-import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope;
-import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologySpace;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionLimitException;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.DuplicateIDException;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.UnmodifiableOntologyCollectorException;
+import org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.servicesapi.io.Origin;
+import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyProvider;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.Scope;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager;
+import org.apache.stanbol.ontologymanager.servicesapi.session.Session;
+import org.apache.stanbol.ontologymanager.servicesapi.session.SessionLimitException;
+import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager;
+import org.apache.stanbol.ontologymanager.sources.clerezza.GraphContentInputSource;
+import org.apache.stanbol.ontologymanager.sources.clerezza.GraphSource;
+import org.apache.stanbol.ontologymanager.sources.owlapi.RootOntologyIRISource;
import org.apache.stanbol.rules.base.api.AlreadyExistingRecipeException;
import org.apache.stanbol.rules.base.api.NoSuchRecipeException;
import org.apache.stanbol.rules.base.api.Recipe;
@@ -160,7 +160,7 @@ public class RefactorEnhancementEngine e
private final Logger log = LoggerFactory.getLogger(getClass());
@Reference
- ONManager onManager;
+ ScopeManager onManager;
@Reference
OntologyProvider<TcProvider> ontologyProvider;
@@ -176,7 +176,7 @@ public class RefactorEnhancementEngine e
@Reference
RuleStore ruleStore;
- private OntologyScope scope;
+ private Scope scope;
@Reference
SessionManager sessionManager;
@@ -496,7 +496,7 @@ public class RefactorEnhancementEngine e
for (String s : failed)
log.info(" >> {} : FAILED", s);
ontologySpace.setUp();
- if (!onManager.containsScope(scopeId)) onManager.registerScope(scope);
+ // if (!onManager.containsScope(scopeId)) onManager.registerScope(scope);
onManager.setScopeActive(scopeId, true);
/*
Propchange: stanbol/trunk/enhancer/engines/uimalocal-template/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Oct 5 15:35:22 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Propchange: stanbol/trunk/enhancer/engines/uimaremote/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Oct 5 15:35:22 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Propchange: stanbol/trunk/enhancer/engines/uimatotriples/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Oct 5 15:35:22 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Modified: stanbol/trunk/ontologymanager/bundlelist/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/bundlelist/src/main/bundles/list.xml?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/bundlelist/src/main/bundles/list.xml (original)
+++ stanbol/trunk/ontologymanager/bundlelist/src/main/bundles/list.xml Fri Oct 5 15:35:22 2012
@@ -17,10 +17,25 @@
-->
<bundles>
+
+ <startLevel level="31">
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.servicesapi</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </bundle>
+ </startLevel>
+
<startLevel level="32">
+
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.core</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
+ <artifactId>org.apache.stanbol.ontologymanager.multiplexer.clerezza</artifactId>
<version>0.10.0-SNAPSHOT</version>
</bundle>
<bundle>
@@ -30,8 +45,19 @@
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.sources.clerezza</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.sources.owlapi</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.web</artifactId>
<version>0.10.0-SNAPSHOT</version>
</bundle>
+
</startLevel>
</bundles>
\ No newline at end of file
Propchange: stanbol/trunk/ontologymanager/multiplexer/clerezza/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 5 15:35:22 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added: stanbol/trunk/ontologymanager/multiplexer/clerezza/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/pom.xml?rev=1394594&view=auto
==============================================================================
--- stanbol/trunk/ontologymanager/multiplexer/clerezza/pom.xml (added)
+++ stanbol/trunk/ontologymanager/multiplexer/clerezza/pom.xml Fri Oct 5 15:35:22 2012
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<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">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>stanbol-parent</artifactId>
+ <version>2-SNAPSHOT</version>
+ <relativePath>../../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.multiplexer.clerezza</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Stanbol Ontology Manager : Network Multiplexer (Clerezza implementation)</name>
+ <description>
+ A Clerezza-based implementation of ontology multiplexing for network construction.
+ </description>
+
+ <inceptionYear>2012</inceptionYear>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-ClassPath>
+ .,
+ OSGI-INF
+ </Bundle-ClassPath>
+ <Bundle-Activator/>
+ <Export-Package>
+ org.apache.stanbol.ontologymanager.ontonet.*, <!-- DEPRECATED -->
+ org.apache.stanbol.ontologymanager.multiplexer.clerezza.collector;version=${project.version},
+ org.apache.stanbol.ontologymanager.multiplexer.clerezza.ontology;version=${project.version},
+ org.apache.stanbol.ontologymanager.multiplexer.clerezza.session;version=${project.version}
+ </Export-Package>
+ <Import-Package>
+ org.osgi.*,
+ org.slf4j.*,
+ *
+ </Import-Package>
+ <Private-Package>
+ org.apache.stanbol.ontologymanager.multiplexer.clerezza.impl;version=${project.version}
+ </Private-Package>
+ <_nouses>true</_nouses>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <!-- Stanbol commons -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.stanboltools.offline</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Stanbol deps -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.core</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.servicesapi</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.sources.clerezza</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.sources.owlapi</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- for testing -->
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.simple.storage</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.utils</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+
+ </dependencies>
+
+</project>
Added: stanbol/trunk/ontologymanager/multiplexer/clerezza/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/src/license/THIRD-PARTY.properties?rev=1394594&view=auto
==============================================================================
--- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/license/THIRD-PARTY.properties (added)
+++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/license/THIRD-PARTY.properties Fri Oct 5 15:35:22 2012
@@ -0,0 +1,26 @@
+# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - Apache 2
+# - Apache License
+# - BSD
+# - BSD-style license
+# - CDDL 1.1
+# - Common Development and Distribution License (CDDL) v1.0
+# - Common Public License Version 1.0
+# - GPL2 w/ CPE
+# - ICU License
+# - MIT License
+# - The Apache Software License, Version 2.0
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Wed Feb 15 19:05:02 CET 2012
+asm--asm--3.1=BSD License
+javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
+org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
+org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
+owlapi--owlapi--3.2.3=The Apache Software License, Version 2.0
+xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0
Added: 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=1394594&view=auto
==============================================================================
--- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/ClerezzaCollectorFactory.java (added)
+++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/collector/ClerezzaCollectorFactory.java Fri Oct 5 15:35:22 2012
@@ -0,0 +1,228 @@
+/*
+ * 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.multiplexer.clerezza.collector;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Dictionary;
+import java.util.HashSet;
+
+import org.apache.clerezza.rdf.core.access.TcProvider;
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.ontologymanager.multiplexer.clerezza.impl.CoreSpaceImpl;
+import org.apache.stanbol.ontologymanager.multiplexer.clerezza.impl.CustomSpaceImpl;
+import org.apache.stanbol.ontologymanager.multiplexer.clerezza.impl.ScopeImpl;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.DuplicateIDException;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.OntologyCollectorListener;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.UnmodifiableOntologyCollectorException;
+import org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource;
+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.Scope;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeEventListener;
+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.
+ *
+ * @author alexdma
+ *
+ */
+@Component(immediate = true, metatype = false)
+@Service(PersistentCollectorFactory.class)
+public class ClerezzaCollectorFactory implements PersistentCollectorFactory {
+
+ protected Collection<ScopeEventListener> listeners;
+
+ protected Logger log = LoggerFactory.getLogger(getClass());
+
+ protected IRI namespace;
+
+ @Reference
+ private OntologyProvider<TcProvider> ontologyProvider;
+
+ public ClerezzaCollectorFactory() {
+ listeners = new HashSet<ScopeEventListener>();
+ }
+
+ public ClerezzaCollectorFactory(OntologyProvider<TcProvider> provider,
+ Dictionary<String,Object> configuration) {
+ this();
+ this.ontologyProvider = provider;
+ try {
+ activate(configuration);
+ } catch (IOException e) {
+ log.error("Unable to access servlet context.", e);
+ }
+ }
+
+ /**
+ * Used to configure an instance within an OSGi container.
+ *
+ * @throws IOException
+ */
+ @SuppressWarnings("unchecked")
+ @Activate
+ protected void activate(ComponentContext context) throws IOException {
+ log.info("in " + ClerezzaCollectorFactory.class + " activate with context " + context);
+ if (context == null) {
+ throw new IllegalStateException("No valid" + ComponentContext.class + " parsed in activate!");
+ }
+ activate((Dictionary<String,Object>) context.getProperties());
+ }
+
+ /**
+ * Called within both OSGi and non-OSGi environments.
+ *
+ * @param configuration
+ * @throws IOException
+ */
+ protected void activate(Dictionary<String,Object> configuration) throws IOException {
+ log.debug(ClerezzaCollectorFactory.class + " activated.");
+ }
+
+ @Override
+ public void addScopeEventListener(ScopeEventListener listener) {
+ listeners.add(listener);
+ }
+
+ @Override
+ public void clearScopeEventListeners() {
+ listeners.clear();
+ }
+
+ private void configureSpace(OntologySpace s, String scopeID) {
+ // Make sure someone is listening to ontology additions before core ontologies are added.
+ if (ontologyProvider instanceof OntologyCollectorListener) s
+ .addOntologyCollectorListener((OntologyCollectorListener) ontologyProvider);
+ else s.addOntologyCollectorListener(ontologyProvider.getOntologyNetworkDescriptor());
+ // s.setUp();
+ }
+
+ /**
+ * Utility method for configuring ontology spaces after creating them.
+ *
+ * @param s
+ * @param scopeID
+ * @param rootSource
+ */
+ private void configureSpace(OntologySpace s, String scopeID, OntologyInputSource<?>... ontologySources) {
+ configureSpace(s, scopeID);
+ if (ontologySources != null) try {
+ for (OntologyInputSource<?> src : ontologySources)
+ s.addOntology(src);
+ } catch (UnmodifiableOntologyCollectorException e) {
+ log.error("Ontology space " + s.getID() + " was found locked at creation time!", e);
+ }
+ // s.setUp();
+ }
+
+ @Override
+ public OntologySpace createCoreOntologySpace(String scopeId, OntologyInputSource<?>... coreSources) {
+ OntologySpace s = new CoreSpaceImpl(scopeId, namespace, ontologyProvider);
+ configureSpace(s, scopeId, coreSources);
+ return s;
+ }
+
+ @Override
+ public OntologySpace createCustomOntologySpace(String scopeId, OntologyInputSource<?>... customSources) {
+ OntologySpace s = new CustomSpaceImpl(scopeId, namespace, ontologyProvider);
+ configureSpace(s, scopeId, customSources);
+ return s;
+ }
+
+ @Override
+ public Scope createOntologyScope(String scopeID, OntologyInputSource<?>... coreOntologies) throws DuplicateIDException {
+ // Scope constructor also creates core and custom spaces
+ Scope scope = new ScopeImpl(scopeID, getDefaultNamespace(), this, coreOntologies);
+ fireScopeCreated(scope);
+ return scope;
+ }
+
+ @Override
+ public OntologySpace createOntologySpace(String scopeId,
+ SpaceType type,
+ OntologyInputSource<?>... ontologySources) {
+ switch (type) {
+ case CORE:
+ return createCoreOntologySpace(scopeId, ontologySources);
+ case CUSTOM:
+ return createCustomOntologySpace(scopeId, ontologySources);
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Deactivation of the ONManagerImpl resets all its resources.
+ */
+ @Deactivate
+ protected void deactivate(ComponentContext context) {
+ namespace = null;
+ log.info("in " + ClerezzaCollectorFactory.class + " deactivate with context " + context);
+ }
+
+ protected void fireScopeCreated(Scope scope) {
+ for (ScopeEventListener l : listeners)
+ l.scopeCreated(scope);
+ }
+
+ @Override
+ public IRI getDefaultNamespace() {
+ return this.namespace;
+ }
+
+ @Override
+ public String getID() {
+ return this.toString();
+ }
+
+ @Override
+ public IRI getNamespace() {
+ return getDefaultNamespace();
+ }
+
+ @Override
+ public Collection<ScopeEventListener> getScopeEventListeners() {
+ return listeners;
+ }
+
+ @Override
+ public void removeScopeEventListener(ScopeEventListener listener) {
+ listeners.remove(listener);
+ }
+
+ @Override
+ public void setDefaultNamespace(IRI namespace) {
+ this.namespace = namespace;
+ }
+
+ @Override
+ public void setNamespace(IRI namespace) {
+ setDefaultNamespace(namespace);
+ }
+
+}