Author: alexdma
Date: Mon Oct 10 10:43:46 2011
New Revision: 1180869
URL: http://svn.apache.org/viewvc?rev=1180869&view=rev
Log:
- Refactorer, Refactor Engine and ReasoningServiceExecutor now handle
OWLAPI/Clerezza conversions as TripleCollection objects (STANBOL-337)
- New ontology input source that supports Clerezza graphs (STANBOL-332)
- Clerezza ontology storage now converts straight to Clerezza Tc's without
passing through Jena converters (STANBOL-332)
- RootOntologyIRISource now has a parameter for ignoring the offlinemode (which
was not really supported by the earlier version) (STANBOL-178)
- ONManager API can now provide its offline configuration (STANBOL-178)
- Stricter unit test assertions for OntoNet offline mode (STANBOL-178)
- Removed even more deprecated Registry API methods (STANBOL-285)
- Refactorer POM now specifies Xerces version to avoid conflicts (STANBOL-301)
- Fixed typo in DuplicateIDEception method name
Added:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/GraphSource.java
Modified:
incubator/stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java
incubator/stanbol/trunk/ontologymanager/ontonet/pom.xml
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/DuplicateIDException.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/RootOntologyIRISource.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/ontology/AbstractOntologySpaceImpl.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/session/SessionManagerImpl.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestOntologyInputSources.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/session/TestSessions.java
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/api/model/RegistryItem.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/AbstractRegistryItem.java
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/model/RegistryImpl.java
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningServiceExecutor.java
incubator/stanbol/trunk/rules/refactor/pom.xml
incubator/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
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=1180869&r1=1180868&r2=1180869&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 10 10:43:46 2011
@@ -277,7 +277,7 @@ public class RefactorEnhancementEngine i
* computeEnhancement is always called iff the former returns
true.
*/
OWLOntology fiseMetadataOntology = OWLAPIToClerezzaConverter
- .clerezzaMGraphToOWLOntology(mGraph);
+ .clerezzaGraphToOWLOntology(mGraph);
ontologies.add(fiseMetadataOntology);
return ontologies;
}
@@ -711,7 +711,7 @@ String scopeId = (String) context.getPro
*
manager.loadOntologyFromOntologyDocument(dereferencer.resolve(entityReferenceString));
*/
- fetchedOntology =
OWLAPIToClerezzaConverter.clerezzaMGraphToOWLOntology(entityMGraph);
+ fetchedOntology =
OWLAPIToClerezzaConverter.clerezzaGraphToOWLOntology(entityMGraph);
}
return fetchedOntology;
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/pom.xml?rev=1180869&r1=1180868&r2=1180869&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/pom.xml (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/pom.xml Mon Oct 10 10:43:46
2011
@@ -1,15 +1,20 @@
<?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";>
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/DuplicateIDException.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/DuplicateIDException.java?rev=1180869&r1=1180868&r2=1180869&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/DuplicateIDException.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/DuplicateIDException.java
Mon Oct 10 10:43:46 2011
@@ -41,7 +41,7 @@ public class DuplicateIDException extend
*
* @return the duplicate identifier
*/
- public String getDulicateID() {
+ public String getDuplicateID() {
return dupe;
}
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java?rev=1180869&r1=1180868&r2=1180869&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java
Mon Oct 10 10:43:46 2011
@@ -58,6 +58,13 @@ public interface ONManager {
String getID();
/**
+ * Returns the offline configuration set for this ontology network
manager, if any.
+ *
+ * @return the offline configuration, or null if none was set.
+ */
+ OfflineConfiguration getOfflineConfiguration();
+
+ /**
* Returns the default object that automatically indexes ontologies as
they are loaded within scopes.
*
* @return the default ontology index.
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=1180869&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 10 10:43:46 2011
@@ -0,0 +1,47 @@
+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.UriRef;
+import org.apache.clerezza.rdf.core.access.TcManager;
+import org.apache.stanbol.owl.transformation.OWLAPIToClerezzaConverter;
+
+/**
+ * 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 AbstractOntologyInputSource {
+
+ public GraphSource(UriRef graphId) {
+ this(graphId, TcManager.getInstance());
+ }
+
+ public GraphSource(Graph graph) {
+
bindRootOntology(OWLAPIToClerezzaConverter.clerezzaGraphToOWLOntology(graph));
+ try {
+
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.getGraph(graphId));
+ }
+
+ @Override
+ public String toString() {
+ return "GRAPH<" + rootOntology.getOntologyID() + ">";
+ }
+
+}
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=1180869&r1=1180868&r2=1180869&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 10 10:43:46 2011
@@ -32,20 +32,20 @@ import org.semanticweb.owlapi.model.OWLO
*/
public class RootOntologyIRISource extends AbstractOntologyInputSource {
- public RootOntologyIRISource(IRI rootPhysicalIri) throws
OWLOntologyCreationException {
- this(rootPhysicalIri, OWLManager.createOWLOntologyManager());
+ public RootOntologyIRISource(IRI rootOntologyIri) throws
OWLOntologyCreationException {
+ this(rootOntologyIri, OWLManager.createOWLOntologyManager());
}
public RootOntologyIRISource(IRI rootPhysicalIri, OWLOntologyManager
manager) throws OWLOntologyCreationException {
+ this(rootPhysicalIri, manager, false);
+ }
+
+ public RootOntologyIRISource(IRI rootPhysicalIri, OWLOntologyManager
manager, boolean ignoreIriMappers) throws OWLOntologyCreationException {
bindPhysicalIri(rootPhysicalIri);
-
bindRootOntology(manager.loadOntologyFromOntologyDocument(rootPhysicalIri));
+ bindRootOntology(ignoreIriMappers ?
manager.loadOntologyFromOntologyDocument(rootPhysicalIri)
+ : manager.loadOntology(rootPhysicalIri));
}
- /*
- * (non-Javadoc)
- *
- * @see
eu.iksproject.kres.manager.io.AbstractOntologyInputSource#toString()
- */
@Override
public String toString() {
return "ROOT_ONT_IRI<" + getPhysicalIRI() + ">";
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java?rev=1180869&r1=1180868&r2=1180869&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java
Mon Oct 10 10:43:46 2011
@@ -594,4 +594,9 @@ public class ONManagerImpl implements ON
return offlineMode != null;
}
+ @Override
+ public OfflineConfiguration getOfflineConfiguration() {
+ return offline;
+ }
+
}
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/ClerezzaOntologyStorage.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/ClerezzaOntologyStorage.java?rev=1180869&r1=1180868&r2=1180869&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/ClerezzaOntologyStorage.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/ClerezzaOntologyStorage.java
Mon Oct 10 10:43:46 2011
@@ -22,6 +22,7 @@ import java.util.Hashtable;
import java.util.Set;
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.EntityAlreadyExistsException;
import org.apache.clerezza.rdf.core.access.TcManager;
@@ -31,6 +32,11 @@ import org.apache.clerezza.rdf.core.impl
import org.apache.clerezza.rdf.core.sparql.ParseException;
import org.apache.clerezza.rdf.core.sparql.QueryParser;
import org.apache.clerezza.rdf.core.sparql.query.Query;
+import
org.apache.stanbol.ontologymanager.ontonet.impl.ontology.NoSuchStoreException;
+import org.apache.stanbol.owl.transformation.JenaToClerezzaConverter;
+import org.apache.stanbol.owl.transformation.JenaToOwlConvert;
+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.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
@@ -43,11 +49,6 @@ import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.util.FileManager;
-import
org.apache.stanbol.ontologymanager.ontonet.impl.ontology.NoSuchStoreException;
-import org.apache.stanbol.owl.transformation.JenaToClerezzaConverter;
-import org.apache.stanbol.owl.transformation.JenaToOwlConvert;
-import org.apache.stanbol.owl.util.OWLUtils;
-
public class ClerezzaOntologyStorage {
private static Logger log =
LoggerFactory.getLogger(ClerezzaOntologyStorage.class);
@@ -174,11 +175,11 @@ public class ClerezzaOntologyStorage {
}
public void store(OWLOntology o) {
-
- JenaToOwlConvert converter = new JenaToOwlConvert();
- OntModel om = converter.ModelOwlToJenaConvert(o, "RDF/XML");
- MGraph mg = JenaToClerezzaConverter.jenaModelToClerezzaMGraph(om);
- // MGraph mg =
OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(o);
+ // // Why was it using two converters earlier?
+ // JenaToOwlConvert converter = new JenaToOwlConvert();
+ // OntModel om = converter.ModelOwlToJenaConvert(o, "RDF/XML");
+ // MGraph mg = JenaToClerezzaConverter.jenaModelToClerezzaMGraph(om);
+ TripleCollection mg =
OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(o);
MGraph mg2 = null;
IRI iri = OWLUtils.getIdentifyingIRI(o);
UriRef ref = new UriRef(iri.toString());
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/AbstractOntologySpaceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/AbstractOntologySpaceImpl.java?rev=1180869&r1=1180868&r2=1180869&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/AbstractOntologySpaceImpl.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/AbstractOntologySpaceImpl.java
Mon Oct 10 10:43:46 2011
@@ -20,7 +20,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyScopeFactoryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyScopeFactoryImpl.java?rev=1180869&r1=1180868&r2=1180869&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyScopeFactoryImpl.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyScopeFactoryImpl.java
Mon Oct 10 10:43:46 2011
@@ -71,7 +71,6 @@ public class OntologyScopeFactoryImpl im
@Override
public OntologyScope createOntologyScope(String scopeID,
OntologyInputSource coreSource) throws DuplicateIDException {
-
return createOntologyScope(scopeID, coreSource, null);
}
@@ -82,8 +81,8 @@ public class OntologyScopeFactoryImpl im
if (registry.containsScope(scopeID)) throw new
DuplicateIDException(scopeID,
"Scope registry already contains ontology scope with ID " +
scopeID);
-
- OntologyScope scope = new OntologyScopeImpl(scopeID,
getNamespace(),spaceFactory, coreSource, customSource);
+ OntologyScope scope = new OntologyScopeImpl(scopeID, getNamespace(),
spaceFactory, coreSource,
+ customSource);
// scope.addOntologyScopeListener(ONManager.get().getOntologyIndex());
// TODO : manage scopes with null core ontologies
fireScopeCreated(scope);
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java?rev=1180869&r1=1180868&r2=1180869&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java
Mon Oct 10 10:43:46 2011
@@ -107,7 +107,7 @@ public class SessionManagerImpl implemen
try {
session = createSession(idgen.createSessionID(exclude));
} catch (DuplicateSessionIDException e) {
- exclude.add(IRI.create(e.getDulicateID()));
+ exclude.add(IRI.create(e.getDuplicateID()));
continue;
}
return session;
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestOntologyInputSources.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestOntologyInputSources.java?rev=1180869&r1=1180868&r2=1180869&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestOntologyInputSources.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestOntologyInputSources.java
Mon Oct 10 10:43:46 2011
@@ -64,8 +64,11 @@ public class TestOntologyInputSources {
public void testAutoIRIMapper() throws Exception {
URL url = getClass().getResource("/ontologies");
- OWLOntologyIRIMapper mapper = new AutoIRIMapper(new File(url.toURI()),
true);
assertNotNull(url);
+ File file = new File(url.toURI());
+ assertTrue(file.exists());
+ assertTrue(file.isDirectory());
+ OWLOntologyIRIMapper mapper = new AutoIRIMapper(file, true);
IRI dummyiri =
IRI.create("http://stanbol.apache.org/ontologies/peanuts/dummycharacters.owl";);
@@ -74,7 +77,7 @@ public class TestOntologyInputSources {
new File(mapper.getDocumentIRI(dummyiri).toURI()).delete();
((AutoIRIMapper) mapper).update();
}
- assertNull(mapper.getDocumentIRI(dummyiri));
+ assertFalse(dummyiri.equals(mapper.getDocumentIRI(dummyiri)));
// Create a new ontology in the test resources.
OWLOntologyManager mgr =
OWLOntologyManagerFactory.createOWLOntologyManager(null);
@@ -85,11 +88,11 @@ public class TestOntologyInputSources {
((AutoIRIMapper) mapper).update();
// The old mapper should be able to locate the new ontology.
- assertNotNull(mapper.getDocumentIRI(dummyiri));
+ assertFalse(dummyiri.equals(mapper.getDocumentIRI(dummyiri)));
// A new mapper too
OWLOntologyIRIMapper mapper2 = new AutoIRIMapper(new
File(url.toURI()), true);
- assertNotNull(mapper2.getDocumentIRI(dummyiri));
+ assertFalse(dummyiri.equals(mapper2.getDocumentIRI(dummyiri)));
// cleanup
f.delete();
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologyScope.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologyScope.java?rev=1180869&r1=1180868&r2=1180869&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologyScope.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologyScope.java
Mon Oct 10 10:43:46 2011
@@ -206,7 +206,7 @@ public class TestOntologyScope {
scope = factory.createOntologyScope(scopeId1, src1, src2);
scope.setUp();
} catch (DuplicateIDException e) {
- fail("Unexpected DuplicateIDException was caught while testing
scope " + e.getDulicateID());
+ fail("Unexpected DuplicateIDException was caught while testing
scope " + e.getDuplicateID());
}
assertNotNull(scope);
}
@@ -242,7 +242,7 @@ public class TestOntologyScope {
scope2.setUp();
reg.registerScope(scope2);
} catch (DuplicateIDException e) {
- fail("Duplicate ID exception caught on " + e.getDulicateID());
+ fail("Duplicate ID exception caught on " + e.getDuplicateID());
}
// System.err.println(new ScopeSetRenderer().getScopesAsRDF(reg
// .getRegisteredScopes()));
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java?rev=1180869&r1=1180868&r2=1180869&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java
Mon Oct 10 10:43:46 2011
@@ -90,7 +90,7 @@ public class TestSessions {
scope = scopeFactory.createOntologyScope(scopeId1, src1, src2);
scope.setUp();
} catch (DuplicateIDException e) {
- fail("Unexpected DuplicateIDException was caught while testing
scope " + e.getDulicateID());
+ fail("Unexpected DuplicateIDException was caught while testing
scope " + e.getDuplicateID());
}
assertNotNull(scope);
Session ses = sesmgr.createSession();
@@ -115,7 +115,7 @@ public class TestSessions {
scopeRegistry.setScopeActive(scopeId2, false);
scopeRegistry.setScopeActive(scopeId3, true);
} catch (DuplicateIDException e) {
- fail("Unexpected DuplicateIDException was caught while testing
scope " + e.getDulicateID());
+ fail("Unexpected DuplicateIDException was caught while testing
scope " + e.getDuplicateID());
}
Session ses = sesmgr.createSession();
IRI sesid = ses.getID();
Modified:
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/api/model/RegistryItem.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/api/model/RegistryItem.java?rev=1180869&r1=1180868&r2=1180869&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/api/model/RegistryItem.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/api/model/RegistryItem.java
Mon Oct 10 10:43:46 2011
@@ -169,26 +169,6 @@ public interface RegistryItem {
boolean hasParents();
/**
- * Determines if this registry item is a library.
- *
- * @return
- * @deprecated This method will be removed to make room for possible
extensions of the registry metamodel.
- * Use {@link #getType()} or <code>instanceof</code> instead,
and check for
- * {@link Type#LIBRARY}.
- */
- boolean isLibrary();
-
- /**
- * Determines if this registry item is an ontology.
- *
- * @return
- * @deprecated This method will be removed to make room for possible
extensions of the registry metamodel.
- * Use {@link #getType()} or <code>instanceof</code> instead,
and check for
- * {@link Type#ONTOLOGY}.
- */
- boolean isOntology();
-
- /**
* Releases all the parent and child references of this item. If no
objects other than the former parents
* and children are referencing it, this object is left stranded for
garbage collection.
*/
@@ -222,15 +202,6 @@ public interface RegistryItem {
void removeRegistryContentListener(RegistryContentListener listener);
/**
- * Sets the unique identifier of this registry item.
- *
- * @param iri
- * the identifier of this registry item.
- * @deprecated This method is set for removal, as the unique identifier
should not be set after creation.
- */
- void setIRI(IRI iri);
-
- /**
* Sets the name of this registry item.
*
* @param name
Modified:
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/RegistryManagerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/RegistryManagerImpl.java?rev=1180869&r1=1180868&r2=1180869&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/RegistryManagerImpl.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/RegistryManagerImpl.java
Mon Oct 10 10:43:46 2011
@@ -404,7 +404,8 @@ public class RegistryManagerImpl impleme
riFactory.createLibrary(df.getOWLNamedIndividual(iri)));
else if (scores[0] == 0 && scores[1] > 0) population.put(iri,
riFactory.createRegistryOntology(df.getOWLNamedIndividual(iri)));
- } else log.warn("Unable to determine type for registry item {}",
iri);
+ }
+ // else log.warn("Unable to determine type for registry item {}",
iri);
}
for (OWLOntology oReg : registryOntologies) {
Modified:
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/model/AbstractRegistryItem.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/model/AbstractRegistryItem.java?rev=1180869&r1=1180868&r2=1180869&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/model/AbstractRegistryItem.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/model/AbstractRegistryItem.java
Mon Oct 10 10:43:46 2011
@@ -41,7 +41,7 @@ public abstract class AbstractRegistryIt
private String name;
public AbstractRegistryItem(IRI iri) {
- setIRI(iri);
+ this.iri = iri;
}
public AbstractRegistryItem(IRI iri, String name) {
@@ -149,16 +149,6 @@ public abstract class AbstractRegistryIt
}
@Override
- public boolean isLibrary() {
- return Type.LIBRARY.equals(getType());
- }
-
- @Override
- public boolean isOntology() {
- return Type.ONTOLOGY.equals(getType());
- }
-
- @Override
public void prune() {
clearChildren();
clearParents();
@@ -186,11 +176,6 @@ public abstract class AbstractRegistryIt
}
@Override
- public void setIRI(IRI iri) {
- this.iri = iri;
- }
-
- @Override
public void setName(String string) {
this.name = string;
}
Modified:
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/model/RegistryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/model/RegistryImpl.java?rev=1180869&r1=1180868&r2=1180869&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/model/RegistryImpl.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/model/RegistryImpl.java
Mon Oct 10 10:43:46 2011
@@ -45,18 +45,4 @@ public class RegistryImpl extends Abstra
return type;
}
- @Deprecated
- public boolean isError() {
- return !isOK();
- }
-
- @Deprecated
- public boolean isOK() {
- return this.getError().equals("");
- }
-
- @Deprecated
- public void setError(String message) {
- this.message = message;
- }
}
Modified:
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningServiceExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningServiceExecutor.java?rev=1180869&r1=1180868&r2=1180869&view=diff
==============================================================================
---
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningServiceExecutor.java
(original)
+++
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningServiceExecutor.java
Mon Oct 10 10:43:46 2011
@@ -20,6 +20,7 @@ import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.UriInfo;
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.LockableMGraph;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
@@ -326,7 +327,7 @@ public class ReasoningServiceExecutor {
saved = mGraph.addAll(m);
writeLock.unlock();
} else if (data instanceof OWLOntology) {
- MGraph m = OWLAPIToClerezzaConverter
+ TripleCollection m = OWLAPIToClerezzaConverter
.owlOntologyToClerezzaMGraph((OWLOntology) data);
writeLock.lock();
saved = mGraph.addAll(m);
Modified: incubator/stanbol/trunk/rules/refactor/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/refactor/pom.xml?rev=1180869&r1=1180868&r2=1180869&view=diff
==============================================================================
--- incubator/stanbol/trunk/rules/refactor/pom.xml (original)
+++ incubator/stanbol/trunk/rules/refactor/pom.xml Mon Oct 10 10:43:46 2011
@@ -44,6 +44,7 @@
org.apache.stanbol.rules.refactor.*
</Export-Package>
<Import-Package>
+
org.apache.xerces.*;version=2.7.1,
org.slf4j.*,
*
</Import-Package>
Modified:
incubator/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java?rev=1180869&r1=1180868&r2=1180869&view=diff
==============================================================================
---
incubator/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
(original)
+++
incubator/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
Mon Oct 10 10:43:46 2011
@@ -23,6 +23,7 @@ import java.util.Dictionary;
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;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
@@ -117,7 +118,7 @@ public class RefactorerImpl implements R
public static final String _HOST_NAME_AND_PORT_DEFAULT = "localhost:8080";
public static final String _REFACTORING_SCOPE_DEFAULT = "refactoring";
public static final String _REFACTORING_SESSION_ID_DEFAULT =
"http://kres.iksproject.eu/session/refactoring";;
-// public static final String _REFACTORING_SPACE_DEFAULT =
"http://kres.iksproject.eu/space/refactoring";;
+ // public static final String _REFACTORING_SPACE_DEFAULT =
"http://kres.iksproject.eu/space/refactoring";;
@Property(value = _AUTO_GENERATED_ONTOLOGY_IRI_DEFAULT)
public static final String AUTO_GENERATED_ONTOLOGY_IRI =
"org.apache.stanbol.reengineer.default";
@@ -131,8 +132,8 @@ public class RefactorerImpl implements R
@Property(value = _REFACTORING_SESSION_ID_DEFAULT)
public static final String REFACTORING_SESSION_ID =
"org.apache.stanbol.ontlogymanager.session.refactoring";
-// @Property(value = _REFACTORING_SPACE_DEFAULT)
-// public static final String REFACTORING_SPACE =
"org.apache.stanbol.reengineer.space.refactoring";
+ // @Property(value = _REFACTORING_SPACE_DEFAULT)
+ // public static final String REFACTORING_SPACE =
"org.apache.stanbol.reengineer.space.refactoring";
private IRI defaultRefactoringIRI;
@@ -145,7 +146,7 @@ public class RefactorerImpl implements R
private String refactoringScopeID;
-// private IRI refactoringSpaceIRI;
+ // private IRI refactoringSpaceIRI;
@Reference
protected RuleStore ruleStore;
@@ -223,16 +224,16 @@ public class RefactorerImpl implements R
if (refactoringSessionID == null) refactoringSessionID =
_REFACTORING_SESSION_ID_DEFAULT;
String refactoringScopeID = (String)
configuration.get(REFACTORING_SCOPE);
if (refactoringScopeID == null) refactoringScopeID =
_REFACTORING_SCOPE_DEFAULT;
-// String refactoringSpaceID = (String)
configuration.get(REFACTORING_SPACE);
-// if (refactoringSpaceID == null) refactoringSpaceID =
_REFACTORING_SPACE_DEFAULT;
+ // String refactoringSpaceID = (String)
configuration.get(REFACTORING_SPACE);
+ // if (refactoringSpaceID == null) refactoringSpaceID =
_REFACTORING_SPACE_DEFAULT;
String defaultRefactoringID = (String)
configuration.get(AUTO_GENERATED_ONTOLOGY_IRI);
if (defaultRefactoringID == null) defaultRefactoringID =
_AUTO_GENERATED_ONTOLOGY_IRI_DEFAULT;
String hostPort = (String) configuration.get(HOST_NAME_AND_PORT);
if (hostPort == null) hostPort = _HOST_NAME_AND_PORT_DEFAULT;
kReSSessionID = IRI.create(refactoringSessionID);
-// refactoringScopeID = IRI.create("http://"; + hostPort +
"/kres/ontology/" + refactoringScopeID);
-// refactoringSpaceIRI = IRI.create(refactoringSpaceID);
+ // refactoringScopeID = IRI.create("http://"; + hostPort +
"/kres/ontology/" + refactoringScopeID);
+ // refactoringSpaceIRI = IRI.create(refactoringSpaceID);
defaultRefactoringIRI = IRI.create(defaultRefactoringID);
SessionManager kReSSessionManager = onManager.getSessionManager();
@@ -431,7 +432,7 @@ public class RefactorerImpl implements R
MGraph unionMGraph = new SimpleMGraph();
- MGraph mGraph =
OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(inputOntology);
+ TripleCollection mGraph =
OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(inputOntology);
for (Rule kReSRule : kReSRuleList) {
String sparql = kReSRule.toSPARQL();
@@ -441,19 +442,23 @@ public class RefactorerImpl implements R
switch (kReSRule.getExpressiveness()) {
case KReSCore:
- constructedGraph = kReSCoreOperation(sparql, mGraph);
+ if (mGraph instanceof MGraph) constructedGraph =
kReSCoreOperation(sparql,
+ (MGraph) mGraph);
break;
case ForwardChaining:
- ForwardChainingRefactoringGraph
forwardChainingRefactoringGraph = forwardChainingOperation(
- sparql, mGraph);
- constructedGraph =
forwardChainingRefactoringGraph.getOutputGraph();
- mGraph =
forwardChainingRefactoringGraph.getInputGraph();
+ if (mGraph instanceof MGraph) {
+ ForwardChainingRefactoringGraph
forwardChainingRefactoringGraph = forwardChainingOperation(
+ sparql, (MGraph) mGraph);
+ constructedGraph =
forwardChainingRefactoringGraph.getOutputGraph();
+ mGraph =
forwardChainingRefactoringGraph.getInputGraph();
+ }
break;
case Reflexive:
constructedGraph = kReSCoreOperation(sparql,
unionMGraph);
break;
case SPARQLConstruct:
- constructedGraph = kReSCoreOperation(sparql, mGraph);
+ if (mGraph instanceof MGraph) constructedGraph =
kReSCoreOperation(sparql,
+ (MGraph) mGraph);
break;
case SPARQLDelete:
constructedGraph = sparqlUpdateOperation(sparql,
unionMGraph);
@@ -471,7 +476,7 @@ public class RefactorerImpl implements R
}
- refactoredOntology =
OWLAPIToClerezzaConverter.clerezzaMGraphToOWLOntology(unionMGraph);
+ refactoredOntology =
OWLAPIToClerezzaConverter.clerezzaGraphToOWLOntology(unionMGraph);
} catch (NoSuchRecipeException e1) {
e1.printStackTrace();
@@ -505,7 +510,7 @@ public class RefactorerImpl implements R
MGraph unionMGraph = new SimpleMGraph();
- MGraph mGraph =
OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(inputOntology);
+ TripleCollection mGraph =
OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(inputOntology);
for (Rule kReSRule : ruleList) {
String sparql = kReSRule.toSPARQL();
@@ -515,19 +520,23 @@ public class RefactorerImpl implements R
switch (kReSRule.getExpressiveness()) {
case KReSCore:
- constructedGraph = kReSCoreOperation(sparql, mGraph);
+ if (mGraph instanceof MGraph) constructedGraph =
kReSCoreOperation(sparql,
+ (MGraph) mGraph);
break;
case ForwardChaining:
- ForwardChainingRefactoringGraph
forwardChainingRefactoringGraph = forwardChainingOperation(
- sparql, mGraph);
- constructedGraph =
forwardChainingRefactoringGraph.getOutputGraph();
- mGraph = forwardChainingRefactoringGraph.getInputGraph();
+ if (mGraph instanceof MGraph) {
+ ForwardChainingRefactoringGraph
forwardChainingRefactoringGraph = forwardChainingOperation(
+ sparql, (MGraph) mGraph);
+ constructedGraph =
forwardChainingRefactoringGraph.getOutputGraph();
+ mGraph =
forwardChainingRefactoringGraph.getInputGraph();
+ }
break;
case Reflexive:
constructedGraph = kReSCoreOperation(sparql, unionMGraph);
break;
case SPARQLConstruct:
- constructedGraph = kReSCoreOperation(sparql, mGraph);
+ if (mGraph instanceof MGraph) constructedGraph =
kReSCoreOperation(sparql,
+ (MGraph) mGraph);
break;
case SPARQLDelete:
constructedGraph = sparqlUpdateOperation(sparql,
unionMGraph);
@@ -545,7 +554,7 @@ public class RefactorerImpl implements R
}
- refactoredOntology =
OWLAPIToClerezzaConverter.clerezzaMGraphToOWLOntology(unionMGraph);
+ refactoredOntology =
OWLAPIToClerezzaConverter.clerezzaGraphToOWLOntology(unionMGraph);
if (refactoredOntology == null) {
throw new RefactoringException();
