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 2011/10/17 09:43:19 UTC
svn commit: r1185032 [1/4] - in /incubator/stanbol/trunk:
commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/format/
enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/
explanation/core/ explanation/cor...
Author: alexdma
Date: Mon Oct 17 07:43:15 2011
New Revision: 1185032
URL: http://svn.apache.org/viewvc?rev=1185032&view=rev
Log:
- Sessions are also identified with plain strings (though at present they are String forms of IRIs) (STANBOL-196 STANBOL-247)
- Session spaces are deprecated and so are the factory methods for creating them (STANBOL-247)
- Added ontology management method to Session APIs (TODO implement) (STANBOL-247)
- First alternative implementation of ontology spaces (sans session) in Clerezza (STANBOL-332)
- Refactored API usage in Stanbol according to the changes above.
TODO : also use Clerezza natively in ontologymanager/registry (STANBOL-285)
Added:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/AbstractOWLOntologyInputSource.java
- copied, changed from r1181018, incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/AbstractOntologyInputSource.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/GraphSource.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologySpaceSource.java
- copied, changed from r1181018, incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/ScopeOntologySource.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyCollectorListener.java
- copied, changed from r1184794, incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceListener.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyCollectorModificationException.java
- copied, changed from r1184794, incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceModificationException.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/UnmodifiableOntologyCollectorException.java
- copied, changed from r1184794, incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/UnmodifiableOntologySpaceException.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestOWLAPIInputSources.java
- copied, changed from r1181018, incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestOntologyInputSources.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java
- copied, changed from r1181018, incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RootResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntologyIndexResource.java
- copied, changed from r1181018, incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMOntResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntologyNetworkResource.java
- copied, changed from r1181018, incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeOntologyResource.java
- copied, changed from r1181018, incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java
- copied, changed from r1181018, incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionByIdResource.java
- copied, changed from r1181018, incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionIDResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionsResource.java
- copied, changed from r1181018, incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/StoredGraphsResource.java
- copied, changed from r1181018, incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/GraphsResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource/
- copied from r1181018, incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/OntologyNetworkResource/
- copied from r1181018, incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionsResource/
- copied from r1181018, incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/
Removed:
incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/util/OntoNetSimulator.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/AbstractOntologyInputSource.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/ScopeOntologySource.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceListener.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceModificationException.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/UnmodifiableOntologySpaceException.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestOntologyInputSources.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/GraphsResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/NavigationMixin.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMOntResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RESTfulResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RootResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionIDResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/
Modified:
incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/format/KRFormat.java
incubator/stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java
incubator/stanbol/trunk/explanation/core/pom.xml
incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Configuration.java
incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Explainable.java
incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Explanation.java
incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/ExplanationGenerator.java
incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/InteractionPatterns.java
incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Schema.java
incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/SchemaCatalog.java
incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/SchemaMatcher.java
incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/heuristics/Matcher.java
incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/heuristics/OrganizationalHierarchyComparator.java
incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/impl/ClerezzaSchemaMatcherImpl.java
incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/impl/SchemaCatalogImpl.java
incubator/stanbol/trunk/explanation/core/src/test/java/org/apache/stanbol/explanation/MockOsgiContext.java
incubator/stanbol/trunk/explanation/core/src/test/java/org/apache/stanbol/explanation/impl/TestSchemaMatchers.java
incubator/stanbol/trunk/ontologymanager/ontonet/pom.xml
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/BlankOntologySource.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/ParentPathInputSource.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/RootOntologyIRISource.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/RootOntologySource.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/CoreOntologySpace.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/CustomOntologySpace.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/IrremovableOntologyException.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/MissingOntologyException.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/NoSuchScopeException.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OWLOntologyManagerFactory.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyIndex.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyScope.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyScopeFactory.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpace.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceEvent.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceFactory.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeEventListener.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeOntologyListenable.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeRegistry.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/SessionOntologySpace.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/DuplicateSessionIDException.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/NonReferenceableSessionException.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/Session.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionEvent.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionIDGenerator.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListener.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/conf/OntologyNetworkConfigurationUtils.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/ClerezzaOntologyStorage.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/InMemoryOntologyStorage.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/OWLOntologyManagerFactoryImpl.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyScopeFactoryImpl.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyScopeImpl.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologySpaceFactoryImpl.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/ScopeRegistryImpl.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/SessionOntologySpaceImpl.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/renderers/ScopeSetRenderer.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/renderers/SessionRenderer.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/ScopeSessionSynchronizer.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionImpl.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/TimestampedSessionIDGenerator.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/util/OntologyUtils.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/MockOsgiContext.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestStorage.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestIndexing.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologyScope.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologySpaces.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/RegistryManagerImpl.java
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/model/LibraryImpl.java
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/io/LibrarySource.java
incubator/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyLibrary.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntonetFragment.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyRenderUtils.java
incubator/stanbol/trunk/owl/pom.xml
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/util/OWLUtils.java
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/util/URIUtils.java
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/web/KRFormat.java
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/OntologyStorage.java
incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java
incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java
incubator/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
Modified: incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/format/KRFormat.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/format/KRFormat.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/format/KRFormat.java (original)
+++ incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/format/KRFormat.java Mon Oct 17 07:43:15 2011
@@ -22,7 +22,7 @@ import javax.ws.rs.core.MediaType;
* Additional MIME types for knowledge representation formats.
*
* @author andrea.nuzzolese
- * @author alessandro
+ * @author alexdma
*
*/
public class KRFormat extends MediaType {
Modified: incubator/stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java Mon Oct 17 07:43:15 2011
@@ -54,9 +54,8 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScopeFactory;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceFactory;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologyCollectorException;
import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
import org.apache.stanbol.owl.transformation.OWLAPIToClerezzaConverter;
@@ -167,7 +166,7 @@ public class RefactorEnhancementEngine i
/*
* Now we prepare the OntoNet environment. First we create the OntoNet session in which run the whole
*/
- final IRI sessionIRI = createAndAddSessionSpaceToScope();
+ final String sessionIRI = createAndAddSessionSpaceToScope();
/*
* We retrieve the session space
@@ -236,10 +235,11 @@ public class RefactorEnhancementEngine i
}
@Override
- public Set<OWLOntology> getClosure() {
+ public Set<OWLOntology> getImports(boolean direct) {
// TODO Auto-generated method stub
return null;
}
+
};
sessionSpace.addOntology(ontologySource);
}
@@ -247,7 +247,7 @@ public class RefactorEnhancementEngine i
log.debug("Added " + entityReferenceString + " to the session space of scope "
+ scope.getID().toString(), this);
- } catch (UnmodifiableOntologySpaceException e) {
+ } catch (UnmodifiableOntologyCollectorException e) {
log.error("Cannot load the entity", e);
}
@@ -338,7 +338,7 @@ public class RefactorEnhancementEngine i
/*
* The session needs to be destroyed, as it is no more useful.
*/
- onManager.getSessionManager().destroySession(sessionIRI);
+ onManager.getSessionManager().destroySession(sessionIRI.toString());
} catch (OWLOntologyCreationException e) {
log.error("Cannot create the ontology for the refactoring", e);
@@ -350,7 +350,7 @@ public class RefactorEnhancementEngine i
*
* @return
*/
- private IRI createAndAddSessionSpaceToScope() {
+ private String createAndAddSessionSpaceToScope() {
/*
* Retrieve the session manager
*/
@@ -362,13 +362,13 @@ public class RefactorEnhancementEngine i
* developers to do through the API
*/
Session session = sessionManager.createSession();
- OntologySpaceFactory ontologySpaceFactory = onManager.getOntologySpaceFactory();
- OntologySpace sessionSpace = ontologySpaceFactory.createSessionOntologySpace(scope.getID());
- try {
- scope.addSessionSpace(sessionSpace, session.getID());
- } catch (UnmodifiableOntologySpaceException e) {
- log.error("Failed to add session space to unmodifiable scope " + scope, e);
- }
+ // OntologySpaceFactory ontologySpaceFactory = onManager.getOntologySpaceFactory();
+ // OntologySpace sessionSpace = ontologySpaceFactory.createSessionOntologySpace(scope.getID());
+ // try {
+ // scope.addSessionSpace(sessionSpace, session.getID());
+ // } catch (UnmodifiableOntologySpaceException e) {
+ // log.error("Failed to add session space to unmodifiable scope " + scope, e);
+ // }
/*
* Finally, we return the session ID to be used by the caller
@@ -425,10 +425,11 @@ public class RefactorEnhancementEngine i
}
@Override
- public Set<OWLOntology> getClosure() {
+ public Set<OWLOntology> getImports(boolean direct) {
// TODO Auto-generated method stub
return null;
}
+
};
return ois;
@@ -508,23 +509,24 @@ public class RefactorEnhancementEngine i
}
@Override
- public Set<OWLOntology> getClosure() {
+ public Set<OWLOntology> getImports(boolean direct) {
// TODO Auto-generated method stub
return null;
}
+
};
-// IRI dulcifierScopeIRI = IRI.create((String) context.getProperties().get(SCOPE));
-String scopeId = (String) context.getProperties().get(SCOPE);
-
+ // IRI dulcifierScopeIRI = IRI.create((String) context.getProperties().get(SCOPE));
+ String scopeId = (String) context.getProperties().get(SCOPE);
+
/*
* The scope is created by the ScopeFactory or loaded from the scope registry of KReS
*/
try {
- scope = scopeFactory.createOntologyScope(scopeId/*dulcifierScopeIRI*/, oisbase);
+ scope = scopeFactory.createOntologyScope(scopeId/* dulcifierScopeIRI */, oisbase);
} catch (DuplicateIDException e) {
ScopeRegistry scopeRegistry = onManager.getScopeRegistry();
- scope = scopeRegistry.getScope(scopeId/*dulcifierScopeIRI*/);
+ scope = scopeRegistry.getScope(scopeId/* dulcifierScopeIRI */);
}
/*
@@ -540,7 +542,7 @@ String scopeId = (String) context.getPro
OntologyInputSource ois = oisForScope(coreScopeOntologySet[o]);
try {
ontologySpace.addOntology(ois);
- } catch (UnmodifiableOntologySpaceException ex) {
+ } catch (UnmodifiableOntologyCollectorException ex) {
log.error("Unmodifiable Ontology SpaceException.", ex);
}
}
Modified: incubator/stanbol/trunk/explanation/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/explanation/core/pom.xml?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/explanation/core/pom.xml (original)
+++ incubator/stanbol/trunk/explanation/core/pom.xml Mon Oct 17 07:43:15 2011
@@ -1,20 +1,14 @@
<?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.
--->
+<!-- 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">
@@ -62,7 +56,7 @@
<Data-Files>schemas,schemas/registry</Data-Files>
<Data-Files-Priority>
-100
- </Data-Files-Priority>
+ </Data-Files-Priority>
<_nouses>true</_nouses>
</instructions>
</configuration>
@@ -98,7 +92,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
-
+
<!-- Persistence deps -->
<dependency>
<groupId>org.apache.clerezza</groupId>
@@ -154,17 +148,6 @@
<scope>provided</scope>
</dependency>
- <!-- Diagnostics deps -->
- <dependency> <!-- we use log4j 1.2 -->
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency> <!-- see also the log4j.properties in src/main/resources -->
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>runtime</scope>
- </dependency>
<!-- Testing deps -->
<dependency>
@@ -173,8 +156,23 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.jena.parser</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.jena.serializer</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.rdfjson</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.simple.storage</artifactId>
<scope>test</scope>
</dependency>
Modified: incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Configuration.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Configuration.java (original)
+++ incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Configuration.java Mon Oct 17 07:43:15 2011
@@ -7,7 +7,7 @@ import org.apache.stanbol.ontologymanage
* should be the primary object referenced by service components and passed as an argument to non-default
* constructors.
*
- * @author alessandro
+ * @author alexdma
*
*/
public interface Configuration {
Modified: incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Explainable.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Explainable.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Explainable.java (original)
+++ incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Explainable.java Mon Oct 17 07:43:15 2011
@@ -3,7 +3,7 @@ package org.apache.stanbol.explanation.a
/**
* An umbrella and wrapper type for any object that may be backed up by a user-sensitive explanation.
*
- * @author alessandro
+ * @author alexdma
*
*/
public interface Explainable<T> {
Modified: incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Explanation.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Explanation.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Explanation.java (original)
+++ incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Explanation.java Mon Oct 17 07:43:15 2011
@@ -6,7 +6,7 @@ import java.util.Collection;
* A knowledge object that incorporates a description, or justification, for another knowledge object, be it a
* content item, fact, event or collection thereof.
*
- * @author alessandro
+ * @author alexdma
*
*/
public interface Explanation {
Modified: incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/ExplanationGenerator.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/ExplanationGenerator.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/ExplanationGenerator.java (original)
+++ incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/ExplanationGenerator.java Mon Oct 17 07:43:15 2011
@@ -7,7 +7,7 @@ import org.semanticweb.owlapi.model.OWLA
/**
* A factory for explanation information objects.
*
- * @author alessandro
+ * @author alexdma
*
*/
public interface ExplanationGenerator {
Modified: incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/InteractionPatterns.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/InteractionPatterns.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/InteractionPatterns.java (original)
+++ incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/InteractionPatterns.java Mon Oct 17 07:43:15 2011
@@ -3,7 +3,7 @@ package org.apache.stanbol.explanation.a
/**
* Interaction patterns known or supported for explanation;
*
- * @author alessandro
+ * @author alexdma
*
*/
public enum InteractionPatterns {
Modified: incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Schema.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Schema.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Schema.java (original)
+++ incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/Schema.java Mon Oct 17 07:43:15 2011
@@ -5,7 +5,7 @@ import org.semanticweb.owlapi.model.IRI;
/**
* A cognitive schema, linguistic frame or knowledge pattern.
*
- * @author alessandro
+ * @author alexdma
*
*/
public interface Schema {
Modified: incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/SchemaCatalog.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/SchemaCatalog.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/SchemaCatalog.java (original)
+++ incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/SchemaCatalog.java Mon Oct 17 07:43:15 2011
@@ -8,7 +8,7 @@ import org.semanticweb.owlapi.model.IRI;
* A registry of knowledge schemas to be matched against in order to filter relevant statements for
* explanations.
*
- * @author alessandro
+ * @author alexdma
*
*/
public interface SchemaCatalog {
Modified: incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/SchemaMatcher.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/SchemaMatcher.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/SchemaMatcher.java (original)
+++ incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/api/SchemaMatcher.java Mon Oct 17 07:43:15 2011
@@ -4,7 +4,7 @@ import java.util.Set;
/**
*
- * @author alessandro
+ * @author alexdma
*
* @param <E>
* the entity to be matched against, or <i><explainable/i>
Modified: incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/heuristics/Matcher.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/heuristics/Matcher.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/heuristics/Matcher.java (original)
+++ incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/heuristics/Matcher.java Mon Oct 17 07:43:15 2011
@@ -3,7 +3,7 @@ package org.apache.stanbol.explanation.h
/**
* Any entity that can be compared to another one using Description Logic constructs.
*
- * @author alessandro
+ * @author alexdma
*
*/
public interface Matcher {
Modified: incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/heuristics/OrganizationalHierarchyComparator.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/heuristics/OrganizationalHierarchyComparator.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/heuristics/OrganizationalHierarchyComparator.java (original)
+++ incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/heuristics/OrganizationalHierarchyComparator.java Mon Oct 17 07:43:15 2011
@@ -7,7 +7,7 @@ import org.semanticweb.owlapi.model.OWLI
* Transitive comparator for determining if one social person is another person's boss in a hierarchical
* organization.
*
- * @author alessandro
+ * @author alexdma
*
*/
public class OrganizationalHierarchyComparator implements Comparator {
Modified: incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/impl/ClerezzaSchemaMatcherImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/impl/ClerezzaSchemaMatcherImpl.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/impl/ClerezzaSchemaMatcherImpl.java (original)
+++ incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/impl/ClerezzaSchemaMatcherImpl.java Mon Oct 17 07:43:15 2011
@@ -21,11 +21,14 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.io.BlankOntologySource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.GraphSource;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologySource;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologyCollectorException;
import org.apache.stanbol.ontologymanager.registry.api.RegistryContentException;
import org.apache.stanbol.ontologymanager.registry.api.model.Library;
+import org.apache.stanbol.owl.transformation.OWLAPIToClerezzaConverter;
+import org.apache.stanbol.owl.util.OWLUtils;
import org.osgi.service.component.ComponentContext;
import org.semanticweb.owlapi.model.OWLOntology;
import org.slf4j.Logger;
@@ -146,9 +149,12 @@ public class ClerezzaSchemaMatcherImpl i
try {
cs = scopeSchemaMatching.getCustomSpace();
cs.tearDown();
- scopeSchemaMatching.getCustomSpace().addOntology(new GraphSource(knowledgeBase));
- } catch (UnmodifiableOntologySpaceException e) {
- log.error("Failed to change knowledge base in unmodifiable ontolgy space {}", e.getSpace());
+ // FIXME Ugly
+ scopeSchemaMatching.getCustomSpace().addOntology(
+ new RootOntologySource(OWLAPIToClerezzaConverter.clerezzaGraphToOWLOntology(new GraphSource(
+ knowledgeBase).getRootOntology())));
+ } catch (UnmodifiableOntologyCollectorException e) {
+ log.error("Failed to change knowledge base in unmodifiable ontolgy space {}", e.getOntologyCollector());
} finally {
cs.setUp();
}
Modified: incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/impl/SchemaCatalogImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/impl/SchemaCatalogImpl.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/impl/SchemaCatalogImpl.java (original)
+++ incubator/stanbol/trunk/explanation/core/src/main/java/org/apache/stanbol/explanation/impl/SchemaCatalogImpl.java Mon Oct 17 07:43:15 2011
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
/**
* Default implementation of a knowledge schema.
*
- * @author alessandro
+ * @author alexdma
*
*/
@Component(metatype = true, immediate = true, configurationFactory = true, policy = ConfigurationPolicy.REQUIRE, specVersion = "1.1")
Modified: incubator/stanbol/trunk/explanation/core/src/test/java/org/apache/stanbol/explanation/MockOsgiContext.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/explanation/core/src/test/java/org/apache/stanbol/explanation/MockOsgiContext.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/explanation/core/src/test/java/org/apache/stanbol/explanation/MockOsgiContext.java (original)
+++ incubator/stanbol/trunk/explanation/core/src/test/java/org/apache/stanbol/explanation/MockOsgiContext.java Mon Oct 17 07:43:15 2011
@@ -7,6 +7,7 @@ import org.apache.clerezza.rdf.core.acce
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.jena.parser.JenaParserProvider;
+import org.apache.clerezza.rdf.rdfjson.parser.RdfJsonParsingProvider;
import org.apache.clerezza.rdf.simple.storage.SimpleTcProvider;
import org.apache.stanbol.explanation.impl.TestSchemaMatchers;
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
@@ -24,6 +25,9 @@ public class MockOsgiContext {
public static ONManager onManager;
static {
+ parser = new Parser();
+ parser.bindParsingProvider(new JenaParserProvider());
+ parser.bindParsingProvider(new RdfJsonParsingProvider());
reset();
}
@@ -42,12 +46,10 @@ public class MockOsgiContext {
.toString()});
OfflineConfiguration offline = new OfflineConfigurationImpl(configuration);
- tcManager = TcManager.getInstance();
+ tcManager = new TcManager();
WeightedTcProvider wtcp = new SimpleTcProvider();
tcManager.addWeightedTcProvider(wtcp);
onManager = new ONManagerImpl(tcManager, wtcp, offline, configuration);
- parser = Parser.getInstance();
- parser.bindParsingProvider(new JenaParserProvider());
}
}
Modified: incubator/stanbol/trunk/explanation/core/src/test/java/org/apache/stanbol/explanation/impl/TestSchemaMatchers.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/explanation/core/src/test/java/org/apache/stanbol/explanation/impl/TestSchemaMatchers.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/explanation/core/src/test/java/org/apache/stanbol/explanation/impl/TestSchemaMatchers.java (original)
+++ incubator/stanbol/trunk/explanation/core/src/test/java/org/apache/stanbol/explanation/impl/TestSchemaMatchers.java Mon Oct 17 07:43:15 2011
@@ -4,11 +4,14 @@ import java.io.InputStream;
import java.util.Dictionary;
import java.util.Hashtable;
+import static org.apache.stanbol.explanation.MockOsgiContext.*;
+
import org.apache.clerezza.rdf.core.Graph;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.serializedform.Parser;
+import org.apache.clerezza.rdf.jena.parser.JenaParserProvider;
import org.apache.stanbol.explanation.Data;
import org.apache.stanbol.explanation.MockOsgiContext;
import org.apache.stanbol.ontologymanager.ontonet.api.OfflineConfiguration;
@@ -70,14 +73,11 @@ public class TestSchemaMatchers {
@Test
public void testClerezzaMatcher() throws Exception {
- TcManager tcm = MockOsgiContext.tcManager;
- MGraph kb = tcm.createMGraph(new UriRef(kbId));
+ MGraph kb = tcManager.createMGraph(new UriRef(kbId));
InputStream inputStream = getClass().getResourceAsStream("/ontologies/explanation_testdata.owl");
// get the singleton instance of Parser
- final Parser parser = MockOsgiContext.parser;
-
Graph deserializedGraph = parser.parse(inputStream, "application/rdf+xml");
kb.addAll(deserializedGraph);
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/pom.xml?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/pom.xml (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/pom.xml Mon Oct 17 07:43:15 2011
@@ -122,6 +122,11 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.ontologies</artifactId>
+ <version>0.11-incubating-SNAPSHOT</version>
+ </dependency>
<!-- Testing deps -->
<dependency>
Copied: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/AbstractOWLOntologyInputSource.java (from r1181018, incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/AbstractOntologyInputSource.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/AbstractOWLOntologyInputSource.java?p2=incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/AbstractOWLOntologyInputSource.java&p1=incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/AbstractOntologyInputSource.java&r1=1181018&r2=1185032&rev=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/AbstractOntologyInputSource.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/AbstractOWLOntologyInputSource.java Mon Oct 17 07:43:15 2011
@@ -20,115 +20,22 @@ import java.util.Set;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
+import org.semanticweb.owlapi.model.OWLOntologyManager;
/**
- * Abstract implementation of {@link OntologyInputSource} with the basic methods for obtaining root ontologies
- * and their physical IRIs where applicable.<br/>
+ * Abstract OWL API implementation of {@link OntologyInputSource} with the basic methods for obtaining root
+ * ontologies and their physical IRIs where applicable.<br/>
* </br> Implementations should either invoke abstract methods {@link #bindPhysicalIri(IRI)} and
* {@link #bindRootOntology(OWLOntology)} in their constructors, or override them.
*
*/
-public abstract class AbstractOntologyInputSource implements OntologyInputSource {
+public abstract class AbstractOWLOntologyInputSource extends AbstractGenericInputSource<OWLOntology> {
- protected IRI physicalIri = null;
-
- protected OWLOntology rootOntology = null;
-
- /**
- * This method is used to remind developers to bind a physical IRI to the {@link OntologyInputSource} if
- * intending to do so.
- *
- * Implementation should assign a value to {@link #physicalIri}.
- *
- * @param iri
- * the physical ontology IRI.
- */
- protected void bindPhysicalIri(IRI iri) {
- this.physicalIri = iri;
- }
-
- /**
- * This method is used to remind developers to bind a root ontology to the {@link OntologyInputSource} if
- * intending to do so.
- *
- * Implementation should assign a value to {@link #rootOntology}.
- *
- * @param ontology
- * the root ontology.
- */
- protected void bindRootOntology(OWLOntology ontology) {
- this.rootOntology = ontology;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object obj) {
- if (!(obj instanceof OntologyInputSource)) return false;
- OntologyInputSource src = (OntologyInputSource) obj;
- return this.physicalIri.equals(src.getPhysicalIRI())
- && this.rootOntology.equals(src.getRootOntology());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource#getClosure()
- */
- @Override
- public Set<OWLOntology> getClosure() {
- return rootOntology.getOWLOntologyManager().getImportsClosure(rootOntology);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see eu.iksproject.kres.api.manager.ontology.OntologyInputSource#getPhysicalIRI()
- */
@Override
- public IRI getPhysicalIRI() {
- return physicalIri;
+ public Set<OWLOntology> getImports(boolean recursive) {
+ OWLOntologyManager mgr = rootOntology.getOWLOntologyManager();
+ return (recursive ? mgr.getImportsClosure(rootOntology) : mgr.getDirectImports(rootOntology));
+ // return rootOntology.getOWLOntologyManager().getImportsClosure(rootOntology);
}
- /*
- * (non-Javadoc)
- *
- * @see eu.iksproject.kres.api.manager.ontology.OntologyInputSource#getRootOntology()
- */
- @Override
- public OWLOntology getRootOntology() {
- return rootOntology;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see eu.iksproject.kres.api.manager.ontology.OntologyInputSource#hasPhysicalIRI()
- */
- @Override
- public boolean hasPhysicalIRI() {
- return physicalIri != null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see eu.iksproject.kres.api.manager.ontology.OntologyInputSource#hasRootOntology()
- */
- @Override
- public boolean hasRootOntology() {
- return rootOntology != null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- @Override
- public abstract String toString();
-
}
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/BlankOntologySource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/BlankOntologySource.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/BlankOntologySource.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/BlankOntologySource.java Mon Oct 17 07:43:15 2011
@@ -25,10 +25,10 @@ import org.semanticweb.owlapi.model.OWLO
* a {@link NullPointerException} to be thrown when an {@link OntologyInputSource} is to be passed to a
* method, but we are not actually interested in the ontology to pass.
*
- * @author alessandro
+ * @author alexdma
*
*/
-public class BlankOntologySource extends AbstractOntologyInputSource {
+public class BlankOntologySource extends AbstractOWLOntologyInputSource {
/**
* Creates a new input source with an unnamed, empty ontology.
Added: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/GraphSource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/GraphSource.java?rev=1185032&view=auto
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/GraphSource.java (added)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/GraphSource.java Mon Oct 17 07:43:15 2011
@@ -0,0 +1,51 @@
+package org.apache.stanbol.ontologymanager.ontonet.api.io;
+
+import org.apache.clerezza.rdf.core.Graph;
+import org.apache.clerezza.rdf.core.MGraph;
+import org.apache.clerezza.rdf.core.TripleCollection;
+import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.rdf.core.access.TcManager;
+
+/**
+ * An {@link OntologyInputSource} that gets ontologies from either a Clerezza {@link Graph} (or {@link MGraph}
+ * ), or its identifier and an optionally supplied triple collection manager.
+ *
+ * @author alexdma
+ *
+ */
+public class GraphSource extends AbstractClerezzaGraphInputSource {
+
+ public GraphSource(UriRef graphId) {
+ this(graphId, TcManager.getInstance());
+ }
+
+ public GraphSource(TripleCollection graph) {
+ if (graph instanceof Graph) bindRootOntology((Graph) graph);
+ else if (graph instanceof MGraph) bindRootOntology(((MGraph) graph).getGraph());
+ else throw new IllegalArgumentException("GraphSource supports only Graph and MGraph types. "
+ + graph.getClass() + " is not supported.");
+ try {
+ // TODO how can I know the physical iri?
+ // bindPhysicalIri(rootOntology.getOntologyID().getDefaultDocumentIRI());
+ } catch (Exception e) {
+ // Ontology might be anonymous, no physical IRI then...
+ bindPhysicalIri(null);
+ }
+ }
+
+ /**
+ * This constructor can be used to hijack ontologies using a physical IRI other than their default one.
+ *
+ * @param rootOntology
+ * @param phyicalIRI
+ */
+ public GraphSource(UriRef graphId, TcManager tcManager) {
+ this(tcManager.getTriples(graphId));
+ }
+
+ @Override
+ public String toString() {
+ return "GRAPH<" + rootOntology + ">";
+ }
+
+}
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java Mon Oct 17 07:43:15 2011
@@ -1,25 +1,24 @@
/*
-* 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.
-*/
+ * 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.ontonet.api.io;
import java.util.Set;
import org.semanticweb.owlapi.model.IRI;
-import org.semanticweb.owlapi.model.OWLOntology;
/**
* An ontology input source provides a point for loading an ontology. Currently it provides two ways of
@@ -35,10 +34,10 @@ import org.semanticweb.owlapi.model.OWLO
* provide the OWLOntology, or directly provide the physical IRI for other classes to dereference.
* Implementations should allow multiple attempts at loading an ontology.
*
- * @author alessandro
+ * @author alexdma
*
*/
-public interface OntologyInputSource {
+public interface OntologyInputSource<O> {
/**
* Gets the ontology network resulting from the transitive closure of import statements on the root
@@ -46,7 +45,7 @@ public interface OntologyInputSource {
*
* @return the import closure of the root ontology.
*/
- Set<OWLOntology> getClosure();
+ Set<O> getImports(boolean recursive);
/**
* Returns the IRI by dereferencing which it should be possible to obtain the ontology. This method is
@@ -62,7 +61,7 @@ public interface OntologyInputSource {
*
* @return the ontology network root.
*/
- OWLOntology getRootOntology();
+ O getRootOntology();
/**
* Determines if a physical IRI is known for this ontology source. Note that an anonymous ontology may
Copied: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologySpaceSource.java (from r1181018, incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/ScopeOntologySource.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologySpaceSource.java?p2=incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologySpaceSource.java&p1=incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/ScopeOntologySource.java&r1=1181018&r2=1185032&rev=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/ScopeOntologySource.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologySpaceSource.java Mon Oct 17 07:43:15 2011
@@ -16,26 +16,48 @@
*/
package org.apache.stanbol.ontologymanager.ontonet.api.io;
-import org.semanticweb.owlapi.model.IRI;
+import java.util.Set;
+
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologyCollectorException;
import org.semanticweb.owlapi.model.OWLOntology;
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- * An ontology source that rewrites the physical IRI by appending the logical one to the scope ID. If the
- * ontology is anonymous, the original physical IRI is retained.
- *
- * @author alessandro
- *
- */
-public class ScopeOntologySource extends AbstractOntologyInputSource {
+public class OntologySpaceSource extends AbstractOWLOntologyInputSource {
+
+ private Logger log = LoggerFactory.getLogger(getClass());
+
+ protected OntologySpace space;
- public ScopeOntologySource(IRI scopeIri, OWLOntology ontology, IRI origin) {
- bindRootOntology(ontology);
- LoggerFactory.getLogger(ScopeOntologySource.class).debug("Rewriting {} to {}/{}",
- new IRI[] {origin, scopeIri, ontology.getOntologyID().getOntologyIRI()});
- IRI iri = !ontology.isAnonymous() ? IRI.create(scopeIri + "/"
- + ontology.getOntologyID().getOntologyIRI()) : origin;
- bindPhysicalIri(iri);
+ public OntologySpaceSource(OntologySpace space) {
+ this(space, null);
+ }
+
+ public OntologySpaceSource(OntologySpace space, Set<OntologyInputSource> subtrees) {
+ this.space = space;
+ if (subtrees != null) try {
+ for (OntologyInputSource st : subtrees)
+ appendSubtree(st);
+ } catch (UnmodifiableOntologyCollectorException e) {
+ log.error(
+ "Could not add subtrees to unmodifiable ontology space {}. Input source will have no additions.",
+ e.getOntologyCollector());
+ }
+ bindRootOntology(space.asOWLOntology());
+ }
+
+ protected void appendSubtree(OntologyInputSource subtree) throws UnmodifiableOntologyCollectorException {
+ space.addOntology(subtree);
+ }
+
+ public OntologySpace asOntologySpace() {
+ return space;
+ }
+
+ @Override
+ public Set<OWLOntology> getImports(boolean recursive) {
+ return space.getOntologies(recursive);
}
@Override
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/ParentPathInputSource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/ParentPathInputSource.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/ParentPathInputSource.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/ParentPathInputSource.java Mon Oct 17 07:43:15 2011
@@ -33,10 +33,10 @@ import org.semanticweb.owlapi.util.AutoI
* The behaviour of this class is inherited from the {@link AutoIRIMapper} in the OWL API, and so are its
* limitations and fallback policies.
*
- * @author alessandro
+ * @author alexdma
*
*/
-public class ParentPathInputSource extends AbstractOntologyInputSource {
+public class ParentPathInputSource extends AbstractOWLOntologyInputSource {
/**
* Creates a new parent path ontology input source. When created using this constructor, the only active
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/RootOntologyIRISource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/RootOntologyIRISource.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/RootOntologyIRISource.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/RootOntologyIRISource.java Mon Oct 17 07:43:15 2011
@@ -27,10 +27,10 @@ import org.semanticweb.owlapi.model.OWLO
* <br>
* For convenience, an existing OWL ontology manager can be supplied for loading the ontology.
*
- * @author alessandro
+ * @author alexdma
*
*/
-public class RootOntologyIRISource extends AbstractOntologyInputSource {
+public class RootOntologyIRISource extends AbstractOWLOntologyInputSource {
public RootOntologyIRISource(IRI rootOntologyIri) throws OWLOntologyCreationException {
this(rootOntologyIri, OWLManager.createOWLOntologyManager());
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/RootOntologySource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/RootOntologySource.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/RootOntologySource.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/RootOntologySource.java Mon Oct 17 07:43:15 2011
@@ -24,7 +24,7 @@ import org.semanticweb.owlapi.model.OWLO
* from the default document IRI in the ontology, or supplied manually using the appropriate constructor (e.g.
* retrieved from the ontology manager that actually loaded the ontology).
*/
-public class RootOntologySource extends AbstractOntologyInputSource {
+public class RootOntologySource extends AbstractOWLOntologyInputSource {
public RootOntologySource(OWLOntology rootOntology) {
bindRootOntology(rootOntology);
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/CoreOntologySpace.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/CoreOntologySpace.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/CoreOntologySpace.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/CoreOntologySpace.java Mon Oct 17 07:43:15 2011
@@ -21,7 +21,7 @@ package org.apache.stanbol.ontologymanag
* modeling a given scope. For example, it may define metamodels or essential
* concepts and rules in a domain.
*
- * @author alessandro
+ * @author alexdma
*
*/
public interface CoreOntologySpace extends OntologySpace {
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/CustomOntologySpace.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/CustomOntologySpace.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/CustomOntologySpace.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/CustomOntologySpace.java Mon Oct 17 07:43:15 2011
@@ -1,55 +1,52 @@
/*
-* 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.
-*/
+ * 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.ontonet.api.ontology;
/**
- * An ontology space that wraps the components that can be customized by CMS
- * developers, IKS customizers and the like. The custom ontology space becomes
- * read-only after bootstrapping (i.e. after a call to <code>setUp()</code>).
+ * An ontology space that wraps the components that can be customized by CMS developers, IKS customizers and
+ * the like. The custom ontology space becomes read-only after bootstrapping (i.e. after a call to
+ * <code>setUp()</code>).
*
- * The ontologies in a custom space typically depend on those in the core space.
- * However, a custom space does <i>not</i> know which is the core space, it only
- * imports its ontologies. The core-custom-session relationship between spaces
- * is a scope is handled by external objects.
+ * The ontologies in a custom space typically depend on those in the core space. However, a custom space does
+ * <i>not</i> know which is the core space, it only imports its ontologies. The core-custom-session
+ * relationship between spaces is a scope is handled by external objects.
*
- * @author alessandro
+ * @author alexdma
*
*/
public interface CustomOntologySpace extends OntologySpace {
- /**
- * Logically links this custom space with the supplied core ontology space,
- * so that the top ontology in the former will import those in the latter.<br>
- * <br>
- * This relationship is expected to hold at all times once the space is
- * active, however the method to set it is available in case implementations
- * require to perform other operations between the creation of ontology
- * spaces and their linking.
- *
- * @param coreSpace
- * the core ontology space to be linked
- * @param skipRoot
- * if true, the custom root ontology will not import the core
- * root ontology straight away, but instead all of its axioms and
- * import statements will be copied. Useful for implementations
- * that construct root ontologies in memory but do not store
- * them.
- */
- void attachCoreSpace(CoreOntologySpace coreSpace, boolean skipRoot)
- throws UnmodifiableOntologySpaceException;
+ /**
+ * Logically links this custom space with the supplied core ontology space, so that the top ontology in
+ * the former will import those in the latter.<br>
+ * <br>
+ * This relationship is expected to hold at all times once the space is active, however the method to set
+ * it is available in case implementations require to perform other operations between the creation of
+ * ontology spaces and their linking.
+ *
+ * @deprecated space linking is performed by the parent scope at OWL export time. Implementations do
+ * nothing.
+ * @param coreSpace
+ * the core ontology space to be linked
+ * @param skipRoot
+ * if true, the custom root ontology will not import the core root ontology straight away, but
+ * instead all of its axioms and import statements will be copied. Useful for implementations
+ * that construct root ontologies in memory but do not store them.
+ */
+ void attachCoreSpace(CoreOntologySpace coreSpace, boolean skipRoot) throws UnmodifiableOntologyCollectorException;
}
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/IrremovableOntologyException.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/IrremovableOntologyException.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/IrremovableOntologyException.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/IrremovableOntologyException.java Mon Oct 17 07:43:15 2011
@@ -23,11 +23,11 @@ import org.semanticweb.owlapi.model.IRI;
* space is detected. This can happen e.g. if the ontology is the space root or
* not a direct child thereof.
*
- * @author alessandro
+ * @author alexdma
*
*/
public class IrremovableOntologyException extends
- OntologySpaceModificationException {
+ OntologyCollectorModificationException {
protected IRI ontologyId;
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/MissingOntologyException.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/MissingOntologyException.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/MissingOntologyException.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/MissingOntologyException.java Mon Oct 17 07:43:15 2011
@@ -22,11 +22,11 @@ import org.semanticweb.owlapi.model.IRI;
* Thrown whenever an attempt to modify an ontology within an ontology space
* that does not contain it is detected.
*
- * @author alessandro
+ * @author alexdma
*
*/
public class MissingOntologyException extends
- OntologySpaceModificationException {
+ OntologyCollectorModificationException {
public MissingOntologyException(OntologySpace space, IRI ontologyId) {
super(space);
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/NoSuchScopeException.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/NoSuchScopeException.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/NoSuchScopeException.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/NoSuchScopeException.java Mon Oct 17 07:43:15 2011
@@ -21,7 +21,7 @@ package org.apache.stanbol.ontologymanag
* Thrown whenever an operation on a scope that has not been registered is
* thrown.
*
- * @author alessandro
+ * @author alexdma
*
*/
public class NoSuchScopeException extends RuntimeException {
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OWLOntologyManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OWLOntologyManagerFactory.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OWLOntologyManagerFactory.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OWLOntologyManagerFactory.java Mon Oct 17 07:43:15 2011
@@ -25,7 +25,7 @@ import org.semanticweb.owlapi.model.OWLO
* Generates new instances of {@link OWLOntologyManager} with optional offline support already enabled for
* each of them.
*
- * @author alessandro
+ * @author alexdma
* @deprecated use the static methods of {@link org.apache.stanbol.owl.OWLOntologyManagerFactory} instead.
*/
public interface OWLOntologyManagerFactory {
Copied: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyCollectorListener.java (from r1184794, incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceListener.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyCollectorListener.java?p2=incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyCollectorListener.java&p1=incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceListener.java&r1=1184794&r2=1185032&rev=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceListener.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyCollectorListener.java Mon Oct 17 07:43:15 2011
@@ -18,7 +18,7 @@ package org.apache.stanbol.ontologymanag
import org.semanticweb.owlapi.model.IRI;
-public interface OntologySpaceListener {
+public interface OntologyCollectorListener {
void onOntologyAdded(IRI spaceId, IRI addedOntology);
Copied: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyCollectorModificationException.java (from r1184794, incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceModificationException.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyCollectorModificationException.java?p2=incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyCollectorModificationException.java&p1=incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceModificationException.java&r1=1184794&r2=1185032&rev=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceModificationException.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyCollectorModificationException.java Mon Oct 17 07:43:15 2011
@@ -19,14 +19,14 @@ package org.apache.stanbol.ontologymanag
/**
* Thrown whenever an illegal operation that modifies an ontology space is detected and denied.
*/
-public class OntologySpaceModificationException extends Exception {
+public class OntologyCollectorModificationException extends Exception {
/**
*
*/
private static final long serialVersionUID = -5147080356192253724L;
- protected OntologySpace space;
+ protected OntologyCollector collector;
/**
* Creates a new instance of OntologySpaceModificationException.
@@ -34,8 +34,8 @@ public class OntologySpaceModificationEx
* @param space
* the ontology space whose modification was attempted.
*/
- public OntologySpaceModificationException(OntologySpace space) {
- this.space = space;
+ public OntologyCollectorModificationException(OntologyCollector collector) {
+ this.collector = collector;
}
/**
@@ -44,8 +44,8 @@ public class OntologySpaceModificationEx
* @param space
* the ontology space whose modification was attempted.
*/
- public OntologySpaceModificationException(OntologySpace space, Throwable cause) {
- this(space);
+ public OntologyCollectorModificationException(OntologyCollector collector, Throwable cause) {
+ this(collector);
initCause(cause);
}
@@ -54,8 +54,8 @@ public class OntologySpaceModificationEx
*
* @return the ontology space on which the exception was thrown.
*/
- public OntologySpace getSpace() {
- return space;
+ public OntologyCollector getOntologyCollector() {
+ return collector;
}
}
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyIndex.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyIndex.java?rev=1185032&r1=1185031&r2=1185032&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyIndex.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyIndex.java Mon Oct 17 07:43:15 2011
@@ -25,7 +25,7 @@ import org.semanticweb.owlapi.model.OWLO
* Provides an interface to the ontologies provided by registered scopes in the
* ontology manager.
*
- * @author alessandro
+ * @author alexdma
*
*/
public interface OntologyIndex extends ScopeOntologyListener,