Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/AbstractOntologySpaceImpl.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/AbstractOntologySpaceImpl.java?rev=1229274&r1=1229273&r2=1229274&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/AbstractOntologySpaceImpl.java (original) +++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/AbstractOntologySpaceImpl.java Mon Jan 9 17:44:30 2012 @@ -25,6 +25,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.clerezza.rdf.core.TripleCollection; +import org.apache.clerezza.rdf.core.UriRef; +import org.apache.clerezza.rdf.core.impl.SimpleMGraph; +import org.apache.clerezza.rdf.core.impl.TripleImpl; +import org.apache.clerezza.rdf.ontologies.OWL; import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource; import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyCollectorListener; import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyCollectorModificationException; @@ -126,9 +131,16 @@ public abstract class AbstractOntologySp public void addListener(OntologyCollectorListener listener) { listeners.add(listener); } + + @SuppressWarnings("unchecked") + @Override + public <O> O export(Class<O> returnType, boolean merge) { + if (OWLOntology.class.isAssignableFrom(returnType)) return (O) asOWLOntology(merge); + throw new UnsupportedOperationException("Cannot export to " + returnType); + } @Override - public synchronized void addOntology(OntologyInputSource<?> ontologySource) throws UnmodifiableOntologyCollectorException { + public synchronized String addOntology(OntologyInputSource<?,?> ontologySource) throws UnmodifiableOntologyCollectorException { if (locked) throw new UnmodifiableOntologyCollectorException(this); log.debug("Trying to add ontology {} to space {}", ontologySource != null ? ontologySource.getRootOntology() : "<NULL>", getNamespace() + getID()); @@ -145,7 +157,9 @@ public abstract class AbstractOntologySp } else throw new UnsupportedOperationException( "This ontology space implementation can only handle " + OWLOntology.class + " input sources."); - } else return; // No ontology to add + } + if (o!=null) return o.getOntologyID().toString(); + else return null; // No ontology to add } @Override @@ -297,7 +311,7 @@ public abstract class AbstractOntologySp return locked; } - private void performAdd(OntologyInputSource<?> ontSrc) { + private void performAdd(OntologyInputSource<?,?> ontSrc) { Object obj = ontSrc.getRootOntology(); OWLOntology ontology = (OWLOntology) obj;
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/OWLAPIOntologyProvider.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/OWLAPIOntologyProvider.java?rev=1229274&r1=1229273&r2=1229274&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/OWLAPIOntologyProvider.java (original) +++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/OWLAPIOntologyProvider.java Mon Jan 9 17:44:30 2012 @@ -20,6 +20,7 @@ import java.io.InputStream; import java.util.HashSet; import java.util.Set; +import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ImportManagementPolicy; import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyProvider; import org.apache.stanbol.owl.util.OWLUtils; import org.semanticweb.owlapi.apibinding.OWLManager; @@ -61,6 +62,11 @@ public class OWLAPIOntologyProvider impl } @Override + public ImportManagementPolicy getImportManagementPolicy() { + return ImportManagementPolicy.PRESERVE; + } + + @Override public String getKey(IRI ontologyIRI) { return ontologyIRI.toString(); } @@ -150,4 +156,10 @@ public class OWLAPIOntologyProvider impl throw new UnsupportedOperationException("Not implemented for OWL API version."); } + @Override + public void setImportManagementPolicy(ImportManagementPolicy policy) { + if (!ImportManagementPolicy.PRESERVE.equals(policy)) throw new IllegalArgumentException( + "The OWL API implementation does not support import policies other than PRESERVE."); + } + } Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/OntologySpaceFactoryImpl.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/OntologySpaceFactoryImpl.java?rev=1229274&r1=1229273&r2=1229274&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/OntologySpaceFactoryImpl.java (original) +++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/owlapi/OntologySpaceFactoryImpl.java Mon Jan 9 17:44:30 2012 @@ -63,7 +63,7 @@ public class OntologySpaceFactoryImpl im * @param scopeID * @param rootSource */ - private void configureSpace(OntologySpace s, String scopeID, OntologyInputSource<?>... ontologySources) { + private void configureSpace(OntologySpace s, String scopeID, OntologyInputSource<?,?>... ontologySources) { // FIXME: ensure that this is not null AND convert to using Strings for scope IDs OntologyScope parentScope = registry.getScope(scopeID); @@ -71,7 +71,7 @@ public class OntologySpaceFactoryImpl im .addListener((OntologyCollectorListener) parentScope); // Set the supplied ontology's parent as the root for this space. if (ontologySources != null) try { - for (OntologyInputSource<?> src : ontologySources) + for (OntologyInputSource<?,?> src : ontologySources) s.addOntology(src); } catch (UnmodifiableOntologyCollectorException e) { log.error("Ontology space " + s.getID() + " was found locked at creation time!", e); @@ -80,7 +80,7 @@ public class OntologySpaceFactoryImpl im } @Override - public CoreOntologySpace createCoreOntologySpace(String scopeId, OntologyInputSource<?>... coreSources) { + public CoreOntologySpace createCoreOntologySpace(String scopeId, OntologyInputSource<?,?>... coreSources) { CoreOntologySpace s = new CoreOntologySpaceImpl(scopeId, namespace, /* storage, */ OWLOntologyManagerFactory.createOWLOntologyManager(offline.getOntologySourceLocations().toArray( new IRI[0]))); @@ -90,7 +90,7 @@ public class OntologySpaceFactoryImpl im @Override public CustomOntologySpace createCustomOntologySpace(String scopeId, - OntologyInputSource<?>... customSources) { + OntologyInputSource<?,?>... customSources) { CustomOntologySpace s = new CustomOntologySpaceImpl(scopeId, namespace, /* storage, */ OWLOntologyManagerFactory.createOWLOntologyManager(offline.getOntologySourceLocations().toArray( new IRI[0]))); @@ -101,7 +101,7 @@ public class OntologySpaceFactoryImpl im @Override public OntologySpace createOntologySpace(String scopeId, SpaceType type, - OntologyInputSource<?>... ontologySources) { + OntologyInputSource<?,?>... ontologySources) { switch (type) { case CORE: return createCoreOntologySpace(scopeId, ontologySources); @@ -116,11 +116,11 @@ public class OntologySpaceFactoryImpl im @Override public SessionOntologySpace createSessionOntologySpace(String scopeId, - OntologyInputSource<?>... sessionSources) { + OntologyInputSource<?,?>... sessionSources) { SessionOntologySpace s = new SessionOntologySpaceImpl(scopeId, namespace, /* storage, */ OWLOntologyManagerFactory.createOWLOntologyManager(offline.getOntologySourceLocations().toArray( new IRI[0]))); - for (OntologyInputSource<?> src : sessionSources) + for (OntologyInputSource<?,?> src : sessionSources) try { s.addOntology(src); } catch (UnmodifiableOntologyCollectorException e) { Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/util/OntologyUtils.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/util/OntologyUtils.java?rev=1229274&r1=1229273&r2=1229274&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/util/OntologyUtils.java (original) +++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/util/OntologyUtils.java Mon Jan 9 17:44:30 2012 @@ -56,19 +56,19 @@ public class OntologyUtils { private static final Logger logger = LoggerFactory.getLogger(OntologyUtils.class); - public static OWLOntology appendOntology(OntologyInputSource<OWLOntology> parentSrc, - OntologyInputSource<OWLOntology> childSrc, + public static OWLOntology appendOntology(OntologyInputSource<OWLOntology,OWLOntologyManager> parentSrc, + OntologyInputSource<OWLOntology,OWLOntologyManager> childSrc, OWLOntologyManager ontologyManager) { return appendOntology(parentSrc, childSrc, ontologyManager, null); } - public static OWLOntology appendOntology(OntologyInputSource<OWLOntology> parentSrc, - OntologyInputSource<OWLOntology> childSrc) { + public static OWLOntology appendOntology(OntologyInputSource<OWLOntology,OWLOntologyManager> parentSrc, + OntologyInputSource<OWLOntology,OWLOntologyManager> childSrc) { return appendOntology(parentSrc, childSrc, null, null); } - public static OWLOntology appendOntology(OntologyInputSource<OWLOntology> parentSrc, - OntologyInputSource<OWLOntology> childSrc, + public static OWLOntology appendOntology(OntologyInputSource<OWLOntology,OWLOntologyManager> parentSrc, + OntologyInputSource<OWLOntology,OWLOntologyManager> childSrc, IRI rewritePrefix) { return appendOntology(parentSrc, childSrc, null, rewritePrefix); } @@ -92,8 +92,8 @@ public class OntologyUtils { * ontology document file elsewhere. * @return the parent with the appended child */ - public static OWLOntology appendOntology(OntologyInputSource<OWLOntology> parentSrc, - OntologyInputSource<OWLOntology> childSrc, + public static OWLOntology appendOntology(OntologyInputSource<OWLOntology,OWLOntologyManager> parentSrc, + OntologyInputSource<OWLOntology,OWLOntologyManager> childSrc, OWLOntologyManager ontologyManager, IRI rewritePrefix) { @@ -127,7 +127,7 @@ public class OntologyUtils { return oParent; } - public static OWLOntology buildImportTree(OntologyInputSource<OWLOntology> rootSrc, + public static OWLOntology buildImportTree(OntologyInputSource<OWLOntology,OWLOntologyManager> rootSrc, Set<OWLOntology> subtrees) { return buildImportTree(rootSrc.getRootOntology(), subtrees, OWLManager.createOWLOntologyManager()); @@ -141,7 +141,7 @@ public class OntologyUtils { * @param mgr * @return */ - public static OWLOntology buildImportTree(OntologyInputSource<OWLOntology> rootSrc, + public static OWLOntology buildImportTree(OntologyInputSource<OWLOntology,OWLOntologyManager> rootSrc, Set<OWLOntology> subtrees, OWLOntologyManager mgr) { @@ -293,16 +293,14 @@ public class OntologyUtils { private static String[] preferredFormats = {"application/rdf+xml", "application/rdf+json", "text/turtle", "text/rdf+n3", "text/rdf+nt", "text/owl-manchester", "application/owl+xml"}; - + public static List<String> getPreferredSupportedFormats(Collection<String> supported) { List<String> result = new ArrayList<String>(); for (String f : preferredFormats) - if (supported.contains(f)) - result.add(f); + if (supported.contains(f)) result.add(f); // The non-preferred supported formats on the tail in any order for (String f : supported) - if (!result.contains(f)) - result.add(f); + if (!result.contains(f)) result.add(f); return result; } Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/resources/OSGI-INF/metatype/metatype.properties URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1229274&r1=1229273&r2=1229274&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/resources/OSGI-INF/metatype/metatype.properties (original) +++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/resources/OSGI-INF/metatype/metatype.properties Mon Jan 9 17:44:30 2012 @@ -40,6 +40,23 @@ org.apache.stanbol.ontologymanager.onton #=============================================================================== +#Properties defined by the Ontology Provider +#=============================================================================== +org.apache.stanbol.ontologymanager.ontonet.importPolicy.name = Import management policy +org.apache.stanbol.ontologymanager.ontonet.importPolicy.description = Specifies how the ontology manager should handle owl:imports statements in ontologies. +org.apache.stanbol.ontologymanager.ontonet.importPolicy.option.flatten = Flatten +org.apache.stanbol.ontologymanager.ontonet.importPolicy.option.merge = Merge +org.apache.stanbol.ontologymanager.ontonet.importPolicy.option.preserve = Preserve + + +#=============================================================================== +#Properties defined by the Clerezza Ontology Provider +#=============================================================================== +org.apache.stanbol.ontologymanager.ontonet.impl.clerezza.ClerezzaOntologyProvider.name = Apache Stanbol OntoNet ontology provider (Clerezza implementation) +org.apache.stanbol.ontologymanager.ontonet.impl.clerezza.ClerezzaOntologyProvider.description = Provides loading and low-level access to ontologies, regardless of their management within network components such as Scopes or Sessions. + + +#=============================================================================== #Properties defined by the Session Manager #=============================================================================== org.apache.stanbol.ontologymanager.ontonet.impl.session.SessionManagerImpl.name = Apache Stanbol OntoNet Session Manager Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/impl/clerezza/TestOntologyCollectors.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/impl/clerezza/TestOntologyCollectors.java?rev=1229274&r1=1229273&r2=1229274&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/impl/clerezza/TestOntologyCollectors.java (original) +++ incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/impl/clerezza/TestOntologyCollectors.java Mon Jan 9 17:44:30 2012 @@ -16,7 +16,8 @@ */ package org.apache.stanbol.ontologymanager.ontonet.impl.clerezza; -import static org.apache.stanbol.ontologymanager.ontonet.MockOsgiContext.*; +import static org.apache.stanbol.ontologymanager.ontonet.MockOsgiContext.ontologyProvider; +import static org.apache.stanbol.ontologymanager.ontonet.MockOsgiContext.reset; import static org.junit.Assert.assertTrue; import java.io.File; @@ -31,7 +32,6 @@ import org.junit.After; import org.junit.Test; import org.semanticweb.owlapi.apibinding.OWLManager; import org.semanticweb.owlapi.model.IRI; -import org.semanticweb.owlapi.model.OWLImportsDeclaration; import org.semanticweb.owlapi.model.OWLOntology; import org.semanticweb.owlapi.model.OWLOntologyLoaderListener; import org.semanticweb.owlapi.model.OWLOntologyManager; @@ -86,7 +86,7 @@ public class TestOntologyCollectors { mgr.addIRIMapper(new PhonyIRIMapper(null)); File f = new File(url.toURI()); - OntologyInputSource<OWLOntology> src = new ParentPathInputSource(f, mgr); + OntologyInputSource<OWLOntology,?> src = new ParentPathInputSource(f, mgr); // OntologyInputSource<OWLOntology> src = new RootOntologyIRISource(IRI.create(f), mgr); // OntologyInputSource<OWLOntology> src = new OntologyContentInputSource(content,mgr); Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestClerezzaInputSources.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestClerezzaInputSources.java?rev=1229274&r1=1229273&r2=1229274&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestClerezzaInputSources.java (original) +++ incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestClerezzaInputSources.java Mon Jan 9 17:44:30 2012 @@ -16,13 +16,16 @@ */ package org.apache.stanbol.ontologymanager.ontonet.io; -import static org.apache.stanbol.ontologymanager.ontonet.MockOsgiContext.*; -import static org.junit.Assert.*; +import static org.apache.stanbol.ontologymanager.ontonet.MockOsgiContext.parser; +import static org.apache.stanbol.ontologymanager.ontonet.MockOsgiContext.reset; +import static org.apache.stanbol.ontologymanager.ontonet.MockOsgiContext.tcManager; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import java.io.InputStream; import java.util.Set; -import org.apache.clerezza.rdf.core.Graph; +import org.apache.clerezza.rdf.core.TripleCollection; import org.apache.clerezza.rdf.core.UriRef; import org.apache.stanbol.ontologymanager.ontonet.Locations; import org.apache.stanbol.ontologymanager.ontonet.api.io.GraphSource; @@ -50,7 +53,7 @@ public class TestClerezzaInputSources { } - private OntologyInputSource<Graph> gis; + private OntologyInputSource<TripleCollection,?> gis; @Before public void bind() throws Exception { @@ -67,10 +70,10 @@ public class TestClerezzaInputSources { gis = new GraphSource(new UriRef(Locations.CHAR_ACTIVE.toString())); assertNotNull(gis); assertNotNull(gis.getRootOntology()); - Set<Graph> imported = gis.getImports(false); + Set<TripleCollection> imported = gis.getImports(false); // Number of stored graphs minus the importing one = imported graphs assertEquals(tcManager.listTripleCollections().size() - 1, imported.size()); - for (Graph g : imported) + for (TripleCollection g : imported) assertNotNull(g); } Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestOWLAPIInputSources.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestOWLAPIInputSources.java?rev=1229274&r1=1229273&r2=1229274&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestOWLAPIInputSources.java (original) +++ incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestOWLAPIInputSources.java Mon Jan 9 17:44:30 2012 @@ -116,7 +116,7 @@ public class TestOWLAPIInputSources { assertNotNull(url); File f = new File(url.toURI()); assertNotNull(f); - OntologyInputSource<OWLOntology> coreSource = new ParentPathInputSource(f); + OntologyInputSource<OWLOntology,?> coreSource = new ParentPathInputSource(f); // Check that all the imports closure is made of local files Set<OWLOntology> closure = coreSource.getImports(true); @@ -146,7 +146,7 @@ public class TestOWLAPIInputSources { public void testOfflineSingleton() throws Exception { URL url = getClass().getResource("/ontologies/mockfoaf.rdf"); assertNotNull(url); - OntologyInputSource<OWLOntology> coreSource = new RootOntologyIRISource(IRI.create(url)); + OntologyInputSource<OWLOntology,?> coreSource = new RootOntologyIRISource(IRI.create(url)); assertNotNull(df); /* * To check it fetched the correct ontology, we look for a declaration of the bogus class foaf:Perzon Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestStorage.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestStorage.java?rev=1229274&r1=1229273&r2=1229274&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestStorage.java (original) +++ incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/io/TestStorage.java Mon Jan 9 17:44:30 2012 @@ -82,7 +82,7 @@ public class TestStorage { @Test public void storedOntologyOutlivesScope() throws Exception { String ephemeralScopeId = "CaducousScope"; - OntologyInputSource<OWLOntology> ois = new RootOntologyIRISource(IRI.create(getClass().getResource( + OntologyInputSource<OWLOntology,?> ois = new RootOntologyIRISource(IRI.create(getClass().getResource( "/ontologies/nonexistentcharacters.owl"))); IRI ontologyId = ois.getRootOntology().getOntologyID().getOntologyIRI(); OntologyScope scope = onManager.getOntologyScopeFactory().createOntologyScope(ephemeralScopeId); Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestClerezzaSpaces.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestClerezzaSpaces.java?rev=1229274&r1=1229273&r2=1229274&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestClerezzaSpaces.java (original) +++ incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestClerezzaSpaces.java Mon Jan 9 17:44:30 2012 @@ -32,8 +32,8 @@ import java.net.URISyntaxException; import java.net.URL; import java.util.Hashtable; -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.serializedform.SupportedFormat; import org.apache.stanbol.ontologymanager.ontonet.Constants; import org.apache.stanbol.ontologymanager.ontonet.api.OfflineConfiguration; @@ -79,17 +79,17 @@ public class TestClerezzaSpaces { private static OntologySpaceFactory factory; - private static OntologyInputSource<?> inMemorySrc, minorSrc, dropSrc, nonexSrc; + private static OntologyInputSource<?,?> inMemorySrc, minorSrc, dropSrc, nonexSrc; private static OfflineConfiguration offline; - private static OntologyInputSource<Graph> getLocalSource(String resourcePath) { + private static OntologyInputSource<TripleCollection,?> getLocalSource(String resourcePath) { InputStream is = TestOntologySpaces.class.getResourceAsStream(resourcePath); return new GraphSource(parser.parse(is, SupportedFormat.RDF_XML)); } - private static OntologyInputSource<?> getLocalSource(String resourcePath, OWLOntologyManager mgr) throws OWLOntologyCreationException, - URISyntaxException { + private static OntologyInputSource<?,?> getLocalSource(String resourcePath, OWLOntologyManager mgr) throws OWLOntologyCreationException, + URISyntaxException { URL url = TestOntologySpaces.class.getResource(resourcePath); File f = new File(url.toURI()); return new ParentPathInputSource(f, mgr != null ? mgr Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologySpaces.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologySpaces.java?rev=1229274&r1=1229273&r2=1229274&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologySpaces.java (original) +++ incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologySpaces.java Mon Jan 9 17:44:30 2012 @@ -16,8 +16,14 @@ */ package org.apache.stanbol.ontologymanager.ontonet.ontology; -import static org.apache.stanbol.ontologymanager.ontonet.MockOsgiContext.*; -import static org.junit.Assert.*; +import static org.apache.stanbol.ontologymanager.ontonet.MockOsgiContext.onManager; +import static org.apache.stanbol.ontologymanager.ontonet.MockOsgiContext.reset; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.File; import java.net.URISyntaxException; @@ -55,13 +61,14 @@ public class TestOntologySpaces { .create(Constants.PEANUTS_MINOR_BASE); private static OntologySpaceFactory factory; - private static OntologyInputSource<OWLOntology> inMemorySrc, minorSrc, dropSrc, nonexSrc; + private static OntologyInputSource<OWLOntology,?> inMemorySrc, minorSrc, dropSrc, nonexSrc; private static OWLAxiom linusIsHuman = null; private static OWLOntology ont = null, ont2 = null; - private static OntologyInputSource<OWLOntology> getLocalSource(String resourcePath, OWLOntologyManager mgr) throws OWLOntologyCreationException, - URISyntaxException { + private static OntologyInputSource<OWLOntology,?> getLocalSource(String resourcePath, + OWLOntologyManager mgr) throws OWLOntologyCreationException, + URISyntaxException { URL url = TestOntologySpaces.class.getResource(resourcePath); File f = new File(url.toURI()); return new ParentPathInputSource(f, mgr != null ? mgr Modified: incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/io/LibrarySource.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/io/LibrarySource.java?rev=1229274&r1=1229273&r2=1229274&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/io/LibrarySource.java (original) +++ incubator/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/io/LibrarySource.java Mon Jan 9 17:44:30 2012 @@ -95,7 +95,7 @@ public class LibrarySource extends Abstr */ public LibrarySource(IRI libraryID, RegistryManager registryManager, - OntologyInputSource<OWLOntology> parentSrc) throws RegistryContentException { + OntologyInputSource<OWLOntology,OWLOntologyManager> parentSrc) throws RegistryContentException { this(libraryID, registryManager, checkOntologyManager(registryManager), parentSrc); } @@ -139,7 +139,7 @@ public class LibrarySource extends Abstr public LibrarySource(IRI libraryID, RegistryManager registryManager, OWLOntologyManager ontologyManager, - OntologyInputSource<OWLOntology> parentSrc) throws RegistryContentException { + OntologyInputSource<OWLOntology,OWLOntologyManager> parentSrc) throws RegistryContentException { if (registryManager == null) throw new IllegalArgumentException( "A null registry manager is not allowed"); Added: incubator/stanbol/trunk/ontologymanager/registry/src/main/resources/ontologies/registry/iksnetwork-noimports.owl URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/registry/src/main/resources/ontologies/registry/iksnetwork-noimports.owl?rev=1229274&view=auto ============================================================================== --- incubator/stanbol/trunk/ontologymanager/registry/src/main/resources/ontologies/registry/iksnetwork-noimports.owl (added) +++ incubator/stanbol/trunk/ontologymanager/registry/src/main/resources/ontologies/registry/iksnetwork-noimports.owl Mon Jan 9 17:44:30 2012 @@ -0,0 +1,87 @@ +<?xml version="1.0"?> +<!-- + 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. +--> +<rdf:RDF + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:xsd="http://www.w3.org/2001/XMLSchema#"; + xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"; + xmlns:owl="http://www.w3.org/2002/07/owl#"; + xmlns:meta="http://www.ontologydesignpatterns.org/schemas/meta.owl#"; + xmlns="http://stanbol.apache.org/ontologies/registries/iksnetwork.owl#"; + xml:base="http://stanbol.apache.org/ontologies/registries/iksnetwork.owl";> + <owl:Ontology rdf:about="http://www.ontologydesignpatterns.org/registry/iksnetwork.owl";> + <owl:versionInfo rdf:datatype="http://www.w3.org/2001/XMLSchema#string"; + >0.3.0</owl:versionInfo> + <owl:versionInfo xml:lang="en">Created by Alessandro Adamou</owl:versionInfo> + <owl:versionInfo xml:lang="en">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. + </owl:versionInfo> + </owl:Ontology> + + <rdf:Description rdf:ID="SocialNetworks"> + <rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string";>Social Network Models</rdfs:label> + <rdf:type rdf:resource="http://www.ontologydesignpatterns.org/cpont/codo/coddata.owl#OntologyLibrary"/> + <owl:versionInfo rdf:datatype="http://www.w3.org/2001/XMLSchema#string";>0.1</owl:versionInfo> + </rdf:Description> + + <rdf:Description rdf:ID="W3C"> + <rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string";>W3C Ontology Recommendations</rdfs:label> + <rdf:type rdf:resource="http://www.ontologydesignpatterns.org/cpont/codo/coddata.owl#OntologyLibrary"/> + <owl:versionInfo rdf:datatype="http://www.w3.org/2001/XMLSchema#string";>0.1</owl:versionInfo> + <meta:hasOntology rdf:resource="http://w3.org/ns/org"/> + </rdf:Description> + + <rdf:Description rdf:ID="GeneralPurposeOntologies"> + <rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string";>General Purpose Ontologies</rdfs:label> + <rdf:type rdf:resource="http://www.ontologydesignpatterns.org/cpont/codo/coddata.owl#OntologyLibrary"/> + <owl:versionInfo rdf:datatype="http://www.w3.org/2001/XMLSchema#string";>0.1</owl:versionInfo> + <meta:hasOntology rdf:resource="http://schema.org/docs/schemaorg.owl"/> + </rdf:Description> + + <rdf:Description rdf:ID="Alignments"> + <rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string";>Cross-vocabulary alignments</rdfs:label> + <rdf:type rdf:resource="http://www.ontologydesignpatterns.org/cpont/codo/coddata.owl#OntologyLibrary"/> + <owl:versionInfo rdf:datatype="http://www.w3.org/2001/XMLSchema#string";>0.1</owl:versionInfo> + </rdf:Description> + + <rdf:Description rdf:about="http://www.ontologydesignpatterns.org/ont/alignments/schemaorg.owl";> + <rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string";>Alignments to schema.org</rdfs:label> + <meta:isOntologyOf rdf:resource="#Alignments"/> + <rdf:type rdf:resource="http://www.ontologydesignpatterns.org/cpont/codo/codkernel.owl#Ontology"/> + </rdf:Description> + + <rdf:Description rdf:about="http://xmlns.com/foaf/spec/index.rdf";> + <rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string";>Friend-Of-A-Friend</rdfs:label> + <meta:isOntologyOf rdf:resource="#SocialNetworks"/> + <rdf:type rdf:resource="http://www.ontologydesignpatterns.org/cpont/codo/codkernel.owl#Ontology"/> + </rdf:Description> + + <rdf:Description rdf:about="http://w3.org/ns/org";> + <rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string";>Organisation Ontology</rdfs:label> + <rdf:type rdf:resource="http://www.ontologydesignpatterns.org/cpont/codo/codkernel.owl#Ontology"/> + </rdf:Description> + + <rdf:Description rdf:about="http://schema.org/docs/schemaorg.owl";> + <rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string";>Schema.org</rdfs:label> + <rdf:type rdf:resource="http://www.ontologydesignpatterns.org/cpont/codo/codkernel.owl#Ontology"/> + </rdf:Description> + + +</rdf:RDF> \ No newline at end of file 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=1229274&r1=1229273&r2=1229274&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 Mon Jan 9 17:44:30 2012 @@ -170,7 +170,7 @@ public class TestOntologyLibrary { assertNotNull(regMgr); // Now use this registry manager to instantiate an input source. - OntologyInputSource<OWLOntology> src = new LibrarySource(Locations.LIBRARY_TEST1, regMgr, + OntologyInputSource<OWLOntology,?> src = new LibrarySource(Locations.LIBRARY_TEST1, regMgr, virginOntologyManager); OWLOntology o = src.getRootOntology(); boolean hasImporting = false, hasImported = false; 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=1229274&r1=1229273&r2=1229274&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 Mon Jan 9 17:44:30 2012 @@ -144,14 +144,15 @@ public class ScopeResource extends BaseS * other reason, {@link Status#INTERNAL_SERVER_ERROR} if some other error occurs. */ @POST - @Consumes(value = {KRFormat.RDF_XML, KRFormat.OWL_XML, KRFormat.TURTLE, KRFormat.FUNCTIONAL_OWL, - KRFormat.MANCHESTER_OWL, KRFormat.RDF_JSON}) + @Consumes(value = {KRFormat.RDF_XML, KRFormat.OWL_XML, KRFormat.N_TRIPLE, KRFormat.TURTLE, + KRFormat.FUNCTIONAL_OWL, KRFormat.MANCHESTER_OWL, KRFormat.RDF_JSON}) @Produces(MediaType.TEXT_PLAIN) - public Response manageOntology(InputStream content) { + public Response manageOntology(InputStream content, @Context HttpHeaders headers) { long before = System.currentTimeMillis(); if (scope == null) return Response.status(NOT_FOUND).build(); try { - scope.getCustomSpace().addOntology(new GraphContentInputSource(content) + scope.getCustomSpace().addOntology( + new GraphContentInputSource(content, headers.getMediaType().toString()) // new OntologyContentInputSource(content) ); } catch (UnmodifiableOntologyCollectorException e) { @@ -212,7 +213,7 @@ public class ScopeResource extends BaseS if (reg.containsScope(scopeid)) { OntologyScope scope = reg.getScope(scopeid); try { - OntologyInputSource<?> src = new RootOntologyIRISource(ontoiri); + OntologyInputSource<?,?> src = new RootOntologyIRISource(ontoiri); OntologySpace space = scope.getCustomSpace(); if (space == null) { space = onm.getOntologySpaceFactory().createCustomOntologySpace(scopeid, src); @@ -263,7 +264,7 @@ public class ScopeResource extends BaseS log.debug("Request URI {}", uriInfo.getRequestUri()); OntologyScope scope; - OntologyInputSource<?> coreSrc = null, custSrc = null; + OntologyInputSource<?,?> coreSrc = null, custSrc = null; // First thing, check the core source. if (coreRegistry != null && !coreRegistry.isEmpty()) try { @@ -298,7 +299,7 @@ public class ScopeResource extends BaseS // Now the creation. try { // Expand core sources - List<OntologyInputSource<?>> expanded = new ArrayList<OntologyInputSource<?>>(); + List<OntologyInputSource<?,?>> expanded = new ArrayList<OntologyInputSource<?,?>>(); if (coreSrc != null) { if (coreSrc instanceof OntologySetInputSource) { for (OWLOntology o : ((OntologySetInputSource) coreSrc).getOntologies()) { Modified: incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/ontonetDescription.ftl URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/ontonetDescription.ftl?rev=1229274&r1=1229273&r2=1229274&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/ontonetDescription.ftl (original) +++ incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/ontonetDescription.ftl Mon Jan 9 17:44:30 2012 @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. --> -<#macro view>A controlled environment for managing ontologies and ontology networks and user sessions managing them.</#macro> \ No newline at end of file +A <strong>controlled environment</strong> for managing Web ontologies, <strong>ontology networks</strong> and user sessions that put them to use. \ No newline at end of file Modified: incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/imports/rulesDescription.ftl URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/imports/rulesDescription.ftl?rev=1229274&r1=1229273&r2=1229274&view=diff ============================================================================== --- incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/imports/rulesDescription.ftl (original) +++ incubator/stanbol/trunk/rules/web/src/main/resources/org/apache/stanbol/rules/web/templates/imports/rulesDescription.ftl Mon Jan 9 17:44:30 2012 @@ -14,5 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. --> -This is a the implementation of Stanbol Rules which can be used both for <strong>reasoning</strong> +This is the implementation of Stanbol Rules which can be used both for <strong>reasoning</strong> and <strong>refactoring</strong> \ No newline at end of file
