Author: alexdma
Date: Tue Aug 2 16:44:15 2011
New Revision: 1153186
URL: http://svn.apache.org/viewvc?rev=1153186&view=rev
Log:
STANBOL-178 :
- web resources now use the shared OfflineConfiguration component and the
ontology manager factory from /owl, instead of the deprecated one.
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntonetFragment.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/GraphsResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMOntResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntonetFragment.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntonetFragment.java?rev=1153186&r1=1153185&r2=1153186&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntonetFragment.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntonetFragment.java
Tue Aug 2 16:44:15 2011
@@ -31,6 +31,7 @@ import org.apache.stanbol.commons.web.ba
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.registry.api.RegistryManager;
import org.apache.stanbol.ontologymanager.web.resources.DocumentationResource;
import org.apache.stanbol.ontologymanager.web.resources.GraphsResource;
@@ -72,6 +73,9 @@ public class OntonetFragment implements
ONManager onm;
@Reference
+ OfflineConfiguration offline;
+
+ @Reference
RegistryManager regMgr;
@Override
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/GraphsResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/GraphsResource.java?rev=1153186&r1=1153185&r2=1153186&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/GraphsResource.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/GraphsResource.java
Tue Aug 2 16:44:15 2011
@@ -16,7 +16,9 @@
*/
package org.apache.stanbol.ontologymanager.web.resources;
-import static javax.ws.rs.core.Response.Status.*;
+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 java.io.InputStream;
import java.util.ArrayList;
@@ -42,8 +44,10 @@ import org.apache.stanbol.commons.web.ba
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.OfflineConfiguration;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import
org.apache.stanbol.ontologymanager.ontonet.impl.ontology.NoSuchStoreException;
+import org.apache.stanbol.owl.OWLOntologyManagerFactory;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.AddAxiom;
import org.semanticweb.owlapi.model.IRI;
@@ -64,13 +68,16 @@ import com.sun.jersey.multipart.FormData
@ImplicitProduces(MediaType.TEXT_HTML + ";qs=2")
public class GraphsResource extends BaseStanbolResource {
+ @SuppressWarnings("unused")
private final Logger log = LoggerFactory.getLogger(getClass());
+
protected ONManager onManager;
protected ClerezzaOntologyStorage storage;
protected TcManager tcManager;
public GraphsResource(@Context ServletContext servletContext) {
+ this.servletContext = servletContext;
storage = (ClerezzaOntologyStorage)
(servletContext.getAttribute(ClerezzaOntologyStorage.class
.getName()));
tcManager = (TcManager)
servletContext.getAttribute(TcManager.class.getName());
@@ -123,9 +130,17 @@ public class GraphsResource extends Base
Set<IRI> iris = storage.listGraphs();
if (iris != null) {
- OWLOntologyManager manager =
onManager.getOntologyManagerFactory().createOntologyManager(true);
+ // OWLOntologyManager manager =
onManager.getOntologyManagerFactory().createOntologyManager(true);
OWLDataFactory factory = OWLManager.getOWLDataFactory();
+ OWLOntologyManager manager;
+ OfflineConfiguration offline = (OfflineConfiguration)
ContextHelper.getServiceFromContext(
+ OfflineConfiguration.class, servletContext);
+ if (offline == null) throw new IllegalStateException(
+ "OfflineConfiguration missing in ServletContext");
+ else manager =
OWLOntologyManagerFactory.createOWLOntologyManager(offline
+ .getOntologySourceLocations().toArray(new IRI[0]));
+
OWLOntology ontology;
try {
ontology = manager.createOntology();
@@ -157,9 +172,16 @@ public class GraphsResource extends Base
@POST
@Consumes(MediaType.MULTIPART_FORM_DATA)
public Response storeGraph(@FormDataParam("graph") InputStream graph,
@FormDataParam("id") String id) {
+
+ OWLOntologyManager manager;
+ OfflineConfiguration offline = (OfflineConfiguration)
ContextHelper.getServiceFromContext(
+ OfflineConfiguration.class, servletContext);
+ if (offline == null) throw new
IllegalStateException("OfflineConfiguration missing in ServletContext");
+ else manager =
OWLOntologyManagerFactory.createOWLOntologyManager(offline
+ .getOntologySourceLocations().toArray(new IRI[0]));
+
try {
- OWLOntology ontology =
onManager.getOntologyManagerFactory().createOntologyManager(true)
- .loadOntologyFromOntologyDocument(graph);
+ OWLOntology ontology =
manager.loadOntologyFromOntologyDocument(graph);
storage.store(ontology, IRI.create(id));
return Response.ok().build();
} catch (OWLOntologyCreationException e) {
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMOntResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMOntResource.java?rev=1153186&r1=1153185&r2=1153186&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMOntResource.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMOntResource.java
Tue Aug 2 16:44:15 2011
@@ -1,21 +1,23 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.stanbol.ontologymanager.web.resources;
+import static javax.ws.rs.core.Response.Status.*;
+
import javax.servlet.ServletContext;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@@ -29,8 +31,10 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.OfflineConfiguration;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyIndex;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
+import org.apache.stanbol.owl.OWLOntologyManagerFactory;
import org.coode.owlapi.turtle.TurtleOntologyFormat;
import org.semanticweb.owlapi.io.RDFXMLOntologyFormat;
import org.semanticweb.owlapi.io.StringDocumentTarget;
@@ -44,6 +48,7 @@ import org.slf4j.LoggerFactory;
@Path("/ontonet/ontology/get")
public class ONMOntResource extends BaseStanbolResource {
+ @SuppressWarnings("unused")
private Logger log = LoggerFactory.getLogger(getClass());
/*
@@ -53,8 +58,6 @@ public class ONMOntResource extends Base
protected Serializer serializer;
- protected ServletContext servletContext;
-
protected ClerezzaOntologyStorage storage;
public ONMOntResource(@Context ServletContext servletContext) {
@@ -69,24 +72,32 @@ public class ONMOntResource extends Base
@Produces("application/rdf+xml")
public Response getOntology(@QueryParam("iri") String ontologyIri) {
+ OWLOntologyManager tmpmgr;
+ OfflineConfiguration offline = (OfflineConfiguration)
ContextHelper.getServiceFromContext(
+ OfflineConfiguration.class, servletContext);
+ if (offline == null) throw new IllegalStateException(
+ "OfflineConfiguration missing in ServletContext");
+ else tmpmgr =
OWLOntologyManagerFactory.createOWLOntologyManager(offline
+ .getOntologySourceLocations().toArray(new IRI[0]));
+
IRI iri = null;
try {
iri = IRI.create(ontologyIri);
} catch (Exception ex) {
- throw new WebApplicationException(404);
+ throw new WebApplicationException(NOT_FOUND);
}
OntologyIndex index = onm.getOntologyIndex();
if (!index.isOntologyLoaded(iri))
// No such ontology registered, so return 404.
- return Response.status(404).build();
+ return Response.status(NOT_FOUND).build();
OWLOntology ont = index.getOntology(iri);
- OWLOntologyManager tmpmgr =
onm.getOntologyManagerFactory().createOntologyManager(true);
+
StringDocumentTarget tgt = new StringDocumentTarget();
try {
tmpmgr.saveOntology(ont, new RDFXMLOntologyFormat(), tgt);
} catch (OWLOntologyStorageException e) {
- throw new WebApplicationException(500);
+ throw new WebApplicationException(INTERNAL_SERVER_ERROR);
}
return Response.ok(tgt.toString()).build();
}
@@ -95,24 +106,31 @@ public class ONMOntResource extends Base
@Produces("text/turtle")
public Response getOntologyT(@QueryParam("iri") String ontologyIri) {
+ OWLOntologyManager tmpmgr;
+ OfflineConfiguration offline = (OfflineConfiguration)
ContextHelper.getServiceFromContext(
+ OfflineConfiguration.class, servletContext);
+ if (offline == null) throw new IllegalStateException(
+ "OfflineConfiguration missing in ServletContext");
+ else tmpmgr =
OWLOntologyManagerFactory.createOWLOntologyManager(offline
+ .getOntologySourceLocations().toArray(new IRI[0]));
+
IRI iri = null;
try {
iri = IRI.create(ontologyIri);
} catch (Exception ex) {
- throw new WebApplicationException(404);
+ throw new WebApplicationException(NOT_FOUND);
}
OntologyIndex index = onm.getOntologyIndex();
if (!index.isOntologyLoaded(iri))
// No such ontology registered, so return 404.
- return Response.status(404).build();
+ return Response.status(NOT_FOUND).build();
OWLOntology ont = index.getOntology(iri);
- OWLOntologyManager tmpmgr =
onm.getOntologyManagerFactory().createOntologyManager(true);
StringDocumentTarget tgt = new StringDocumentTarget();
try {
tmpmgr.saveOntology(ont, new TurtleOntologyFormat(), tgt);
} catch (OWLOntologyStorageException e) {
- throw new WebApplicationException(500);
+ throw new WebApplicationException(INTERNAL_SERVER_ERROR);
}
return Response.ok(tgt.toString()).build();
}
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java?rev=1153186&r1=1153185&r2=1153186&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java
Tue Aug 2 16:44:15 2011
@@ -25,7 +25,6 @@ import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
@@ -59,6 +58,7 @@ import com.sun.jersey.api.view.Viewable;
@Path("/ontonet/ontology")
public class ONMRootResource extends BaseStanbolResource {
+ @SuppressWarnings("unused")
private Logger log = LoggerFactory.getLogger(getClass());
/*
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java?rev=1153186&r1=1153185&r2=1153186&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java
Tue Aug 2 16:44:15 2011
@@ -16,7 +16,8 @@
*/
package org.apache.stanbol.ontologymanager.web.resources;
-import static javax.ws.rs.core.Response.Status.*;
+import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
+import static javax.ws.rs.core.Response.Status.NOT_FOUND;
import java.net.URI;
import java.util.HashSet;
@@ -38,6 +39,7 @@ import org.apache.stanbol.commons.web.ba
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.OfflineConfiguration;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologySource;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
@@ -45,12 +47,12 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.apache.stanbol.ontologymanager.web.util.OntologyRenderUtils;
+import org.apache.stanbol.owl.OWLOntologyManagerFactory;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.io.RDFXMLOntologyFormat;
import org.semanticweb.owlapi.model.AxiomType;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLAxiom;
-import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
@@ -76,8 +78,6 @@ public class ONMScopeOntologyResource ex
*/
protected ONManager onm;
- protected ServletContext servletContext;
-
protected ClerezzaOntologyStorage storage;
public ONMScopeOntologyResource(@Context ServletContext servletContext) {
@@ -136,8 +136,15 @@ public class ONMScopeOntologyResource ex
if (space != null) ont = space.getOntology(ontiri);
if (ont == null) {
- OWLOntologyManager man =
onm.getOntologyManagerFactory().createOntologyManager(true);
- final Set<OWLOntology> ontologies =
scope.getSessionSpace(ontiri).getOntologies();
+ OWLOntologyManager tmpmgr;
+ OfflineConfiguration offline = (OfflineConfiguration)
ContextHelper.getServiceFromContext(
+ OfflineConfiguration.class, servletContext);
+ if (offline == null) throw new IllegalStateException(
+ "OfflineConfiguration missing in ServletContext");
+ else tmpmgr =
OWLOntologyManagerFactory.createOWLOntologyManager(offline
+ .getOntologySourceLocations().toArray(new IRI[0]));
+
+ final Set<OWLOntology> ontologies =
scope.getSessionSpace(ontiri).getOntologies();
OWLOntologySetProvider provider = new OWLOntologySetProvider()
{
@Override
@@ -147,7 +154,7 @@ public class ONMScopeOntologyResource ex
};
OWLOntologyMerger merger = new OWLOntologyMerger(provider);
try {
- ont = merger.createMergedOntology(man, ontiri);
+ ont = merger.createMergedOntology(tmpmgr, ontiri);
} catch (OWLOntologyCreationException e) {
throw new WebApplicationException(e,
INTERNAL_SERVER_ERROR);
}
@@ -180,7 +187,6 @@ public class ONMScopeOntologyResource ex
// Creo un manager per gestire tutte le ontologie
final OWLOntologyManager man =
OWLManager.createOWLOntologyManager();
- OWLDataFactory factory = OWLManager.getOWLDataFactory();
// Creo un set con tutte le ontologie dello scope
OWLOntologySetProvider provider = new OWLOntologySetProvider() {
@@ -291,7 +297,7 @@ public class ONMScopeOntologyResource ex
if (ontologyid != null && !ontologyid.equals("")) {
String scopeURI =
uriInfo.getAbsolutePath().toString().replace(ontologyid, "");
IRI scopeIri = IRI.create(uriInfo.getBaseUri() + "ontology/" +
scopeId);
- // System.out.println("SCOPE IRI : " + scopeIri);
+
IRI ontIri = IRI.create(ontologyid);
ScopeRegistry reg = onm.getScopeRegistry();
OntologyScope scope = reg.getScope(scopeIri);
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java?rev=1153186&r1=1153185&r2=1153186&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java
Tue Aug 2 16:44:15 2011
@@ -64,6 +64,7 @@ import org.slf4j.LoggerFactory;
@Path("/ontonet/ontology/{scopeid}")
public class ONMScopeResource extends BaseStanbolResource {
+ @SuppressWarnings("unused")
private Logger log = LoggerFactory.getLogger(getClass());
/*
