Modified: incubator/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/MockOsgiContext.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/MockOsgiContext.java?rev=1205546&r1=1205545&r2=1205546&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/MockOsgiContext.java (original) +++ incubator/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/MockOsgiContext.java Wed Nov 23 19:44:38 2011 @@ -18,8 +18,11 @@ package org.apache.stanbol.ontologymanag import org.apache.clerezza.rdf.core.access.TcManager; import org.apache.clerezza.rdf.core.serializedform.Parser; +import org.apache.clerezza.rdf.core.serializedform.Serializer; import org.apache.clerezza.rdf.jena.parser.JenaParserProvider; +import org.apache.clerezza.rdf.jena.serializer.JenaSerializerProvider; import org.apache.clerezza.rdf.rdfjson.parser.RdfJsonParsingProvider; +import org.apache.clerezza.rdf.rdfjson.serializer.RdfJsonSerializingProvider; import org.apache.clerezza.rdf.simple.storage.SimpleTcProvider; public class MockOsgiContext { @@ -27,6 +30,8 @@ public class MockOsgiContext { public static Parser parser; public static TcManager tcManager; + + public static Serializer serializer; static { reset(); @@ -36,6 +41,10 @@ public class MockOsgiContext { tcManager = new TcManager(); tcManager.addWeightedTcProvider(new SimpleTcProvider()); + serializer = new Serializer(); + serializer.bindSerializingProvider(new JenaSerializerProvider()); + serializer.bindSerializingProvider(new RdfJsonSerializingProvider()); + parser = new Parser(); parser.bindParsingProvider(new JenaParserProvider()); parser.bindParsingProvider(new RdfJsonParsingProvider());
Modified: incubator/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyLibrary.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyLibrary.java?rev=1205546&r1=1205545&r2=1205546&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyLibrary.java (original) +++ incubator/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestOntologyLibrary.java Wed Nov 23 19:44:38 2011 @@ -125,7 +125,7 @@ public class TestOntologyLibrary { Dictionary<String,Object> regmanConf = new Hashtable<String,Object>(); regmanConf.put(RegistryManager.REGISTRY_LOCATIONS, new String[] {localTestRegistry.toString()}); // Instantiating the registry manager will also load the registry data. - regMgr = new RegistryManagerImpl(offline, new ClerezzaOntologyProvider(tcManager, offline, parser), + regMgr = new RegistryManagerImpl(offline, new ClerezzaOntologyProvider(tcManager, offline, parser,serializer), regmanConf); // The resulting manager must exist and have exactly one registry. @@ -167,7 +167,7 @@ public class TestOntologyLibrary { regmanConf.put(RegistryManager.REGISTRY_LOCATIONS, new String[] {localTestRegistry.toString()}); // Instantiating the registry manager will also load the registry data. regMgr = new RegistryManagerImpl(offline, new ClerezzaOntologyProvider(tcManager, - offline, parser), regmanConf); + offline, parser,serializer), regmanConf); assertNotNull(regMgr); // Now use this registry manager to instantiate an input source. 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=1205546&r1=1205545&r2=1205546&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 Wed Nov 23 19:44:38 2011 @@ -29,6 +29,7 @@ import java.util.Hashtable; import java.util.Set; import org.apache.clerezza.rdf.core.serializedform.Parser; +import org.apache.clerezza.rdf.core.serializedform.Serializer; import org.apache.clerezza.rdf.simple.storage.SimpleTcProvider; import org.apache.stanbol.ontologymanager.ontonet.api.ONManager; import org.apache.stanbol.ontologymanager.ontonet.api.OfflineConfiguration; @@ -68,7 +69,7 @@ public class TestOntologyRegistry { config.put(OfflineConfiguration.ONTOLOGY_PATHS, new String[] {"/ontologies", "/ontologies/registry"}); OfflineConfiguration offline = new OfflineConfigurationImpl(config); // The registry manager can be updated via calls to createModel() - regman = new RegistryManagerImpl(offline, new ClerezzaOntologyProvider(new SimpleTcProvider(),offline,new Parser()), config); + regman = new RegistryManagerImpl(offline, new ClerezzaOntologyProvider(new SimpleTcProvider(),offline,new Parser(), new Serializer()), config); // An ONManager with no storage support and same offline settings as the registry manager. onm = new ONManagerImpl(null, null, offline, config); } Modified: incubator/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestRegistryManager.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestRegistryManager.java?rev=1205546&r1=1205545&r2=1205546&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestRegistryManager.java (original) +++ incubator/stanbol/trunk/ontologymanager/registry/src/test/java/org/apache/stanbol/ontologymanager/registry/TestRegistryManager.java Wed Nov 23 19:44:38 2011 @@ -88,7 +88,7 @@ public class TestRegistryManager { @After public void cleanup() throws Exception { reset(); - provider = new ClerezzaOntologyProvider(tcManager, offline, parser); + provider = new ClerezzaOntologyProvider(tcManager, offline, parser,serializer); } /** Modified: incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeOntologyResource.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeOntologyResource.java?rev=1205546&r1=1205545&r2=1205546&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeOntologyResource.java (original) +++ incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeOntologyResource.java Wed Nov 23 19:44:38 2011 @@ -51,6 +51,7 @@ import org.semanticweb.owlapi.io.RDFXMLO import org.semanticweb.owlapi.model.AxiomType; import org.semanticweb.owlapi.model.IRI; import org.semanticweb.owlapi.model.OWLAxiom; +import org.semanticweb.owlapi.model.OWLImportsDeclaration; import org.semanticweb.owlapi.model.OWLOntology; import org.semanticweb.owlapi.model.OWLOntologyCreationException; import org.semanticweb.owlapi.model.OWLOntologyManager; @@ -179,12 +180,15 @@ public class ScopeOntologyResource exten } String res = null; try { +// for (OWLImportsDeclaration imp : ont.getImportsDeclarations()) +// System.out.println("DIOCALE "+imp); res = OntologyRenderUtils.renderOntology(ont, new RDFXMLOntologyFormat(), sciri.toString(), onm); } catch (OWLOntologyStorageException e) { throw new WebApplicationException(e, INTERNAL_SERVER_ERROR); } - return Response.ok(/* ont */res).build(); + return Response.ok(res).build(); + } else { ScopeRegistry reg = onm.getScopeRegistry(); String scopeID = uriInfo.getAbsolutePath().toString(); Modified: incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java?rev=1205546&r1=1205545&r2=1205546&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java (original) +++ incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java Wed Nov 23 19:44:38 2011 @@ -68,6 +68,7 @@ import org.apache.stanbol.ontologymanage import org.semanticweb.owlapi.model.IRI; import org.semanticweb.owlapi.model.OWLOntology; import org.semanticweb.owlapi.model.OWLOntologyCreationException; +import org.semanticweb.owlapi.model.UnloadableImportException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -102,7 +103,7 @@ public class ScopeResource extends BaseS throw new WebApplicationException(NOT_FOUND); } scope = onm.getScopeRegistry().getScope(scopeId); - + // // Skip null checks: the scope might be created with a PUT // if (scope == null) { // log.error("Scope {} not found", scopeId); @@ -154,6 +155,9 @@ public class ScopeResource extends BaseS scope.getCustomSpace().addOntology(new OntologyContentInputSource(content)); } catch (UnmodifiableOntologyCollectorException e) { throw new WebApplicationException(e, FORBIDDEN); + } catch (UnloadableImportException e) { + // TODO how can I add a meaningful message to the 404 ? + throw new WebApplicationException(e, Status.NOT_FOUND); } catch (OWLOntologyCreationException e) { throw new WebApplicationException(e, INTERNAL_SERVER_ERROR); } Modified: incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/PhonyIRIMapper.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/PhonyIRIMapper.java?rev=1205546&r1=1205545&r2=1205546&view=diff ============================================================================== --- incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/PhonyIRIMapper.java (original) +++ incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/PhonyIRIMapper.java Wed Nov 23 19:44:38 2011 @@ -56,6 +56,7 @@ public class PhonyIRIMapper implements O @Override public IRI getDocumentIRI(IRI arg0) { + if (exclusions==null) return blankIri; if (exclusions.contains(arg0)) return null; else return blankIri; } Modified: incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/OWLAPIToClerezzaConverter.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/OWLAPIToClerezzaConverter.java?rev=1205546&r1=1205545&r2=1205546&view=diff ============================================================================== --- incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/OWLAPIToClerezzaConverter.java (original) +++ incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/OWLAPIToClerezzaConverter.java Wed Nov 23 19:44:38 2011 @@ -127,6 +127,22 @@ public class OWLAPIToClerezzaConverter { public static OWLOntology clerezzaGraphToOWLOntology(TripleCollection graph, OWLOntologyManager ontologyManager) { + + /* + * The root graph can be serialized and de-serialized, but before that we should decide what to do + * with imports. We can proceed as follows: + * + * for each import statement, - check if the ontology manager has (1) an ontology or (2) a mapping. - + * if (1), just get it and add it to the merge pool - if (2), do nothing. the ontology manager should + * handle it when loading the root, - if neither, fetch the graph and call the procideure on it + * + * Alternatively, construct the whole reverse imports stack, then traverse it again, get the + * OWLOntology version for each (with the phony mapper set) and add it to the merge pool + * + * If it works, just add all the triples to a TripleCollection, but no, we don't want to store that + * change. + */ + ByteArrayOutputStream out = new ByteArrayOutputStream(); SerializingProvider serializingProvider = new JenaSerializerProvider(); serializingProvider.serialize(out, graph, SupportedFormat.RDF_XML); Modified: incubator/stanbol/trunk/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java?rev=1205546&r1=1205545&r2=1205546&view=diff ============================================================================== --- incubator/stanbol/trunk/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java (original) +++ incubator/stanbol/trunk/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java Wed Nov 23 19:44:38 2011 @@ -25,6 +25,7 @@ import java.util.Hashtable; import org.apache.clerezza.rdf.core.access.TcManager; import org.apache.clerezza.rdf.core.access.WeightedTcProvider; import org.apache.clerezza.rdf.core.serializedform.Parser; +import org.apache.clerezza.rdf.core.serializedform.Serializer; import org.apache.clerezza.rdf.core.sparql.QueryEngine; import org.apache.clerezza.rdf.jena.sparql.JenaSparqlEngine; import org.apache.clerezza.rdf.simple.storage.SimpleTcProvider; @@ -122,7 +123,8 @@ public class XMLReengineerTest { TcManager tcm = new SpecialTcManager(qe, wtcp); // Two different ontology storages, the same sparql engine and tcprovider - ONManager onManager = new ONManagerImpl(new ClerezzaOntologyProvider(tcm, offline, new Parser()), offline, emptyConf); + ONManager onManager = new ONManagerImpl(new ClerezzaOntologyProvider(tcm, offline, new Parser(), + new Serializer()), offline, emptyConf); xmlExtractor = new XMLExtractor(new ReengineerManagerImpl(emptyConf), onManager, emptyConf); }
