Author: alexdma
Date: Fri Sep 30 11:46:28 2011
New Revision: 1177617
URL: http://svn.apache.org/viewvc?rev=1177617&view=rev
Log:
Removed deprecated APIs for managing registries (STANBOL-285) and OWL ontology
managers for offline mode (STANBOL-178)
Removed:
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/api/RegistryLoader.java
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/impl/RegistryLoaderImpl.java
incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/io/RegistryIRISource.java
Modified:
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/impl/ONManagerImpl.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/renderers/SessionRenderer.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/OntologyConstants.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/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/session/TestSessions.java
incubator/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyRegistry.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/util/OntologyRenderUtils.java
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=1177617&r1=1177616&r2=1177617&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
Fri Sep 30 11:46:28 2011
@@ -24,7 +24,6 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
-import
org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OWLOntologyManagerFactoryImpl;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.OWLOntologyAlreadyExistsException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
@@ -35,7 +34,7 @@ import org.semanticweb.owlapi.model.OWLO
* therein.
*/
public interface ONManager {
-
+
/**
* The key used to configure the path of the ontology network
configuration.
*/
@@ -64,8 +63,6 @@ public interface ONManager {
* @return the default ontology index.
*/
OntologyIndex getOntologyIndex();
-
- OWLOntologyManagerFactoryImpl getOntologyManagerFactory();
/**
* Implementations should be able to create a {@link File} object from
this path.
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=1177617&r1=1177616&r2=1177617&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
Fri Sep 30 11:46:28 2011
@@ -54,7 +54,6 @@ import org.apache.stanbol.ontologymanage
import
org.apache.stanbol.ontologymanager.ontonet.conf.OntologyNetworkConfigurationUtils;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.InMemoryOntologyStorage;
-import
org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OWLOntologyManagerFactoryImpl;
import
org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyIndexImpl;
import
org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyScopeFactoryImpl;
import
org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologySpaceFactoryImpl;
@@ -161,8 +160,6 @@ public class ONManagerImpl implements ON
private OntologyIndex oIndex;
- private OWLOntologyManagerFactoryImpl omgrFactory;
-
private OntologyScopeFactory ontologyScopeFactory;
private OntologySpaceFactory ontologySpaceFactory;
@@ -294,7 +291,6 @@ public class ONManagerImpl implements ON
// Ok, go empty
}
- omgrFactory = new OWLOntologyManagerFactoryImpl(dirs);
owlFactory = OWLManager.getOWLDataFactory();
owlCacheManager =
OWLOntologyManagerFactory.createOWLOntologyManager(offline
.getOntologySourceLocations().toArray(new IRI[0]));
@@ -320,7 +316,8 @@ public class ONManagerImpl implements ON
if (configPath != null && !configPath.trim().isEmpty()) {
OWLOntology oConf = null;
- OWLOntologyManager tempMgr =
omgrFactory.createOntologyManager(true);
+ OWLOntologyManager tempMgr =
OWLOntologyManagerFactory.createOWLOntologyManager(offline
+ .getOntologySourceLocations().toArray(new IRI[0]));
OWLOntologyDocumentSource oConfSrc = null;
try {
@@ -383,8 +380,10 @@ public class ONManagerImpl implements ON
// Now create everything that depends on the Storage object.
// These may require the OWL cache manager
- ontologySpaceFactory = new OntologySpaceFactoryImpl(scopeRegistry,
storage, offline,IRI.create(getOntologyNetworkNamespace()));
- ontologyScopeFactory = new OntologyScopeFactoryImpl(scopeRegistry,
IRI.create(getOntologyNetworkNamespace()),ontologySpaceFactory);
+ ontologySpaceFactory = new OntologySpaceFactoryImpl(scopeRegistry,
storage, offline,
+ IRI.create(getOntologyNetworkNamespace()));
+ ontologyScopeFactory = new OntologyScopeFactoryImpl(scopeRegistry,
+ IRI.create(getOntologyNetworkNamespace()),
ontologySpaceFactory);
ontologyScopeFactory.addScopeEventListener(oIndex);
// // This requires the OWL cache manager
@@ -516,10 +515,6 @@ public class ONManagerImpl implements ON
return oIndex;
}
- public OWLOntologyManagerFactoryImpl getOntologyManagerFactory() {
- return omgrFactory;
- }
-
@Override
public String getOntologyNetworkConfigurationPath() {
return configPath;
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=1177617&r1=1177616&r2=1177617&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
Fri Sep 30 11:46:28 2011
@@ -418,6 +418,13 @@ public abstract class AbstractOntologySp
listeners.remove(listener);
}
+ /**
+ *
+ * @param id
+ * The ontology space identifier. This implementation only
allows non-null and non-empty
+ * alphanumeric sequences, case-sensitive and preferably
separated by a single slash character,
+ * with optional dashes or underscores.
+ */
protected void setID(String id) {
if (id == null) throw new IllegalArgumentException("Space ID cannot be
null.");
id = id.trim();
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/renderers/SessionRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/renderers/SessionRenderer.java?rev=1177617&r1=1177616&r2=1177617&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/renderers/SessionRenderer.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/renderers/SessionRenderer.java
Fri Sep 30 11:46:28 2011
@@ -1,19 +1,19 @@
/*
-* 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.impl.renderers;
import java.util.LinkedList;
@@ -40,102 +40,47 @@ import org.slf4j.LoggerFactory;
public class SessionRenderer {
- private static OWLDataFactory __factory =
OWLManager.getOWLDataFactory();
+ private static OWLDataFactory __factory = OWLManager.getOWLDataFactory();
- private static final IRI _sessionIri = IRI
-
.create("http://kres.iks-project.eu/ontology/onm/meta.owl#Session";);
+ private static final IRI _sessionIri = IRI
+
.create("http://kres.iks-project.eu/ontology/onm/meta.owl#Session";);
- private static final IRI _hasIdIri = IRI
-
.create("http://kres.iks-project.eu/ontology/onm/meta.owl#hasID";);
+ private static final IRI _hasIdIri =
IRI.create("http://kres.iks-project.eu/ontology/onm/meta.owl#hasID";);
- private static OWLClass cSession = __factory.getOWLClass(_sessionIri);
-
- private static OWLDataProperty hasId = __factory
- .getOWLDataProperty(_hasIdIri);
-
- static {
-
- }
-
- @Deprecated
- public static String getSessionMetadataRDF(Session session) {
- OWLOntologyManager mgr = OWLManager.createOWLOntologyManager();
- OWLOntology ont = null;
- try {
- ont = mgr.createOntology(IRI.create(session.getID() +
"/meta.owl"));
- } catch (OWLOntologyCreationException e) {
- LoggerFactory
- .getLogger(ScopeSetRenderer.class)
- .error(
- "KReS :: could not
create empty ontology for rendering sesion metadata.",
- e);
- return null;
- }
-
- List<OWLOntologyChange> additions = new
LinkedList<OWLOntologyChange>();
-
- OWLNamedIndividual iSes =
__factory.getOWLNamedIndividual(session
- .getID());
- additions.add(new AddAxiom(ont,
__factory.getOWLClassAssertionAxiom(
- cSession, iSes)));
- OWLDatatype anyURI = __factory.getOWLDatatype(IRI
-
.create("http://www.w3.org/2001/XMLSchema#anyURI";));
- OWLLiteral hasIdValue = __factory.getOWLTypedLiteral(session
- .getID().toString(), anyURI);
- additions.add(new AddAxiom(ont, __factory
- .getOWLDataPropertyAssertionAxiom(hasId, iSes,
hasIdValue)));
- mgr.applyChanges(additions);
-
- StringDocumentTarget tgt = new StringDocumentTarget();
- try {
- mgr.saveOntology(ont, new RDFXMLOntologyFormat(), tgt);
- } catch (OWLOntologyStorageException e) {
- LoggerFactory.getLogger(ScopeSetRenderer.class).error(
- "KReS :: could not save session
metadata ontology.", e);
- }
- return tgt.toString();
-
- }
-
-
- public static OWLOntology getSessionMetadataRDFasOntology(Session
session) {
- OWLOntologyManager mgr = OWLManager.createOWLOntologyManager();
- OWLOntology ont = null;
- try {
- ont = mgr.createOntology(IRI.create(session.getID() +
"/meta.owl"));
- } catch (OWLOntologyCreationException e) {
- LoggerFactory
- .getLogger(ScopeSetRenderer.class)
- .error(
- "KReS :: could not
create empty ontology for rendering sesion metadata.",
- e);
- return null;
- }
-
- List<OWLOntologyChange> additions = new
LinkedList<OWLOntologyChange>();
-
- OWLNamedIndividual iSes =
__factory.getOWLNamedIndividual(session
- .getID());
- additions.add(new AddAxiom(ont,
__factory.getOWLClassAssertionAxiom(
- cSession, iSes)));
- OWLDatatype anyURI = __factory.getOWLDatatype(IRI
-
.create("http://www.w3.org/2001/XMLSchema#anyURI";));
- OWLLiteral hasIdValue = __factory.getOWLTypedLiteral(session
- .getID().toString(), anyURI);
- additions.add(new AddAxiom(ont, __factory
- .getOWLDataPropertyAssertionAxiom(hasId, iSes,
hasIdValue)));
- mgr.applyChanges(additions);
-
- StringDocumentTarget tgt = new StringDocumentTarget();
- try {
- mgr.saveOntology(ont, new RDFXMLOntologyFormat(), tgt);
- return ont;
- } catch (OWLOntologyStorageException e) {
-
LoggerFactory.getLogger(ScopeSetRenderer.class).error("KReS :: could not save
session metadata ontology.", e);
- return null;
- }
-
+ private static OWLClass cSession = __factory.getOWLClass(_sessionIri);
- }
+ private static OWLDataProperty hasId =
__factory.getOWLDataProperty(_hasIdIri);
+
+ public static OWLOntology getSessionMetadataRDFasOntology(Session session)
{
+ OWLOntologyManager mgr = OWLManager.createOWLOntologyManager();
+ OWLOntology ont = null;
+ try {
+ ont = mgr.createOntology(IRI.create(session.getID() +
"/meta.owl"));
+ } catch (OWLOntologyCreationException e) {
+ LoggerFactory.getLogger(ScopeSetRenderer.class).error(
+ "KReS :: could not create empty ontology for rendering sesion
metadata.", e);
+ return null;
+ }
+
+ List<OWLOntologyChange> additions = new
LinkedList<OWLOntologyChange>();
+
+ OWLNamedIndividual iSes =
__factory.getOWLNamedIndividual(session.getID());
+ additions.add(new AddAxiom(ont,
__factory.getOWLClassAssertionAxiom(cSession, iSes)));
+ OWLDatatype anyURI =
__factory.getOWLDatatype(IRI.create("http://www.w3.org/2001/XMLSchema#anyURI";));
+ OWLLiteral hasIdValue =
__factory.getOWLTypedLiteral(session.getID().toString(), anyURI);
+ additions.add(new AddAxiom(ont,
__factory.getOWLDataPropertyAssertionAxiom(hasId, iSes, hasIdValue)));
+ mgr.applyChanges(additions);
+
+ StringDocumentTarget tgt = new StringDocumentTarget();
+ try {
+ mgr.saveOntology(ont, new RDFXMLOntologyFormat(), tgt);
+ return ont;
+ } catch (OWLOntologyStorageException e) {
+ LoggerFactory.getLogger(ScopeSetRenderer.class).error(
+ "KReS :: could not save session metadata ontology.", e);
+ return null;
+ }
+
+ }
}
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/TimestampedSessionIDGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/TimestampedSessionIDGenerator.java?rev=1177617&r1=1177616&r2=1177617&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/TimestampedSessionIDGenerator.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/TimestampedSessionIDGenerator.java
Fri Sep 30 11:46:28 2011
@@ -1,19 +1,19 @@
/*
-* 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.impl.session;
import java.util.Date;
@@ -23,38 +23,36 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.impl.util.StringUtils;
import org.semanticweb.owlapi.model.IRI;
-
public class TimestampedSessionIDGenerator implements SessionIDGenerator {
- private IRI baseIRI;
+ private IRI baseIRI;
- public TimestampedSessionIDGenerator(IRI baseIRI) {
- this.baseIRI = baseIRI;
- }
-
- @Override
- public IRI createSessionID() {
- return IRI.create(StringUtils.stripIRITerminator(baseIRI) +
"/session/"
- + new Date().getTime());
- }
-
- @Override
- public IRI createSessionID(Set<IRI> exclude) {
- IRI id = null;
- do {
- id = createSessionID();
- } while (exclude.contains(id));
- return id;
- }
-
- @Override
- public IRI getBaseIRI() {
- return baseIRI;
- }
-
- @Override
- public void setBaseIRI(IRI baseIRI) {
- this.baseIRI = baseIRI;
- }
+ public TimestampedSessionIDGenerator(IRI baseIRI) {
+ this.baseIRI = baseIRI;
+ }
+
+ @Override
+ public IRI createSessionID() {
+ return IRI.create(StringUtils.stripIRITerminator(baseIRI) +
"/session/" + new Date().getTime());
+ }
+
+ @Override
+ public IRI createSessionID(Set<IRI> exclude) {
+ IRI id = null;
+ do {
+ id = createSessionID();
+ } while (exclude.contains(id));
+ return id;
+ }
+
+ @Override
+ public IRI getBaseIRI() {
+ return baseIRI;
+ }
+
+ @Override
+ public void setBaseIRI(IRI baseIRI) {
+ this.baseIRI = baseIRI;
+ }
}
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/util/OntologyConstants.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/util/OntologyConstants.java?rev=1177617&r1=1177616&r2=1177617&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/util/OntologyConstants.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/util/OntologyConstants.java
Fri Sep 30 11:46:28 2011
@@ -18,9 +18,9 @@ package org.apache.stanbol.ontologymanag
public class OntologyConstants {
- public static final String NS__KRES = "http://kres.iks-project.eu/";;
+ public static final String NS_STANBOL = "http://stanbol.apache.org/";;
- public static final String NS__ODP =
"http://www.ontologydesignpatterns.org/";;
+ public static final String NS_ODP =
"http://www.ontologydesignpatterns.org/";;
- public static final String NS_ONM = NS__KRES + "ontology/meta/onm.owl#";
+ public static final String NS_ONM = NS_STANBOL +
"ontology/meta/onm.owl#";
}
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=1177617&r1=1177616&r2=1177617&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
Fri Sep 30 11:46:28 2011
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.FileWriter;
import java.net.URI;
import java.net.URL;
+import java.util.Dictionary;
import java.util.Hashtable;
import java.util.Set;
@@ -31,6 +32,8 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.io.ParentPathInputSource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
+import
org.apache.stanbol.ontologymanager.ontonet.impl.OfflineConfigurationImpl;
+import org.apache.stanbol.owl.OWLOntologyManagerFactory;
import org.junit.BeforeClass;
import org.junit.Test;
import org.semanticweb.owlapi.io.WriterDocumentTarget;
@@ -52,7 +55,8 @@ public class TestOntologyInputSources {
@BeforeClass
public static void setUp() {
- onm = new ONManagerImpl(null, null, new Hashtable<String,Object>());
+ Dictionary<String,Object> onmconf = new Hashtable<String,Object>();
+ onm = new ONManagerImpl(null, null, new
OfflineConfigurationImpl(onmconf), onmconf);
df = onm.getOwlFactory();
}
@@ -73,7 +77,7 @@ public class TestOntologyInputSources {
assertNull(mapper.getDocumentIRI(dummyiri));
// Create a new ontology in the test resources.
- OWLOntologyManager mgr =
onm.getOntologyManagerFactory().createOntologyManager(false);
+ OWLOntologyManager mgr =
OWLOntologyManagerFactory.createOWLOntologyManager(null);
OWLOntology o = mgr.createOntology(dummyiri);
File f = new File(URI.create(url.toString() + "/dummycharacters.owl"));
mgr.saveOntology(o, new WriterDocumentTarget(new FileWriter(f)));
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestIndexing.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestIndexing.java?rev=1177617&r1=1177616&r2=1177617&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestIndexing.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestIndexing.java
Fri Sep 30 11:46:28 2011
@@ -27,6 +27,7 @@ import java.util.Dictionary;
import java.util.Hashtable;
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.OfflineConfiguration;
import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.ParentPathInputSource;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyIndex;
@@ -34,6 +35,7 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
import
org.apache.stanbol.ontologymanager.ontonet.impl.OfflineConfigurationImpl;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
+import org.apache.stanbol.owl.OWLOntologyManagerFactory;
import org.junit.BeforeClass;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
@@ -57,10 +59,12 @@ public class TestIndexing {
@BeforeClass
public static void setup() {
final Dictionary<String,Object> emptyConfig = new
Hashtable<String,Object>();
-// RegistryManager regman = new RegistryManagerImpl(emptyConfig);
+ final OfflineConfiguration offline = new
OfflineConfigurationImpl(emptyConfig);
+ // RegistryManager regman = new RegistryManagerImpl(emptyConfig);
// An ONManagerImpl with no store and default settings
- onm = new ONManagerImpl(null, null, new
OfflineConfigurationImpl(emptyConfig), emptyConfig);
- mgr = onm.getOntologyManagerFactory().createOntologyManager(true);
+ onm = new ONManagerImpl(null, null, offline, emptyConfig);
+ mgr =
OWLOntologyManagerFactory.createOWLOntologyManager(offline.getOntologySourceLocations()
+ .toArray(new IRI[0]));
// Since it is registered, this scope must be unique, or subsequent
// tests will fail on duplicate ID exceptions!
@@ -77,23 +81,23 @@ public class TestIndexing {
}
// The factory call also invokes loadRegistriesEager() and
// gatherOntologies() so no need to test them individually.
-// try {
-// scope = onm.getOntologyScopeFactory().createOntologyScope(
-// scopeIri,
-// new RegistryIRISource(testRegistryIri,
onm.getOwlCacheManager(), onm
-// .getRegistryLoader(), null
-// // new RootOntologySource(oParent
-// ));
-//
-// onm.getScopeRegistry().registerScope(scope);
-// } catch (DuplicateIDException e) {
-// // Uncomment if annotated with @BeforeClass instead of @Before ,
-// // comment otherwise.
-// fail("DuplicateID exception caught when creating test scope.");
-// }
+ // try {
+ // scope = onm.getOntologyScopeFactory().createOntologyScope(
+ // scopeIri,
+ // new RegistryIRISource(testRegistryIri, onm.getOwlCacheManager(), onm
+ // .getRegistryLoader(), null
+ // // new RootOntologySource(oParent
+ // ));
+ //
+ // onm.getScopeRegistry().registerScope(scope);
+ // } catch (DuplicateIDException e) {
+ // // Uncomment if annotated with @BeforeClass instead of @Before ,
+ // // comment otherwise.
+ // fail("DuplicateID exception caught when creating test scope.");
+ // }
}
-// @Test
+ // @Test
public void testAddOntology() throws Exception {
OntologyIndex index = onm.getOntologyIndex();
@@ -120,7 +124,7 @@ public class TestIndexing {
assertFalse(index.isOntologyLoaded(iri_minor));
}
-// @Test
+ // @Test
public void testGetOntology() throws Exception {
// Load the original objectRole ODP
OWLOntology oObjRole = mgr.loadOntology(iri_main);
@@ -133,7 +137,7 @@ public class TestIndexing {
// assertEquals(index.getOntology(objrole), oObjRole);
}
-// @Test
+ // @Test
public void testIsOntologyLoaded() {
OntologyIndex index = onm.getOntologyIndex();
IRI coreroot = IRI.create(scopeIri + "/core/root.owl");
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=1177617&r1=1177616&r2=1177617&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
Fri Sep 30 11:46:28 2011
@@ -16,7 +16,10 @@
*/
package org.apache.stanbol.ontologymanager.ontonet.ontology;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -35,6 +38,7 @@ import org.apache.stanbol.ontologymanage
import
org.apache.stanbol.ontologymanager.ontonet.impl.ontology.CoreOntologySpaceImpl;
import
org.apache.stanbol.ontologymanager.ontonet.impl.ontology.CustomOntologySpaceImpl;
import
org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyScopeFactoryImpl;
+import org.apache.stanbol.owl.OWLOntologyManagerFactory;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -70,7 +74,7 @@ public class TestOntologyScope {
onm = new ONManagerImpl(null, null, new
OfflineConfigurationImpl(onmconf), onmconf);
factory = onm.getOntologyScopeFactory();
if (factory == null) fail("Could not instantiate ontology space
factory");
- OWLOntologyManager mgr =
onm.getOntologyManagerFactory().createOntologyManager(true);
+ OWLOntologyManager mgr =
OWLOntologyManagerFactory.createOWLOntologyManager(null);
try {
src1 = new RootOntologySource(mgr.createOntology(baseIri), null);
src2 = new RootOntologySource(mgr.createOntology(baseIri2), null);
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=1177617&r1=1177616&r2=1177617&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
Fri Sep 30 11:46:28 2011
@@ -18,6 +18,7 @@ package org.apache.stanbol.ontologymanag
import static org.junit.Assert.*;
+import java.util.Dictionary;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.Set;
@@ -36,6 +37,8 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.session.Session.State;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
+import
org.apache.stanbol.ontologymanager.ontonet.impl.OfflineConfigurationImpl;
+import org.apache.stanbol.owl.OWLOntologyManagerFactory;
import org.junit.BeforeClass;
import org.junit.Test;
import org.semanticweb.owlapi.model.IRI;
@@ -61,15 +64,16 @@ public class TestSessions {
@BeforeClass
public static void setup() {
+ Dictionary<String,Object> onmconf = new Hashtable<String,Object>();
// An ONManagerImpl with no store and default settings
- ONManager onm = new ONManagerImpl(null, null, new
Hashtable<String,Object>());
+ ONManager onm = new ONManagerImpl(null, null, new
OfflineConfigurationImpl(onmconf), onmconf);
sesmgr = onm.getSessionManager();
scopeFactory = onm.getOntologyScopeFactory();
spaceFactory = onm.getOntologySpaceFactory();
scopeRegistry = onm.getScopeRegistry();
- if (spaceFactory == null) fail("Could not instantiate ontology space
factory");
- if (scopeFactory == null) fail("Could not instantiate ontology scope
factory");
- OWLOntologyManager mgr =
onm.getOntologyManagerFactory().createOntologyManager(true);
+ assertNotNull(spaceFactory);
+ assertNotNull(scopeFactory);
+ OWLOntologyManager mgr =
OWLOntologyManagerFactory.createOWLOntologyManager(null);
try {
src1 = new RootOntologySource(mgr.createOntology(baseIri), null);
src2 = new RootOntologySource(mgr.createOntology(baseIri2), null);
Modified:
incubator/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyRegistry.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyRegistry.java?rev=1177617&r1=1177616&r2=1177617&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyRegistry.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyRegistry.java
Fri Sep 30 11:46:28 2011
@@ -16,7 +16,9 @@
*/
package org.apache.stanbol.ontologymanager.registry;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.net.URL;
@@ -28,9 +30,6 @@ import java.util.Set;
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.OfflineConfiguration;
-import
org.apache.stanbol.ontologymanager.ontonet.api.ontology.CoreOntologySpace;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
-import
org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import
org.apache.stanbol.ontologymanager.ontonet.impl.OfflineConfigurationImpl;
import org.apache.stanbol.ontologymanager.registry.api.RegistryManager;
@@ -38,7 +37,6 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.registry.api.model.RegistryItem;
import org.apache.stanbol.ontologymanager.registry.api.model.RegistryOntology;
import org.apache.stanbol.ontologymanager.registry.impl.RegistryManagerImpl;
-import org.apache.stanbol.ontologymanager.registry.io.RegistryIRISource;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -53,7 +51,6 @@ import org.semanticweb.owlapi.util.AutoI
public class TestOntologyRegistry {
private String scopeIri = "Scope";
- private static RegistryIRISource ontologySource; // Null until the
RegistryIRISource stays in place.
private static ONManager onm;
private static RegistryManager regman;
private OWLOntologyManager virginOntologyManager;
@@ -151,45 +148,45 @@ public class TestOntologyRegistry {
}
}
- /**
- * Verifies that the addition of a null or valid registry source to a
session space works.
- */
- @Test
- public void testAddRegistryToSessionSpace() throws Exception {
- SessionOntologySpace space = null;
- space =
onm.getOntologySpaceFactory().createSessionOntologySpace(scopeIri);
- space.setUp();
- // space.addOntology(new
- //
OntologyRegistryIRISource(testRegistryIri,onm.getOwlCacheManager(),onm.getRegistryLoader()));
- space.addOntology(ontologySource);
- // FIXME : no longer use the top ontology?
- assertTrue(space.asOWLOntology() != null);
- assertTrue(space.getOntologies(true).contains(space.asOWLOntology()));
- }
-
- /**
- * Verifies that an ontology scope with a null or valid registry source is
created correctly.
- */
- @Test
- public void testScopeCreationWithRegistry() throws Exception {
- OntologyScope scope = null;
- // The input source instantiation automatically loads the entire
content of a registry, no need to
- // test loading methods individually.
- scope = onm.getOntologyScopeFactory().createOntologyScope(scopeIri,
ontologySource);
- assertTrue(scope != null && scope.getCoreSpace().asOWLOntology() !=
null);
- }
-
- /**
- * Verifies that an ontology space with a null or valid registry source is
created correctly.
- */
- @Test
- public void testSpaceCreationWithRegistry() throws Exception {
- // setupOfflineMapper();
- CoreOntologySpace space = null;
- // The input source instantiation automatically loads the entire
content of a registry, no need to
- // test loading methods individually.
- space =
onm.getOntologySpaceFactory().createCoreOntologySpace(scopeIri, ontologySource);
- assertTrue(space != null && space.asOWLOntology() != null);
- }
+ // /**
+ // * Verifies that the addition of a null or valid registry source to a
session space works.
+ // */
+ // @Test
+ // public void testAddRegistryToSessionSpace() throws Exception {
+ // SessionOntologySpace space = null;
+ // space =
onm.getOntologySpaceFactory().createSessionOntologySpace(scopeIri);
+ // space.setUp();
+ // // space.addOntology(new
+ // //
OntologyRegistryIRISource(testRegistryIri,onm.getOwlCacheManager(),onm.getRegistryLoader()));
+ // space.addOntology(ontologySource);
+ // // FIXME : no longer use the top ontology?
+ // assertTrue(space.asOWLOntology() != null);
+ // assertTrue(space.getOntologies(true).contains(space.asOWLOntology()));
+ // }
+ //
+ // /**
+ // * Verifies that an ontology scope with a null or valid registry source
is created correctly.
+ // */
+ // @Test
+ // public void testScopeCreationWithRegistry() throws Exception {
+ // OntologyScope scope = null;
+ // // The input source instantiation automatically loads the entire
content of a registry, no need to
+ // // test loading methods individually.
+ // scope = onm.getOntologyScopeFactory().createOntologyScope(scopeIri,
ontologySource);
+ // assertTrue(scope != null && scope.getCoreSpace().asOWLOntology() !=
null);
+ // }
+ //
+ // /**
+ // * Verifies that an ontology space with a null or valid registry source
is created correctly.
+ // */
+ // @Test
+ // public void testSpaceCreationWithRegistry() throws Exception {
+ // // setupOfflineMapper();
+ // CoreOntologySpace space = null;
+ // // The input source instantiation automatically loads the entire
content of a registry, no need to
+ // // test loading methods individually.
+ // space = onm.getOntologySpaceFactory().createCoreOntologySpace(scopeIri,
ontologySource);
+ // assertTrue(space != null && space.asOWLOntology() != null);
+ // }
}
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java?rev=1177617&r1=1177616&r2=1177617&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java
Fri Sep 30 11:46:28 2011
@@ -51,11 +51,8 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import
org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
-import org.apache.stanbol.ontologymanager.ontonet.impl.util.StringUtils;
-import org.apache.stanbol.ontologymanager.registry.api.RegistryLoader;
import org.apache.stanbol.ontologymanager.registry.api.RegistryManager;
-import org.apache.stanbol.ontologymanager.registry.impl.RegistryLoaderImpl;
-import org.apache.stanbol.ontologymanager.registry.io.RegistryIRISource;
+import org.apache.stanbol.ontologymanager.registry.io.LibrarySource;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.slf4j.Logger;
@@ -77,8 +74,6 @@ public class ONMScopeResource extends Ba
*/
protected RegistryManager regMgr;
- protected RegistryLoader loader;
-
protected ClerezzaOntologyStorage storage;
public ONMScopeResource(@Context ServletContext servletContext) {
@@ -86,7 +81,6 @@ public class ONMScopeResource extends Ba
this.onm = (ONManager)
ContextHelper.getServiceFromContext(ONManager.class, servletContext);
this.regMgr = (RegistryManager)
ContextHelper.getServiceFromContext(RegistryManager.class,
servletContext);
- loader = new RegistryLoaderImpl(regMgr, onm);
this.storage = (ClerezzaOntologyStorage)
ContextHelper.getServiceFromContext(
ClerezzaOntologyStorage.class, servletContext);
}
@@ -111,7 +105,7 @@ public class ONMScopeResource extends Ba
@Context HttpHeaders headers,
@Context ServletContext servletContext) {
ScopeRegistry reg = onm.getScopeRegistry();
- OntologyScope scope = reg.getScope(scopeid/*
IRI.create(uriInfo.getAbsolutePath()) */);
+ OntologyScope scope = reg.getScope(scopeid/*
IRI.create(uriInfo.getAbsolutePath()) */);
if (scope == null) return Response.status(NOT_FOUND).build();
else return Response.ok(scope.asOWLOntology()).build();
}
@@ -196,7 +190,8 @@ public class ONMScopeResource extends Ba
// First thing, check the core source.
try {
- coreSrc = new RegistryIRISource(IRI.create(coreRegistry),
onm.getOwlCacheManager(), loader);
+ coreSrc = new LibrarySource(IRI.create(coreRegistry), regMgr,
onm.getOwlCacheManager());
+ // coreSrc = new RegistryIRISource(IRI.create(coreRegistry),
onm.getOwlCacheManager(), loader);
} catch (Exception e1) {
// Bad or not supplied core registry, try the ontology.
try {
@@ -211,7 +206,9 @@ public class ONMScopeResource extends Ba
if (customOntology != null || customRegistry != null) {
// ...but if it was, be prepared to throw exceptions.
try {
- custSrc = new RegistryIRISource(IRI.create(customRegistry),
onm.getOwlCacheManager(), loader);
+ coreSrc = new LibrarySource(IRI.create(customRegistry),
regMgr, onm.getOwlCacheManager());
+ // custSrc = new RegistryIRISource(IRI.create(customRegistry),
onm.getOwlCacheManager(),
+ // loader);
} catch (Exception e1) {
// Bad or not supplied custom registry, try the ontology.
try {
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyRenderUtils.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyRenderUtils.java?rev=1177617&r1=1177616&r2=1177617&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyRenderUtils.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyRenderUtils.java
Fri Sep 30 11:46:28 2011
@@ -21,6 +21,7 @@ import java.util.List;
import org.apache.stanbol.commons.web.base.format.KRFormat;
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
+import org.apache.stanbol.owl.OWLOntologyManagerFactory;
import org.coode.owlapi.manchesterowlsyntax.ManchesterOWLSyntaxOntologyFormat;
import org.coode.owlapi.turtle.TurtleOntologyFormat;
import org.semanticweb.owlapi.io.OWLFunctionalSyntaxOntologyFormat;
@@ -60,7 +61,7 @@ public class OntologyRenderUtils {
public static String renderOntology(OWLOntology ont,
OWLOntologyFormat format, String rewritePrefix,
ONManager onm)
throws OWLOntologyStorageException {
- OWLOntologyManager tmpmgr =
onm.getOntologyManagerFactory().createOntologyManager(true);
+ OWLOntologyManager tmpmgr =
OWLOntologyManagerFactory.createOWLOntologyManager(null);
OWLDataFactory df = tmpmgr.getOWLDataFactory();
// Now the hack
@@ -111,7 +112,7 @@ public class OntologyRenderUtils {
public static String renderOntology(OWLOntology ont, String format,
String rewritePrefix, ONManager onm)
throws OWLOntologyStorageException {
- OWLOntologyManager tmpmgr =
onm.getOntologyManagerFactory().createOntologyManager(true);
+ OWLOntologyManager tmpmgr =
OWLOntologyManagerFactory.createOWLOntologyManager(null);
OWLDataFactory df = tmpmgr.getOWLDataFactory();
StringDocumentTarget tgt = new StringDocumentTarget();
