You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by al...@apache.org on 2012/10/05 17:35:30 UTC
svn commit: r1394594 [9/9] - in /stanbol/trunk:
commons/authentication.basic/ commons/security/ contrib/reengineer/base/
contrib/reengineer/db/
contrib/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/
contrib/reengineer/db/src/test/java/or...
Added: stanbol/trunk/ontologymanager/sources/owlapi/src/test/resources/ontologies/mockfoaf.rdf
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/sources/owlapi/src/test/resources/ontologies/mockfoaf.rdf?rev=1394594&view=auto
==============================================================================
--- stanbol/trunk/ontologymanager/sources/owlapi/src/test/resources/ontologies/mockfoaf.rdf (added)
+++ stanbol/trunk/ontologymanager/sources/owlapi/src/test/resources/ontologies/mockfoaf.rdf Fri Oct 5 15:35:22 2012
@@ -0,0 +1,41 @@
+<?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
+ xml:base="http://xmlns.com/foaf/0.1/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+ xmlns:owl="http://www.w3.org/2002/07/owl#"
+ xmlns:foaf="http://xmlns.com/foaf/0.1/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/">
+
+ <owl:Ontology rdf:about="http://xmlns.com/foaf/0.1/" dc:description="A mock of the FOAF vocabulary that introduces mistakes in the vocabulary definition. Used to test offline overrides." >
+ <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>
+
+ <rdfs:Class rdf:about="http://xmlns.com/foaf/0.1/Perzon" rdfs:label="Person" rdfs:comment="A bogus definition of person.">
+ <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+ <rdfs:isDefinedBy rdf:resource="http://xmlns.com/foaf/0.1/"/>
+ </rdfs:Class>
+
+</rdf:RDF>
\ No newline at end of file
Modified: stanbol/trunk/ontologymanager/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/pom.xml?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/pom.xml (original)
+++ stanbol/trunk/ontologymanager/web/pom.xml Fri Oct 5 15:35:22 2012
@@ -31,7 +31,7 @@
<version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Apache Stanbol Ontology Manager Web</name>
+ <name>Apache Stanbol Ontology Manager : Web</name>
<description>Home page of Apache Stanbol OntoNet HTTP endpoints.</description>
<scm>
<connection>
@@ -95,22 +95,32 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.owl</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
<version>0.9.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
+ <artifactId>org.apache.stanbol.ontologymanager.servicesapi</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.registry</artifactId>
+ <artifactId>org.apache.stanbol.ontologymanager.sources.clerezza</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.owl</artifactId>
+ <artifactId>org.apache.stanbol.ontologymanager.sources.owlapi</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.registry</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerWebFragment.java?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerWebFragment.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerWebFragment.java Fri Oct 5 15:35:22 2012
@@ -31,14 +31,14 @@ import org.apache.stanbol.commons.web.ba
import org.apache.stanbol.commons.web.base.NavigationLink;
import org.apache.stanbol.commons.web.base.ScriptResource;
import org.apache.stanbol.commons.web.base.WebFragment;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.OfflineConfiguration;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyProvider;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
+import org.apache.stanbol.ontologymanager.obsolete.api.ONManager;
import org.apache.stanbol.ontologymanager.registry.api.RegistryManager;
+import org.apache.stanbol.ontologymanager.servicesapi.OfflineConfiguration;
+import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyProvider;
+import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager;
import org.apache.stanbol.ontologymanager.web.resources.OntoNetRootResource;
-import org.apache.stanbol.ontologymanager.web.resources.OntologyNetworkResource;
import org.apache.stanbol.ontologymanager.web.resources.RegistryManagerResource;
+import org.apache.stanbol.ontologymanager.web.resources.ScopeManagerResource;
import org.apache.stanbol.ontologymanager.web.resources.ScopeResource;
import org.apache.stanbol.ontologymanager.web.resources.SessionManagerResource;
import org.apache.stanbol.ontologymanager.web.resources.SessionResource;
@@ -68,23 +68,28 @@ public class OntologyManagerWebFragment
private BundleContext bundleContext;
@Reference
- ONManager onm;
+ OfflineConfiguration offline;
@Reference
- SessionManager sessionManager;
+ OntologyProvider<?> ontologyProvider;
@Reference
- OfflineConfiguration offline;
+ RegistryManager regMgr;
@Reference
- OntologyProvider<?> ontologyProvider;
+ ONManager scopeMgr;
@Reference
- RegistryManager regMgr;
+ SessionManager sessionMgr;
@Reference
TcManager tcManager;
+ @Activate
+ protected void activate(ComponentContext ctx) {
+ this.bundleContext = ctx.getBundleContext();
+ }
+
@Override
public BundleContext getBundleContext() {
return bundleContext;
@@ -101,7 +106,7 @@ public class OntologyManagerWebFragment
classes.add(RegistryManagerResource.class);
// Scope resources
- classes.add(OntologyNetworkResource.class);
+ classes.add(ScopeManagerResource.class);
classes.add(ScopeResource.class);
// Session resources
@@ -152,9 +157,4 @@ public class OntologyManagerWebFragment
return new ClassTemplateLoader(getClass(), TEMPLATE_PATH);
}
- @Activate
- protected void activate(ComponentContext ctx) {
- this.bundleContext = ctx.getBundleContext();
- }
-
}
Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/AbstractOntologyAccessResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/AbstractOntologyAccessResource.java?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/AbstractOntologyAccessResource.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/AbstractOntologyAccessResource.java Fri Oct 5 15:35:22 2012
@@ -17,7 +17,7 @@
package org.apache.stanbol.ontologymanager.web.resources;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
-import org.apache.stanbol.ontologymanager.ontonet.impl.util.OntologyUtils;
+import org.apache.stanbol.ontologymanager.servicesapi.util.OntologyUtils;
import org.semanticweb.owlapi.model.OWLOntologyID;
/**
Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java Fri Oct 5 15:35:22 2012
@@ -24,6 +24,7 @@ import static javax.ws.rs.core.Response.
import static javax.ws.rs.core.Response.Status.CONFLICT;
import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
import static javax.ws.rs.core.Response.Status.NOT_FOUND;
+import static javax.ws.rs.core.Response.Status.NO_CONTENT;
import static javax.ws.rs.core.Response.Status.UNSUPPORTED_MEDIA_TYPE;
import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
import static org.apache.stanbol.commons.web.base.format.KRFormat.FUNCTIONAL_OWL;
@@ -66,6 +67,7 @@ import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
@@ -92,22 +94,22 @@ import org.apache.clerezza.rdf.ontologie
import org.apache.stanbol.commons.owl.util.OWLUtils;
import org.apache.stanbol.commons.owl.util.URIUtils;
import org.apache.stanbol.commons.web.base.ContextHelper;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.collector.OntologyCollector;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyContentInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyHandleException;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyLoadingException;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyNetworkMultiplexer;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyProvider;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OrphanOntologyKeyException;
-import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
-import org.apache.stanbol.ontologymanager.ontonet.impl.clerezza.MGraphNetworkMultiplexer;
-import org.apache.stanbol.ontologymanager.ontonet.impl.util.OntologyUtils;
+import org.apache.stanbol.ontologymanager.multiplexer.clerezza.collector.MGraphMultiplexer;
import org.apache.stanbol.ontologymanager.registry.api.RegistryContentException;
import org.apache.stanbol.ontologymanager.registry.api.RegistryManager;
import org.apache.stanbol.ontologymanager.registry.api.model.Library;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.OntologyCollector;
+import org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.servicesapi.ontology.Multiplexer;
+import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyHandleException;
+import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyLoadingException;
+import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyProvider;
+import org.apache.stanbol.ontologymanager.servicesapi.ontology.OrphanOntologyKeyException;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.Scope;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager;
+import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager;
+import org.apache.stanbol.ontologymanager.servicesapi.util.OntologyUtils;
+import org.apache.stanbol.ontologymanager.sources.owlapi.OntologyContentInputSource;
import org.apache.stanbol.ontologymanager.web.util.OntologyStatsResource;
import org.semanticweb.owlapi.model.AddImport;
import org.semanticweb.owlapi.model.IRI;
@@ -142,7 +144,7 @@ public class OntoNetRootResource extends
private Logger log = LoggerFactory.getLogger(getClass());
- protected ONManager onManager;
+ protected ScopeManager onManager;
/*
* Placeholder for the OntologyProvider to be fetched from the servlet context.
@@ -161,7 +163,8 @@ public class OntoNetRootResource extends
this.servletContext = servletContext;
this.ontologyProvider = (OntologyProvider<?>) ContextHelper.getServiceFromContext(
OntologyProvider.class, servletContext);
- this.onManager = (ONManager) ContextHelper.getServiceFromContext(ONManager.class, servletContext);
+ this.onManager = (ScopeManager) ContextHelper.getServiceFromContext(ScopeManager.class,
+ servletContext);
this.sessionManager = (SessionManager) ContextHelper.getServiceFromContext(SessionManager.class,
servletContext);
this.registryManager = (RegistryManager) ContextHelper.getServiceFromContext(RegistryManager.class,
@@ -179,6 +182,22 @@ public class OntoNetRootResource extends
return rb.build();
}
+ @PUT
+ @Path("/{ontologyId:.+}")
+ public Response createOntologyEntry(@PathParam("ontologyId") String ontologyId,
+ @Context HttpHeaders headers,
+ @Context UriInfo uriInfo) {
+ OWLOntologyID key = OntologyUtils.decode(ontologyId);
+ ResponseBuilder rb;
+ if (ontologyProvider.listAllRegisteredEntries().contains(key)) rb = Response.status(CONFLICT);
+ else {
+ ontologyProvider.createBlankOntologyEntry(key);
+ rb = Response.created(uriInfo.getRequestUri());
+ }
+ addCORSOrigin(servletContext, rb, headers);
+ return rb.build();
+ }
+
@DELETE
@Path("/{ontologyId:.+}")
public Response deleteOntology(@PathParam("ontologyId") String ontologyId, @Context HttpHeaders headers) {
@@ -194,7 +213,7 @@ public class OntoNetRootResource extends
rb = Response.status(CONFLICT);
}
} catch (OrphanOntologyKeyException e) {
- log.warn("Orphan ontology key {}. No associated graph found in store.", e.getOrphanPublicKey());
+ log.warn("Orphan ontology key {}. No associated graph found in store.", e.getOntologyKey());
rb = Response.status(NOT_FOUND);
}
addCORSOrigin(servletContext, rb, headers);
@@ -293,7 +312,7 @@ public class OntoNetRootResource extends
public Set<String> getHandles(OWLOntologyID ontologyId) {
Set<String> handles = new HashSet<String>();
- if (onManager != null) for (OntologyScope scope : onManager.getRegisteredScopes())
+ if (onManager != null) for (Scope scope : onManager.getRegisteredScopes())
if (scope.getCoreSpace().hasOntology(ontologyId)
|| scope.getCustomSpace().hasOntology(ontologyId)) handles.add(scope.getID());
if (sessionManager != null) for (String sesId : sessionManager.getRegisteredSessionIDs())
@@ -311,52 +330,6 @@ public class OntoNetRootResource extends
}
@GET
- @Path("/{ontologyId:.+}")
- @Produces(value = {APPLICATION_JSON, N3, N_TRIPLE, RDF_JSON})
- public Response getManagedGraph(@PathParam("ontologyId") String ontologyId,
- @DefaultValue("false") @QueryParam("merge") boolean merged,
- @Context UriInfo uriInfo,
- @Context HttpHeaders headers) {
- ResponseBuilder rb;
- if (ontologyId == null || ontologyId.isEmpty()) rb = Response.status(BAD_REQUEST);
- else {
- TripleCollection o = getGraph(ontologyId, merged, uriInfo.getRequestUri());
- rb = o == null ? Response.status(NOT_FOUND) : Response.ok(o);
- }
- addCORSOrigin(servletContext, rb, headers);
- return rb.build();
- }
-
- /**
- * Gets the ontology with the given identifier in its version managed by the session.
- *
- * @param sessionId
- * the session identifier.
- * @param ontologyId
- * the ontology identifier.
- * @param uriInfo
- * @param headers
- * @return the requested managed ontology, or {@link Status#NOT_FOUND} if either the sessionn does not
- * exist, or the if the ontology either does not exist or is not managed.
- */
- @GET
- @Path("/{ontologyId:.+}")
- @Produces(value = {RDF_XML, TURTLE, X_TURTLE, MANCHESTER_OWL, FUNCTIONAL_OWL, OWL_XML, TEXT_PLAIN})
- public Response getManagedOntology(@PathParam("ontologyId") String ontologyId,
- @DefaultValue("false") @QueryParam("merge") boolean merged,
- @Context UriInfo uriInfo,
- @Context HttpHeaders headers) {
- ResponseBuilder rb;
- if (ontologyId == null || ontologyId.isEmpty()) rb = Response.status(BAD_REQUEST);
- else {
- OWLOntology o = getOWLOntology(ontologyId, merged, uriInfo.getRequestUri());
- rb = o == null ? Response.status(NOT_FOUND) : Response.ok(o);
- }
- addCORSOrigin(servletContext, rb, headers);
- return rb.build();
- }
-
- @GET
@Produces({RDF_XML, TURTLE, X_TURTLE, APPLICATION_JSON, RDF_JSON})
public Response getMetaGraph(@Context HttpHeaders headers) {
ResponseBuilder rb = Response.ok(ontologyProvider.getMetaGraph(Graph.class));
@@ -365,13 +338,14 @@ public class OntoNetRootResource extends
}
public SortedSet<OWLOntologyID> getOntologies() {
+ // No orphans included.
SortedSet<OWLOntologyID> filtered = new TreeSet<OWLOntologyID>();
Set<OWLOntologyID> orphans = ontologyProvider.listOrphans();
for (OWLOntologyID id : ontologyProvider.getPublicKeys())
if (id != null && !orphans.contains(id)) filtered.add(id);
return filtered;
}
-
+
public Set<OWLOntologyID> getOrphans() {
return ontologyProvider.listOrphans();
}
@@ -447,11 +421,60 @@ public class OntoNetRootResource extends
}
public int getSize(OWLOntologyID ontologyId) {
- OntologyNetworkMultiplexer desc = new MGraphNetworkMultiplexer(
- ontologyProvider.getMetaGraph(MGraph.class));
+ Multiplexer desc = new MGraphMultiplexer(ontologyProvider.getMetaGraph(MGraph.class));
return desc.getSize(ontologyId);
}
+ @GET
+ @Path("/{ontologyId:.+}")
+ @Produces(value = {APPLICATION_JSON, N3, N_TRIPLE, RDF_JSON})
+ public Response getStandaloneGraph(@PathParam("ontologyId") String ontologyId,
+ @DefaultValue("false") @QueryParam("merge") boolean merged,
+ @Context UriInfo uriInfo,
+ @Context HttpHeaders headers) {
+ ResponseBuilder rb;
+ if (ontologyId == null || ontologyId.isEmpty()) rb = Response.status(BAD_REQUEST);
+ OWLOntologyID key = OntologyUtils.decode(ontologyId);
+ if (ontologyProvider.listOrphans().contains(key)) rb = Response.status(NO_CONTENT);
+ else {
+ TripleCollection o = getGraph(ontologyId, merged, uriInfo.getRequestUri());
+ rb = o == null ? Response.status(NOT_FOUND) : Response.ok(o);
+ }
+ addCORSOrigin(servletContext, rb, headers);
+ return rb.build();
+ }
+
+ /**
+ * Gets the ontology with the given identifier in its version managed by the session.
+ *
+ * @param sessionId
+ * the session identifier.
+ * @param ontologyId
+ * the ontology identifier.
+ * @param uriInfo
+ * @param headers
+ * @return the requested managed ontology, or {@link Status#NOT_FOUND} if either the sessionn does not
+ * exist, or the if the ontology either does not exist or is not managed.
+ */
+ @GET
+ @Path("/{ontologyId:.+}")
+ @Produces(value = {RDF_XML, TURTLE, X_TURTLE, MANCHESTER_OWL, FUNCTIONAL_OWL, OWL_XML, TEXT_PLAIN})
+ public Response getStandaloneOntology(@PathParam("ontologyId") String ontologyId,
+ @DefaultValue("false") @QueryParam("merge") boolean merged,
+ @Context UriInfo uriInfo,
+ @Context HttpHeaders headers) {
+ ResponseBuilder rb;
+ if (ontologyId == null || ontologyId.isEmpty()) rb = Response.status(BAD_REQUEST);
+ OWLOntologyID key = OntologyUtils.decode(ontologyId);
+ if (ontologyProvider.listOrphans().contains(key)) rb = Response.status(NO_CONTENT);
+ else {
+ OWLOntology o = getOWLOntology(ontologyId, merged, uriInfo.getRequestUri());
+ rb = o == null ? Response.status(NOT_FOUND) : Response.ok(o);
+ }
+ addCORSOrigin(servletContext, rb, headers);
+ return rb.build();
+ }
+
@POST
@Consumes({MULTIPART_FORM_DATA})
@Produces({TEXT_HTML, TEXT_PLAIN, RDF_XML, TURTLE, X_TURTLE, N3})
@@ -561,40 +584,47 @@ public class OntoNetRootResource extends
return rb.build();
}
+ /**
+ * Helper method to make sure a ResponseBuilder is created on every conditions, so that it is then
+ * possible to enable CORS on it afterwards.
+ *
+ * @param ontologyId
+ * @return
+ */
+ protected ResponseBuilder performShowOntology(String ontologyId) {
+ if (ontologyId == null || ontologyId.isEmpty()) return Response.status(BAD_REQUEST);
+ OWLOntologyID key = OntologyUtils.decode(ontologyId);
+ if (ontologyProvider.listOrphans().contains(key)) return Response.status(NO_CONTENT);
+ OWLOntology o = getOWLOntology(ontologyId, false, uriInfo.getRequestUri());
+ if (o == null) return Response.status(NOT_FOUND);
+ // try {
+ Set<OntologyCollector> handles = new HashSet<OntologyCollector>();
+ if (onManager != null) for (Scope scope : onManager.getRegisteredScopes()) {
+ if (scope.getCoreSpace().hasOntology(key)) handles.add(scope.getCoreSpace());
+ if (scope.getCustomSpace().hasOntology(key)) handles.add(scope.getCustomSpace());
+ }
+ if (sessionManager != null) for (String sesId : sessionManager.getRegisteredSessionIDs())
+ if (sessionManager.getSession(sesId).hasOntology(key)) handles.add(sessionManager
+ .getSession(sesId));
+ // ByteArrayOutputStream out = new ByteArrayOutputStream();
+ // o.getOWLOntologyManager().saveOntology(o, new ManchesterOWLSyntaxOntologyFormat(), out);
+ return Response.ok(new Viewable("ontology",
+ // new OntologyPrettyPrintResource(servletContext,
+ // uriInfo, out)
+ new OntologyStatsResource(servletContext, uriInfo, o, ontologyProvider.listAliases(key),
+ handles)));
+ // } catch (OWLOntologyStorageException e) {
+ // throw new WebApplicationException(e, INTERNAL_SERVER_ERROR);
+ // }
+ }
+
@GET
@Path("/{ontologyId:.+}")
@Produces(TEXT_HTML)
public Response showOntology(@PathParam("ontologyId") String ontologyId,
@Context HttpHeaders headers,
@Context UriInfo uriInfo) {
- ResponseBuilder rb;
- if (ontologyId == null || ontologyId.isEmpty()) rb = Response.status(BAD_REQUEST);
- else {
- OWLOntologyID id = OntologyUtils.decode(ontologyId);
- OWLOntology o = getOWLOntology(ontologyId, false, uriInfo.getRequestUri());
- if (o == null) rb = Response.status(NOT_FOUND);
- else
- // try
- {
- Set<OntologyCollector> handles = new HashSet<OntologyCollector>();
- if (onManager != null) for (OntologyScope scope : onManager.getRegisteredScopes()) {
- if (scope.getCoreSpace().hasOntology(id)) handles.add(scope.getCoreSpace());
- if (scope.getCustomSpace().hasOntology(id)) handles.add(scope.getCustomSpace());
- }
- if (sessionManager != null) for (String sesId : sessionManager.getRegisteredSessionIDs())
- if (sessionManager.getSession(sesId).hasOntology(id)) handles.add(sessionManager
- .getSession(sesId));
- // ByteArrayOutputStream out = new ByteArrayOutputStream();
- // o.getOWLOntologyManager().saveOntology(o, new ManchesterOWLSyntaxOntologyFormat(), out);
- rb = Response.ok(new Viewable("ontology",
- // new OntologyPrettyPrintResource(servletContext,
- // uriInfo, out)
- new OntologyStatsResource(servletContext, uriInfo, o, ontologyProvider
- .listAliases(id), handles)));
- // } catch (OWLOntologyStorageException e) {
- // throw new WebApplicationException(e, INTERNAL_SERVER_ERROR);
- }
- }
+ ResponseBuilder rb = performShowOntology(ontologyId);
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML + "; charset=utf-8");
addCORSOrigin(servletContext, rb, headers);
return rb.build();
Copied: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeManagerResource.java (from r1393978, stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntologyNetworkResource.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeManagerResource.java?p2=stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeManagerResource.java&p1=stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntologyNetworkResource.java&r1=1393978&r2=1394594&rev=1394594&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntologyNetworkResource.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeManagerResource.java Fri Oct 5 15:35:22 2012
@@ -50,9 +50,9 @@ import org.apache.clerezza.rdf.core.acce
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.commons.web.base.utils.MediaTypeUtil;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope;
-import org.apache.stanbol.ontologymanager.ontonet.impl.renderers.ScopeSetRenderer;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.Scope;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager;
+import org.apache.stanbol.ontologymanager.servicesapi.util.ScopeSetRenderer;
import org.semanticweb.owlapi.model.OWLOntology;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,7 +70,7 @@ import com.sun.jersey.api.view.Viewable;
*
*/
@Path("/ontonet/ontology")
-public class OntologyNetworkResource extends BaseStanbolResource {
+public class ScopeManagerResource extends BaseStanbolResource {
@SuppressWarnings("unused")
private Logger log = LoggerFactory.getLogger(getClass());
@@ -78,13 +78,13 @@ public class OntologyNetworkResource ext
/*
* Placeholder for the ONManager to be fetched from the servlet context.
*/
- protected ONManager onm;
+ protected ScopeManager onm;
protected TcManager tcManager;
- public OntologyNetworkResource(@Context ServletContext servletContext) {
+ public ScopeManagerResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
- this.onm = (ONManager) ContextHelper.getServiceFromContext(ONManager.class, servletContext);
+ this.onm = (ScopeManager) ContextHelper.getServiceFromContext(ScopeManager.class, servletContext);
this.tcManager = (TcManager) ContextHelper.getServiceFromContext(TcManager.class, servletContext);
}
@@ -94,13 +94,13 @@ public class OntologyNetworkResource ext
@DELETE
public void clearOntologies() {
// First clear the registry...
- for (OntologyScope scope : onm.getRegisteredScopes())
+ for (Scope scope : onm.getRegisteredScopes())
onm.deregisterScope(scope);
// ...then clear the store.
// TODO : the other way around?
}
- public Set<OntologyScope> getActiveScopes() {
+ public Set<Scope> getActiveScopes() {
return onm.getActiveScopes();
}
@@ -131,7 +131,7 @@ public class OntologyNetworkResource ext
public Response getScopeModel(@DefaultValue("false") @QueryParam("with-inactive") boolean inactive,
@Context HttpHeaders headers,
@Context ServletContext servletContext) {
- Set<OntologyScope> scopes = inactive ? onm.getRegisteredScopes() : onm.getActiveScopes();
+ Set<Scope> scopes = inactive ? onm.getRegisteredScopes() : onm.getActiveScopes();
OWLOntology ontology = ScopeSetRenderer.getScopes(scopes);
@@ -142,7 +142,7 @@ public class OntologyNetworkResource ext
return rb.build();
}
- public Set<OntologyScope> getScopes() {
+ public Set<Scope> getScopes() {
return onm.getRegisteredScopes();
}
Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java Fri Oct 5 15:35:22 2012
@@ -86,26 +86,26 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.stanbol.commons.owl.util.OWLUtils;
import org.apache.stanbol.commons.owl.util.URIUtils;
import org.apache.stanbol.commons.web.base.ContextHelper;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.collector.DuplicateIDException;
-import org.apache.stanbol.ontologymanager.ontonet.api.collector.IrremovableOntologyException;
-import org.apache.stanbol.ontologymanager.ontonet.api.collector.OntologyCollectorModificationException;
-import org.apache.stanbol.ontologymanager.ontonet.api.collector.UnmodifiableOntologyCollectorException;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.GraphContentInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.GraphSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologySource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.SetInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.StoredOntologySource;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyLoadingException;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyProvider;
-import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope;
-import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologySpace;
-import org.apache.stanbol.ontologymanager.ontonet.impl.util.OntologyUtils;
import org.apache.stanbol.ontologymanager.registry.api.RegistryManager;
import org.apache.stanbol.ontologymanager.registry.api.model.Library;
import org.apache.stanbol.ontologymanager.registry.io.LibrarySource;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.DuplicateIDException;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.IrremovableOntologyException;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.OntologyCollectorModificationException;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.UnmodifiableOntologyCollectorException;
+import org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.servicesapi.io.SetInputSource;
+import org.apache.stanbol.ontologymanager.servicesapi.io.StoredOntologySource;
+import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyLoadingException;
+import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyProvider;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.Scope;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager;
+import org.apache.stanbol.ontologymanager.servicesapi.util.OntologyUtils;
+import org.apache.stanbol.ontologymanager.sources.clerezza.GraphContentInputSource;
+import org.apache.stanbol.ontologymanager.sources.clerezza.GraphSource;
+import org.apache.stanbol.ontologymanager.sources.owlapi.RootOntologyIRISource;
+import org.apache.stanbol.ontologymanager.sources.owlapi.RootOntologySource;
import org.apache.stanbol.ontologymanager.web.util.OntologyPrettyPrintResource;
import org.coode.owlapi.manchesterowlsyntax.ManchesterOWLSyntaxOntologyFormat;
import org.semanticweb.owlapi.model.IRI;
@@ -135,7 +135,7 @@ public class ScopeResource extends Abstr
/*
* Placeholder for the ONManager to be fetched from the servlet context.
*/
- protected ONManager onm;
+ protected ScopeManager onm;
protected OntologyProvider<TcProvider> ontologyProvider;
@@ -144,14 +144,14 @@ public class ScopeResource extends Abstr
*/
protected RegistryManager regMgr;
- protected OntologyScope scope;
+ protected Scope scope;
public ScopeResource(@PathParam(value = "scopeid") String scopeId, @Context ServletContext servletContext) {
super();
log.info("<init> with scope {}", scopeId);
this.servletContext = servletContext;
- this.onm = (ONManager) ContextHelper.getServiceFromContext(ONManager.class, servletContext);
+ this.onm = (ScopeManager) ContextHelper.getServiceFromContext(ScopeManager.class, servletContext);
this.regMgr = (RegistryManager) ContextHelper.getServiceFromContext(RegistryManager.class,
servletContext);
this.ontologyProvider = (OntologyProvider<TcProvider>) ContextHelper.getServiceFromContext(
@@ -322,7 +322,7 @@ public class ScopeResource extends Abstr
// // String s1 = s.split("::")[1];
// if (s != null && !s.isEmpty()) result.add(s);
// }
- for (OWLOntologyID id : ontologyProvider.listOntologies())
+ for (OWLOntologyID id : ontologyProvider.listPrimaryKeys())
result.add(OntologyUtils.encode(id));
for (OWLOntologyID id : scope.getCoreSpace().listManagedOntologies())
result.remove(OntologyUtils.encode(id));
@@ -334,7 +334,7 @@ public class ScopeResource extends Abstr
/*
* Needed for freemarker
*/
- public OntologyScope getScope() {
+ public Scope getScope() {
return scope;
}
@@ -606,7 +606,6 @@ public class ScopeResource extends Abstr
return rb.build();
}
- @SuppressWarnings("unused")
@POST
@Consumes({MULTIPART_FORM_DATA})
@Produces({TEXT_HTML, TEXT_PLAIN, RDF_XML, TURTLE, X_TURTLE, N3})
Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource.java?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource.java Fri Oct 5 15:35:22 2012
@@ -53,9 +53,9 @@ import javax.ws.rs.core.UriInfo;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.commons.web.base.utils.MediaTypeUtil;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionLimitException;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
+import org.apache.stanbol.ontologymanager.servicesapi.session.Session;
+import org.apache.stanbol.ontologymanager.servicesapi.session.SessionLimitException;
+import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.AddAxiom;
import org.semanticweb.owlapi.model.IRI;
Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java Fri Oct 5 15:35:22 2012
@@ -83,25 +83,25 @@ import org.apache.clerezza.rdf.core.acce
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.stanbol.commons.owl.util.OWLUtils;
import org.apache.stanbol.commons.web.base.ContextHelper;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.collector.IrremovableOntologyException;
-import org.apache.stanbol.ontologymanager.ontonet.api.collector.OntologyCollectorModificationException;
-import org.apache.stanbol.ontologymanager.ontonet.api.collector.UnmodifiableOntologyCollectorException;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.GraphContentInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyContentInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.StoredOntologySource;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyLoadingException;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyProvider;
-import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.DuplicateSessionIDException;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionLimitException;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
-import org.apache.stanbol.ontologymanager.ontonet.impl.util.OntologyUtils;
import org.apache.stanbol.ontologymanager.registry.api.RegistryManager;
import org.apache.stanbol.ontologymanager.registry.io.LibrarySource;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.IrremovableOntologyException;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.OntologyCollectorModificationException;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.UnmodifiableOntologyCollectorException;
+import org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.servicesapi.io.StoredOntologySource;
+import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyLoadingException;
+import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyProvider;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.Scope;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager;
+import org.apache.stanbol.ontologymanager.servicesapi.session.DuplicateSessionIDException;
+import org.apache.stanbol.ontologymanager.servicesapi.session.Session;
+import org.apache.stanbol.ontologymanager.servicesapi.session.SessionLimitException;
+import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager;
+import org.apache.stanbol.ontologymanager.servicesapi.util.OntologyUtils;
+import org.apache.stanbol.ontologymanager.sources.clerezza.GraphContentInputSource;
+import org.apache.stanbol.ontologymanager.sources.owlapi.OntologyContentInputSource;
+import org.apache.stanbol.ontologymanager.sources.owlapi.RootOntologyIRISource;
import org.apache.stanbol.ontologymanager.web.util.OntologyPrettyPrintResource;
import org.coode.owlapi.manchesterowlsyntax.ManchesterOWLSyntaxOntologyFormat;
import org.semanticweb.owlapi.model.IRI;
@@ -128,7 +128,7 @@ public class SessionResource extends Abs
private Logger log = LoggerFactory.getLogger(getClass());
- protected ONManager onMgr;
+ protected ScopeManager onMgr;
protected OntologyProvider<TcProvider> ontologyProvider;
@@ -152,7 +152,7 @@ public class SessionResource extends Abs
servletContext);
this.ontologyProvider = (OntologyProvider<TcProvider>) ContextHelper.getServiceFromContext(
OntologyProvider.class, servletContext);
- this.onMgr = (ONManager) ContextHelper.getServiceFromContext(ONManager.class, servletContext);
+ this.onMgr = (ScopeManager) ContextHelper.getServiceFromContext(ScopeManager.class, servletContext);
session = sesMgr.getSession(sessionId);
}
@@ -249,7 +249,7 @@ public class SessionResource extends Abs
@Produces({WILDCARD})
public Response emptyPost(@Context HttpHeaders headers) {
log.debug(" post(no data)");
- for (OntologyScope sc : getAllScopes()) { // First remove appended scopes not in the list
+ for (Scope sc : getAllScopes()) { // First remove appended scopes not in the list
String scid = sc.getID();
if (getAppendedScopes().contains(scid)) {
session.detachScope(scid);
@@ -264,16 +264,16 @@ public class SessionResource extends Abs
/*
* Needed for freemarker
*/
- public Set<OntologyScope> getAllScopes() {
+ public Set<Scope> getAllScopes() {
return onMgr.getRegisteredScopes();
}
/*
* Needed for freemarker
*/
- public Set<OntologyScope> getAppendableScopes() {
- Set<OntologyScope> notAppended = new HashSet<OntologyScope>();
- for (OntologyScope sc : onMgr.getRegisteredScopes())
+ public Set<Scope> getAppendableScopes() {
+ Set<Scope> notAppended = new HashSet<Scope>();
+ for (Scope sc : onMgr.getRegisteredScopes())
if (!session.getAttachedScopes().contains(sc.getID())) notAppended.add(sc);
return notAppended;
}
@@ -283,7 +283,7 @@ public class SessionResource extends Abs
*/
public Set<String> getAppendedScopes() {
Set<String> appended = new HashSet<String>();
- for (OntologyScope sc : onMgr.getRegisteredScopes())
+ for (Scope sc : onMgr.getRegisteredScopes())
if (session.getAttachedScopes().contains(sc.getID())) appended.add(sc.getID());
return appended;
}
@@ -305,7 +305,7 @@ public class SessionResource extends Abs
public SortedSet<String> getManageableOntologies() {
SortedSet<String> result = new TreeSet<String>();
- for (OWLOntologyID id : ontologyProvider.listOntologies())
+ for (OWLOntologyID id : ontologyProvider.listPrimaryKeys())
result.add(OntologyUtils.encode(id));
for (OWLOntologyID id : session.listManagedOntologies())
result.remove(OntologyUtils.encode(id));
@@ -735,7 +735,7 @@ public class SessionResource extends Abs
} // Now check scopes
if (toAppend != null
&& (!toAppend.isEmpty() || (toAppend.isEmpty() && !getAppendedScopes().isEmpty()))) {
- for (OntologyScope sc : getAllScopes()) { // First remove appended scopes not in the list
+ for (Scope sc : getAllScopes()) { // First remove appended scopes not in the list
String scid = sc.getID();
if (!toAppend.contains(scid) && getAppendedScopes().contains(scid)) {
session.detachScope(scid);
Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyPrettyPrintResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyPrettyPrintResource.java?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyPrettyPrintResource.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyPrettyPrintResource.java Fri Oct 5 15:35:22 2012
@@ -20,7 +20,7 @@ import javax.servlet.ServletContext;
import javax.ws.rs.core.UriInfo;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
-import org.apache.stanbol.ontologymanager.ontonet.api.NamedArtifact;
+import org.apache.stanbol.ontologymanager.servicesapi.NamedArtifact;
/**
* This is a dummy resource to be used for human-readable HTML output.
Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyStatsResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyStatsResource.java?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyStatsResource.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyStatsResource.java Fri Oct 5 15:35:22 2012
@@ -24,10 +24,10 @@ import javax.servlet.ServletContext;
import javax.ws.rs.core.UriInfo;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
-import org.apache.stanbol.ontologymanager.ontonet.api.collector.OntologyCollector;
-import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologySpace;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
-import org.apache.stanbol.ontologymanager.ontonet.impl.util.OntologyUtils;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.OntologyCollector;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace;
+import org.apache.stanbol.ontologymanager.servicesapi.session.Session;
+import org.apache.stanbol.ontologymanager.servicesapi.util.OntologyUtils;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyID;
Modified: stanbol/trunk/reasoners/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/pom.xml?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/pom.xml (original)
+++ stanbol/trunk/reasoners/web/pom.xml Fri Oct 5 15:35:22 2012
@@ -67,7 +67,9 @@
org.apache.stanbol.commons.owl.*,
org.apache.stanbol.rules.base.api.*,
org.apache.stanbol.ontologymanager.ontonet.api.*,
- org.apache.stanbol.reasoners.servicesapi.*,
+ org.apache.stanbol.ontologymanager.obsolete.api.*,
+ org.apache.stanbol.ontologymanager.servicesapi.*,
+ org.apache.stanbol.reasoners.servicesapi.*,
org.apache.stanbol.reasoners.jena.*,
org.apache.stanbol.reasoners.owlapi.*
</Import-Package>
@@ -99,7 +101,7 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
+ <artifactId>org.apache.stanbol.ontologymanager.servicesapi</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -110,12 +112,12 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.manager</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.refactor</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java (original)
+++ stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java Fri Oct 5 15:35:22 2012
@@ -30,8 +30,9 @@ import org.apache.stanbol.commons.web.ba
import org.apache.stanbol.commons.web.base.NavigationLink;
import org.apache.stanbol.commons.web.base.ScriptResource;
import org.apache.stanbol.commons.web.base.WebFragment;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
+import org.apache.stanbol.ontologymanager.obsolete.api.ONManager;
+import org.apache.stanbol.ontologymanager.obsolete.api.ontology.OntologyProvider;
+import org.apache.stanbol.ontologymanager.obsolete.api.session.SessionManager;
import org.apache.stanbol.reasoners.web.resources.JobsResource;
import org.apache.stanbol.reasoners.web.resources.ReasoningServiceTaskResource;
import org.apache.stanbol.reasoners.web.resources.ReasoningServicesResource;
@@ -64,6 +65,9 @@ public class ReasonersFragment implement
ONManager onm;
@Reference
+ OntologyProvider onProvider;
+
+ @Reference
SessionManager sessionManager;
@Reference
Modified: stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/impl/RESTInputFactory.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/impl/RESTInputFactory.java?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/impl/RESTInputFactory.java (original)
+++ stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/impl/RESTInputFactory.java Fri Oct 5 15:35:22 2012
@@ -24,12 +24,12 @@ import java.util.Map.Entry;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
+import org.apache.stanbol.ontologymanager.obsolete.api.ONManager;
+import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager;
import org.apache.stanbol.reasoners.servicesapi.ReasoningServiceInputFactory;
import org.apache.stanbol.reasoners.servicesapi.ReasoningServiceInputManager;
import org.apache.stanbol.reasoners.web.input.provider.impl.FileInputProvider;
-import org.apache.stanbol.reasoners.web.input.provider.impl.OntonetInputProvider;
+import org.apache.stanbol.reasoners.web.input.provider.impl.OntologyManagerInputProvider;
import org.apache.stanbol.reasoners.web.input.provider.impl.RecipeInputProvider;
import org.apache.stanbol.reasoners.web.input.provider.impl.UrlInputProvider;
import org.apache.stanbol.rules.base.api.RuleAdapterManager;
@@ -54,7 +54,10 @@ public class RESTInputFactory implements
private Logger log = LoggerFactory.getLogger(getClass());
- public RESTInputFactory(ONManager onm, SessionManager sm, RuleStore rStore, RuleAdapterManager adapterManager) {
+ public RESTInputFactory(ONManager onm,
+ SessionManager sm,
+ RuleStore rStore,
+ RuleAdapterManager adapterManager) {
this.onm = onm;
this.sessionManager = sm;
this.rStore = rStore;
@@ -107,7 +110,8 @@ public class RESTInputFactory implements
} else if (entry.getKey().equals("recipe")) {
if (!entry.getValue().isEmpty()) {
- inmgr.addInputProvider(new RecipeInputProvider(rStore, adapterManager, entry.getValue().iterator().next()));
+ inmgr.addInputProvider(new RecipeInputProvider(rStore, adapterManager, entry.getValue()
+ .iterator().next()));
} else {
// Parameter exists with no value
log.error("Parameter 'recipe' must have a value!");
@@ -117,7 +121,7 @@ public class RESTInputFactory implements
}
}
if (scope != null) {
- inmgr.addInputProvider(new OntonetInputProvider(onm, sessionManager, scope, session));
+ inmgr.addInputProvider(new OntologyManagerInputProvider(onm, sessionManager, scope, session));
}
return inmgr;
}
Copied: stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntologyManagerInputProvider.java (from r1394426, stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntonetInputProvider.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntologyManagerInputProvider.java?p2=stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntologyManagerInputProvider.java&p1=stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntonetInputProvider.java&r1=1394426&r2=1394594&rev=1394594&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntonetInputProvider.java (original)
+++ stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntologyManagerInputProvider.java Fri Oct 5 15:35:22 2012
@@ -22,10 +22,10 @@ import java.util.Iterator;
import java.util.Set;
import org.apache.stanbol.commons.owl.transformation.JenaToOwlConvert;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
+import org.apache.stanbol.ontologymanager.obsolete.api.ONManager;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.Scope;
+import org.apache.stanbol.ontologymanager.servicesapi.session.Session;
+import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager;
import org.apache.stanbol.reasoners.servicesapi.ReasoningServiceInputProvider;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.IRI;
@@ -51,7 +51,7 @@ import com.hp.hpl.jena.rdf.model.StmtIte
* @author enridaga
*
*/
-public class OntonetInputProvider implements ReasoningServiceInputProvider {
+public class OntologyManagerInputProvider implements ReasoningServiceInputProvider {
private final Logger log = LoggerFactory.getLogger(UrlInputProvider.class);
@@ -66,7 +66,7 @@ public class OntonetInputProvider implem
* @param onManager
* @param scopeId
*/
- public OntonetInputProvider(ONManager onManager, String scopeId) {
+ public OntologyManagerInputProvider(ONManager onManager, String scopeId) {
this(onManager, null, scopeId, null);
}
@@ -77,10 +77,10 @@ public class OntonetInputProvider implem
* @param scopeId
* @param sessionId
*/
- public OntonetInputProvider(ONManager onManager,
- SessionManager sessionManager,
- String scopeId,
- String sessionId) {
+ public OntologyManagerInputProvider(ONManager onManager,
+ SessionManager sessionManager,
+ String scopeId,
+ String sessionId) {
this.onManager = onManager;
this.scopeId = scopeId;
this.sessionManager = sessionManager;
@@ -90,7 +90,7 @@ public class OntonetInputProvider implem
@Override
public <T> Iterator<T> getInput(Class<T> type) throws IOException {
// This ontology is already a merged version, no need to iterate over imported ones
- final OWLOntology o = getFromOntonet();
+ final OWLOntology o = getFromOntoMgr();
if (type.isAssignableFrom(OWLAxiom.class)) {
final Iterator<OWLAxiom> iterator = o.getAxioms().iterator();
return new Iterator<T>() {
@@ -146,9 +146,9 @@ public class OntonetInputProvider implem
return false;
}
- private OWLOntology getFromOntonet() throws IOException {
+ private OWLOntology getFromOntoMgr() throws IOException {
try {
- OntologyScope scope = null;
+ Scope scope = null;
synchronized (onManager) {
scope = onManager.getScope(this.scopeId);
}
Modified: stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java (original)
+++ stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java Fri Oct 5 15:35:22 2012
@@ -52,8 +52,8 @@ import org.apache.stanbol.commons.jobs.a
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.format.KRFormat;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
+import org.apache.stanbol.ontologymanager.obsolete.api.ONManager;
+import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager;
import org.apache.stanbol.reasoners.jena.JenaReasoningService;
import org.apache.stanbol.reasoners.owlapi.OWLApiReasoningService;
import org.apache.stanbol.reasoners.servicesapi.InconsistentInputException;
@@ -66,7 +66,7 @@ import org.apache.stanbol.reasoners.serv
import org.apache.stanbol.reasoners.servicesapi.annotations.Documentation;
import org.apache.stanbol.reasoners.web.input.impl.SimpleInputManager;
import org.apache.stanbol.reasoners.web.input.provider.impl.FileInputProvider;
-import org.apache.stanbol.reasoners.web.input.provider.impl.OntonetInputProvider;
+import org.apache.stanbol.reasoners.web.input.provider.impl.OntologyManagerInputProvider;
import org.apache.stanbol.reasoners.web.input.provider.impl.RecipeInputProvider;
import org.apache.stanbol.reasoners.web.input.provider.impl.UrlInputProvider;
import org.apache.stanbol.reasoners.web.utils.ReasoningServiceExecutor;
@@ -158,9 +158,10 @@ public class ReasoningServiceTaskResourc
// Retrieve the rule store
this.ruleStore = (RuleStore) ContextHelper.getServiceFromContext(RuleStore.class, servletContext);
-
+
// Retrieve the rule adapter manager
- this.adapterManager = (RuleAdapterManager) ContextHelper.getServiceFromContext(RuleAdapterManager.class, servletContext);
+ this.adapterManager = (RuleAdapterManager) ContextHelper.getServiceFromContext(
+ RuleAdapterManager.class, servletContext);
// Check if method is allowed
// FIXME Supported methods are only GET and POST, but also PUT comes here, why?
@@ -306,7 +307,7 @@ public class ReasoningServiceTaskResourc
// If all parameters are missing we produce the service/task welcome
// page
if (this.parameters.isEmpty()) {
- //return Response.ok(new Viewable("index", this)).build();
+ // return Response.ok(new Viewable("index", this)).build();
ResponseBuilder rb = Response.ok(new Viewable("index", this));
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML + "; charset=utf-8");
addCORSOrigin(servletContext, rb, headers);
@@ -471,8 +472,8 @@ public class ReasoningServiceTaskResourc
} else if (entry.getKey().equals("recipe")) {
if (!entry.getValue().isEmpty()) {
- inmgr.addInputProvider(new RecipeInputProvider(ruleStore, adapterManager, entry.getValue().iterator()
- .next()));
+ inmgr.addInputProvider(new RecipeInputProvider(ruleStore, adapterManager, entry
+ .getValue().iterator().next()));
// We remove it form the additional parameter list
this.parameters.remove("url");
} else {
@@ -484,7 +485,7 @@ public class ReasoningServiceTaskResourc
}
}
if (scope != null) {
- inmgr.addInputProvider(new OntonetInputProvider(onm, sessionManager, scope, session));
+ inmgr.addInputProvider(new OntologyManagerInputProvider(onm, sessionManager, scope, session));
this.parameters.remove("scope");
this.parameters.remove("session");
}
@@ -578,35 +579,34 @@ public class ReasoningServiceTaskResourc
log.debug("(getJobManager()) ");
return (JobManager) ContextHelper.getServiceFromContext(JobManager.class, this.context);
}
-
-
- public Map<String,String> getServiceDescription(){
- return getServiceDescription(service);
- }
-
- public Map<String,String> getServiceDescription(ReasoningService<?,?,?> service){
- Class<?> serviceC = service.getClass();
- String name;
- try {
- name = serviceC.getAnnotation(Documentation.class).name();
- } catch (NullPointerException e) {
- log.warn("The service {} is not documented: missing name", serviceC);
- name="";
- }
- String description;
- try {
- description = serviceC.getAnnotation(Documentation.class).description();
- } catch (NullPointerException e) {
- log.warn("The service {} is not documented: missing description", serviceC);
- description="";
- }
- // String file = serviceC.getAnnotation(Documentation.class).file();
- Map<String,String> serviceProperties = new HashMap<String,String>();
- serviceProperties.put("name", name);
- serviceProperties.put("description", description);
- // serviceProperties.put("file", file);
- serviceProperties.put("path", service.getPath());
- return serviceProperties;
+
+ public Map<String,String> getServiceDescription() {
+ return getServiceDescription(service);
+ }
+
+ public Map<String,String> getServiceDescription(ReasoningService<?,?,?> service) {
+ Class<?> serviceC = service.getClass();
+ String name;
+ try {
+ name = serviceC.getAnnotation(Documentation.class).name();
+ } catch (NullPointerException e) {
+ log.warn("The service {} is not documented: missing name", serviceC);
+ name = "";
+ }
+ String description;
+ try {
+ description = serviceC.getAnnotation(Documentation.class).description();
+ } catch (NullPointerException e) {
+ log.warn("The service {} is not documented: missing description", serviceC);
+ description = "";
+ }
+ // String file = serviceC.getAnnotation(Documentation.class).file();
+ Map<String,String> serviceProperties = new HashMap<String,String>();
+ serviceProperties.put("name", name);
+ serviceProperties.put("description", description);
+ // serviceProperties.put("file", file);
+ serviceProperties.put("path", service.getPath());
+ return serviceProperties;
}
}
Modified: stanbol/trunk/rules/manager/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/manager/pom.xml?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/rules/manager/pom.xml (original)
+++ stanbol/trunk/rules/manager/pom.xml Fri Oct 5 15:35:22 2012
@@ -93,11 +93,6 @@
<!-- Stanbol deps -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
- <version>0.9.0-incubating</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.base</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
Modified: stanbol/trunk/rules/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/web/pom.xml?rev=1394594&r1=1394593&r2=1394594&view=diff
==============================================================================
--- stanbol/trunk/rules/web/pom.xml (original)
+++ stanbol/trunk/rules/web/pom.xml Fri Oct 5 15:35:22 2012
@@ -94,11 +94,6 @@
<version>0.9.0-incubating</version>
</dependency>
<dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
- <version>0.9.0-incubating</version>
- </dependency>
- <dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.manager</artifactId>
<version>0.10.0-SNAPSHOT</version>