Author: alexdma
Date: Thu Jun 30 14:36:53 2011
New Revision: 1141553
URL: http://svn.apache.org/viewvc?rev=1141553&view=rev
Log:
STANBOL-179 :
- Added more FTL templates for REST APIs, along with GET methods for HTML
- Cleaned up stdout prints and unused imports
Added:
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource/index.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/index.ftl
Modified:
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
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RESTfulResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RootResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionIDResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/index.ftl
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=1141553&r1=1141552&r2=1141553&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
Thu Jun 30 14:36:53 2011
@@ -1,7 +1,5 @@
package org.apache.stanbol.ontologymanager.web.resources;
-import java.util.Hashtable;
-
import javax.servlet.ServletContext;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@@ -11,13 +9,11 @@ import javax.ws.rs.WebApplicationExcepti
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
-import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
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.ontology.OntologyIndex;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.coode.owlapi.turtle.TurtleOntologyFormat;
import org.semanticweb.owlapi.io.RDFXMLOntologyFormat;
@@ -38,17 +34,19 @@ public class ONMOntResource extends Base
* Placeholder for the ONManager to be fetched from the servlet context.
*/
protected ONManager onm;
- protected ClerezzaOntologyStorage storage;
+
+ protected Serializer serializer;
protected ServletContext servletContext;
- protected Serializer serializer;
+ protected ClerezzaOntologyStorage storage;
public ONMOntResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
this.onm = (ONManager)
ContextHelper.getServiceFromContext(ONManager.class, servletContext);
- this.storage = (ClerezzaOntologyStorage)
ContextHelper.getServiceFromContext(ClerezzaOntologyStorage.class,
servletContext);
- this.serializer = (Serializer)
ContextHelper.getServiceFromContext(Serializer.class,servletContext);
+ this.storage = (ClerezzaOntologyStorage)
ContextHelper.getServiceFromContext(
+ ClerezzaOntologyStorage.class, servletContext);
+ this.serializer = (Serializer)
ContextHelper.getServiceFromContext(Serializer.class, servletContext);
}
@GET
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=1141553&r1=1141552&r2=1141553&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
Thu Jun 30 14:36:53 2011
@@ -1,6 +1,7 @@
package org.apache.stanbol.ontologymanager.web.resources;
-import java.util.Hashtable;
+import static javax.ws.rs.core.MediaType.TEXT_HTML;
+
import java.util.Set;
import javax.servlet.ServletContext;
@@ -15,20 +16,19 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
-import org.apache.clerezza.rdf.core.access.TcManager;
+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.ontology.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import
org.apache.stanbol.ontologymanager.ontonet.impl.renderers.ScopeSetRenderer;
import org.semanticweb.owlapi.model.OWLOntology;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-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 com.sun.jersey.api.view.Viewable;
/**
* The main Web resource of the KReS ontology manager. All the scopes,
sessions and ontologies are accessible
@@ -44,14 +44,14 @@ import org.apache.stanbol.commons.web.ba
public class ONMRootResource extends BaseStanbolResource {
private Logger log = LoggerFactory.getLogger(getClass());
-
+
/*
* Placeholder for the ONManager to be fetched from the servlet context.
*/
protected ONManager onm;
- protected ClerezzaOntologyStorage storage;
protected ServletContext servletContext;
+ protected ClerezzaOntologyStorage storage;
public ONMRootResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
@@ -107,4 +107,10 @@ public class ONMRootResource extends Bas
return Response.ok(ontology).build();
}
+ @GET
+ @Produces(TEXT_HTML)
+ public Response getView() {
+ return Response.ok(new Viewable("index", this), TEXT_HTML).build();
+ }
+
}
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=1141553&r1=1141552&r2=1141553&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
Thu Jun 30 14:36:53 2011
@@ -1,11 +1,9 @@
package org.apache.stanbol.ontologymanager.web.resources;
-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.*;
import java.net.URI;
import java.util.HashSet;
-import java.util.Hashtable;
import java.util.Set;
import javax.servlet.ServletContext;
@@ -20,7 +18,6 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
-import org.apache.clerezza.rdf.core.access.TcManager;
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;
@@ -30,13 +27,10 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
import
org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceModificationException;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.apache.stanbol.ontologymanager.web.util.OntologyRenderUtils;
-import org.semanticweb.owlapi.io.RDFXMLOntologyFormat;
-import org.semanticweb.owlapi.model.OWLImportsDeclaration;
-import org.semanticweb.owlapi.model.OWLOntologyStorageException;
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;
@@ -45,6 +39,7 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
import org.semanticweb.owlapi.model.OWLOntologySetProvider;
+import org.semanticweb.owlapi.model.OWLOntologyStorageException;
import org.semanticweb.owlapi.util.OWLOntologyMerger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -64,14 +59,16 @@ public class ONMScopeOntologyResource ex
* Placeholder for the ONManager to be fetched from the servlet context.
*/
protected ONManager onm;
- protected ClerezzaOntologyStorage storage;
protected ServletContext servletContext;
+ protected ClerezzaOntologyStorage storage;
+
public ONMScopeOntologyResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
this.onm = (ONManager)
ContextHelper.getServiceFromContext(ONManager.class, servletContext);
- this.storage = (ClerezzaOntologyStorage)
ContextHelper.getServiceFromContext(ClerezzaOntologyStorage.class,
servletContext);
+ this.storage = (ClerezzaOntologyStorage)
ContextHelper.getServiceFromContext(
+ ClerezzaOntologyStorage.class, servletContext);
}
/**
@@ -90,8 +87,8 @@ public class ONMScopeOntologyResource ex
public Response getScopeOntology(@PathParam("scopeid") String scopeid,
@PathParam("uri") String ontologyid,
@Context UriInfo uriInfo) {
-
- if(!ontologyid.equals("all")){
+
+ if (!ontologyid.equals("all")) {
String absur = uriInfo.getAbsolutePath().toString();
URI uri = URI.create(absur.substring(0,
absur.lastIndexOf(ontologyid) - 1));
@@ -106,17 +103,14 @@ public class ONMScopeOntologyResource ex
OntologyScope scope = reg.getScope(sciri);
if (scope == null) return Response.status(NOT_FOUND).build();
- /* BEGIN debug code, uncomment only for local testing
- OWLOntology test = null, top = null;
- test = scope.getCustomSpace().getOntology(ontiri);
- System.out.println("Ontology " + ontiri);
- for (OWLImportsDeclaration imp : test.getImportsDeclarations())
- System.out.println("\timports " + imp.getIRI());
- top = scope.getCoreSpace().getTopOntology();
- System.out.println("Core root for scope " + scopeid);
- for (OWLImportsDeclaration imp : top.getImportsDeclarations())
- System.out.println("\timports " + imp.getIRI());
- END debug code */
+ /*
+ * BEGIN debug code, uncomment only for local testing OWLOntology
test = null, top = null; test =
+ * scope.getCustomSpace().getOntology(ontiri);
System.out.println("Ontology " + ontiri); for
+ * (OWLImportsDeclaration imp : test.getImportsDeclarations())
System.out.println("\timports " +
+ * imp.getIRI()); top = scope.getCoreSpace().getTopOntology();
+ * System.out.println("Core root for scope " + scopeid); for
(OWLImportsDeclaration imp :
+ * top.getImportsDeclarations()) System.out.println("\timports " +
imp.getIRI()); END debug code
+ */
OWLOntology ont = null;
// By default, always try retrieving the ontology from the custom
space
@@ -130,20 +124,12 @@ public class ONMScopeOntologyResource ex
final Set<OWLOntology> ontologies =
scope.getSessionSpace(ontiri).getOntologies();
OWLOntologySetProvider provider = new OWLOntologySetProvider()
{
-
@Override
public Set<OWLOntology> getOntologies() {
- // System.out.println("ID SPACE : " + ontologies);
return ontologies;
}
};
OWLOntologyMerger merger = new OWLOntologyMerger(provider);
-
- /*
- * Set<OntologySpace> spaces = scope.getSessionSpaces();
for(OntologySpace space : spaces){
- * System.out.println("ID SPACE : "+space.getID()); }
- */
-
try {
ont = merger.createMergedOntology(man, ontiri);
} catch (OWLOntologyCreationException e) {
@@ -156,122 +142,119 @@ public class ONMScopeOntologyResource ex
}
String res = null;
try {
- res = OntologyRenderUtils.renderOntology(ont, new
RDFXMLOntologyFormat(), sciri.toString(), onm);
+ res = OntologyRenderUtils.renderOntology(ont, new
RDFXMLOntologyFormat(), sciri.toString(),
+ onm);
} catch (OWLOntologyStorageException e) {
throw new WebApplicationException(e, INTERNAL_SERVER_ERROR);
}
return Response.ok(/* ont */res).build();
- }else{
+ } else {
ScopeRegistry reg = onm.getScopeRegistry();
- String scopeID = uriInfo.getAbsolutePath().toString();
- scopeID = scopeID.substring(0,scopeID.lastIndexOf("/"));
- OntologyScope scope = reg.getScope(IRI.create(scopeID));
-
- if (scope == null)
- return Response.status(404).build();
-
+ String scopeID = uriInfo.getAbsolutePath().toString();
+ scopeID = scopeID.substring(0, scopeID.lastIndexOf("/"));
+ OntologyScope scope = reg.getScope(IRI.create(scopeID));
+
+ if (scope == null) return Response.status(404).build();
+
final Set<OWLOntology> customOntologies =
scope.getCustomSpace().getOntologies();
-
+
final Set<OWLOntology> coreOntologies =
scope.getCoreSpace().getOntologies();
-
+
final Set<OntologySpace> sessionSpaces = scope.getSessionSpaces();
-
- //Creo un manager per gestire tutte le ontologie
- final OWLOntologyManager man =
OWLManager.createOWLOntologyManager();
+
+ // 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() {
+
+ // Creo un set con tutte le ontologie dello scope
+ OWLOntologySetProvider provider = new OWLOntologySetProvider() {
@Override
public Set<OWLOntology> getOntologies() {
- Set<OWLOntology> ontologies = new
HashSet<OWLOntology>();
+ Set<OWLOntology> ontologies = new HashSet<OWLOntology>();
- //Inserisco le core ontologies
- for(OWLOntology ontology : coreOntologies){
- OWLOntology ont;
- try {
- ont = man.createOntology();
- Set<OWLAxiom> axioms =
ontology.getAxioms();
- for(OWLAxiom axiom : axioms){
-
-
if(!axiom.isOfType(AxiomType.DATA_PROPERTY_ASSERTION) &&
-
!axiom.isOfType(AxiomType.DATATYPE_DEFINITION) &&
-
!axiom.isOfType(AxiomType.DATA_PROPERTY_DOMAIN) &&
-
!axiom.isOfType(AxiomType.DATA_PROPERTY_RANGE)){
- man.addAxiom(ont,
axiom);
- }
- }
- ontologies.add(ont);
- } catch (OWLOntologyCreationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ // Inserisco le core ontologies
+ for (OWLOntology ontology : coreOntologies) {
+ OWLOntology ont;
+ try {
+ ont = man.createOntology();
+ Set<OWLAxiom> axioms = ontology.getAxioms();
+ for (OWLAxiom axiom : axioms) {
+
+ if
(!axiom.isOfType(AxiomType.DATA_PROPERTY_ASSERTION)
+ &&
!axiom.isOfType(AxiomType.DATATYPE_DEFINITION)
+ &&
!axiom.isOfType(AxiomType.DATA_PROPERTY_DOMAIN)
+ &&
!axiom.isOfType(AxiomType.DATA_PROPERTY_RANGE)) {
+ man.addAxiom(ont, axiom);
}
+ }
+ ontologies.add(ont);
+ } catch (OWLOntologyCreationException e) {
+ throw new WebApplicationException(e,
INTERNAL_SERVER_ERROR);
}
+ }
- //Inserisco le custom ontology
- for(OWLOntology ontology : customOntologies){
+ // Inserisco le custom ontology
+ for (OWLOntology ontology : customOntologies) {
- OWLOntology ont;
- try {
- ont = man.createOntology();
- Set<OWLAxiom> axioms =
ontology.getAxioms();
- for(OWLAxiom axiom : axioms){
-
-
if(!axiom.isOfType(AxiomType.DATA_PROPERTY_ASSERTION) &&
-
!axiom.isOfType(AxiomType.DATATYPE_DEFINITION) &&
-
!axiom.isOfType(AxiomType.DATA_PROPERTY_DOMAIN) &&
-
!axiom.isOfType(AxiomType.DATA_PROPERTY_RANGE)){
- man.addAxiom(ont,
axiom);
- }
- }
- ontologies.add(ont);
- } catch (OWLOntologyCreationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ OWLOntology ont;
+ try {
+ ont = man.createOntology();
+ Set<OWLAxiom> axioms = ontology.getAxioms();
+ for (OWLAxiom axiom : axioms) {
+
+ if
(!axiom.isOfType(AxiomType.DATA_PROPERTY_ASSERTION)
+ &&
!axiom.isOfType(AxiomType.DATATYPE_DEFINITION)
+ &&
!axiom.isOfType(AxiomType.DATA_PROPERTY_DOMAIN)
+ &&
!axiom.isOfType(AxiomType.DATA_PROPERTY_RANGE)) {
+ man.addAxiom(ont, axiom);
}
-
+ }
+ ontologies.add(ont);
+ } catch (OWLOntologyCreationException e) {
+ throw new WebApplicationException(e,
INTERNAL_SERVER_ERROR);
}
- //Inserisco le session ontologies;
- for(OntologySpace ontologySpace : sessionSpaces){
- Set<OWLOntology> sessionOntologies =
ontologySpace.getOntologies();
- for(OWLOntology ontology : sessionOntologies){
-
- OWLOntology ont;
- try {
- ont = man.createOntology();
- Set<OWLAxiom> axioms =
ontology.getAxioms();
- for(OWLAxiom axiom : axioms){
-
-
if(!axiom.isOfType(AxiomType.DATA_PROPERTY_ASSERTION)){
-
man.addAxiom(ont, axiom);
- }
- }
-
-
- ontologies.add(ont);
- } catch (OWLOntologyCreationException
e) {
- // TODO Auto-generated catch
block
- e.printStackTrace();
- }
+ }
+ // Inserisco le session ontologies;
+ for (OntologySpace ontologySpace : sessionSpaces) {
+ Set<OWLOntology> sessionOntologies =
ontologySpace.getOntologies();
+ for (OWLOntology ontology : sessionOntologies) {
+
+ OWLOntology ont;
+ try {
+ ont = man.createOntology();
+ Set<OWLAxiom> axioms = ontology.getAxioms();
+ for (OWLAxiom axiom : axioms) {
+
+ if
(!axiom.isOfType(AxiomType.DATA_PROPERTY_ASSERTION)) {
+ man.addAxiom(ont, axiom);
+ }
}
+
+ ontologies.add(ont);
+ } catch (OWLOntologyCreationException e) {
+ throw new WebApplicationException(e,
INTERNAL_SERVER_ERROR);
+ }
+
}
- return ontologies;
+ }
+ return ontologies;
}
};
- //Faccio il merger delle ontolgoie
+ // Faccio il merger delle ontolgoie
OWLOntologyMerger merger = new OWLOntologyMerger(provider);
OWLOntology ontology;
try {
- ontology = merger.createMergedOntology(man,
IRI.create("http://kres.iks-project.eu/classify";));
+ ontology = merger
+ .createMergedOntology(man,
IRI.create("http://kres.iks-project.eu/classify";));
} catch (OWLOntologyCreationException ex) {
throw new WebApplicationException(ex, INTERNAL_SERVER_ERROR);
}
-
+
return Response.ok(ontology).build();
- }
+ }
}
@@ -291,11 +274,8 @@ public class ONMScopeOntologyResource ex
if (ontologyid != null && !ontologyid.equals("")) {
String scopeURI =
uriInfo.getAbsolutePath().toString().replace(ontologyid, "");
- /* System.out
- .println("Received DELETE request for ontology " +
ontologyid + " in scope " + scopeURI);
- */
IRI scopeIri = IRI.create(uriInfo.getBaseUri() + "ontology/" +
scopeId);
- //System.out.println("SCOPE IRI : " + scopeIri);
+ // 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=1141553&r1=1141552&r2=1141553&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
Thu Jun 30 14:36:53 2011
@@ -1,10 +1,6 @@
package org.apache.stanbol.ontologymanager.web.resources;
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import static javax.ws.rs.core.Response.Status.CONFLICT;
-import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
-
-import java.util.Hashtable;
+import static javax.ws.rs.core.Response.Status.*;
import javax.servlet.ServletContext;
import javax.ws.rs.Consumes;
@@ -25,7 +21,6 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
-import org.apache.clerezza.rdf.core.access.TcManager;
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;
@@ -36,11 +31,9 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import
org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScopeFactory;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
-import
org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeEventListener;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import
org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
import
org.apache.stanbol.ontologymanager.ontonet.api.registry.io.OntologyRegistryIRISource;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
@@ -57,6 +50,7 @@ public class ONMScopeResource extends Ba
* Placeholder for the ONManager to be fetched from the servlet context.
*/
protected ONManager onm;
+
protected ClerezzaOntologyStorage storage;
protected ServletContext servletContext;
@@ -147,7 +141,7 @@ public class ONMScopeResource extends Ba
throw new WebApplicationException(e,
INTERNAL_SERVER_ERROR);
}
} else
- throw new WebApplicationException(404);
+ throw new WebApplicationException(NOT_FOUND);
return Response.ok(res).build();
}
@@ -197,8 +191,6 @@ public class ONMScopeResource extends Ba
coreSrc = new
RootOntologyIRISource(IRI.create(coreOntology));
} catch (Exception e2) {
// If this fails too, throw a bad request.
- // System.out.println("1.1");
- e2.printStackTrace();
throw new WebApplicationException(e2,
BAD_REQUEST);
}
}
@@ -217,18 +209,11 @@ public class ONMScopeResource extends Ba
.create(customOntology));
} catch (Exception e2) {
// If this fails too, throw a bad
request.
- // System.out.println("1.2");
- e2.printStackTrace();
throw new WebApplicationException(e2,
BAD_REQUEST);
}
}
}
- // If we weren't able to build core source, throw bad request.
- if (coreSrc == null) {
- // System.out.println("1.3");
- throw new WebApplicationException(BAD_REQUEST);
- }
-
+
// Now the creation.
try {
IRI scopeId = IRI.create(uriInfo.getAbsolutePath());
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RESTfulResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RESTfulResource.java?rev=1141553&r1=1141552&r2=1141553&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RESTfulResource.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RESTfulResource.java
Thu Jun 30 14:36:53 2011
@@ -12,4 +12,3 @@ import com.sun.jersey.api.view.ImplicitP
public class RESTfulResource extends BaseStanbolResource {
}
-
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RootResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RootResource.java?rev=1141553&r1=1141552&r2=1141553&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RootResource.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RootResource.java
Thu Jun 30 14:36:53 2011
@@ -15,11 +15,10 @@ import org.apache.stanbol.commons.web.ba
import com.sun.jersey.api.view.ImplicitProduces;
import com.sun.jersey.api.view.Viewable;
-
/**
*
* @author andrea.nuzzolese
- *
+ *
*/
@Path("/ontonet")
@@ -27,10 +26,9 @@ import com.sun.jersey.api.view.Viewable;
public class RootResource extends BaseStanbolResource {
public RootResource(@Context ServletContext servletContext) {
-
}
-
+
@GET
@Produces(TEXT_HTML)
public Response get() {
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionIDResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionIDResource.java?rev=1141553&r1=1141552&r2=1141553&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionIDResource.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionIDResource.java
Thu Jun 30 14:36:53 2011
@@ -8,47 +8,45 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
import javax.ws.rs.core.Response.Status;
+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.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import
org.apache.stanbol.ontologymanager.ontonet.impl.renderers.SessionRenderer;
import org.semanticweb.owlapi.model.IRI;
@Path("/ontonet/session/{id:.+}")
public class SessionIDResource extends BaseStanbolResource {
- /*
- * Placeholder for the ONManager to be fetched from the servlet context.
- */
- protected ONManager onm;
-
- protected ServletContext servletContext;
-
- public SessionIDResource(@Context ServletContext servletContext) {
- this.servletContext = servletContext;
- this.onm = (ONManager)
ContextHelper.getServiceFromContext(ONManager.class, servletContext);
- }
-
- @GET
- @Produces("application/rdf+xml")
- public Response getSessionMetadataOntology(
- @PathParam("id") String sessionId, @Context UriInfo
uriInfo,
- @Context HttpHeaders headers) {
-
- Session ses = null;
- SessionManager mgr = onm.getSessionManager();
- ses = mgr.getSession(IRI.create(sessionId));
- if (ses == null)
- return Response.status(Status.NO_CONTENT).build();
+ /*
+ * Placeholder for the ONManager to be fetched from the servlet context.
+ */
+ protected ONManager onm;
+
+ protected ServletContext servletContext;
+
+ public SessionIDResource(@Context ServletContext servletContext) {
+ this.servletContext = servletContext;
+ this.onm = (ONManager)
ContextHelper.getServiceFromContext(ONManager.class, servletContext);
+ }
+
+ @GET
+ @Produces("application/rdf+xml")
+ public Response getSessionMetadataOntology(@PathParam("id") String
sessionId,
+ @Context UriInfo uriInfo,
+ @Context HttpHeaders headers) {
+
+ Session ses = null;
+ SessionManager mgr = onm.getSessionManager();
+ ses = mgr.getSession(IRI.create(sessionId));
+ if (ses == null) return Response.status(Status.NO_CONTENT).build();
- return
Response.ok(SessionRenderer.getSessionMetadataRDF(ses)).build();
+ return
Response.ok(SessionRenderer.getSessionMetadataRDFasOntology(ses)).build();
- }
+ }
}
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java?rev=1141553&r1=1141552&r2=1141553&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
Thu Jun 30 14:36:53 2011
@@ -1,5 +1,6 @@
package org.apache.stanbol.ontologymanager.web.resources;
+import static javax.ws.rs.core.MediaType.TEXT_HTML;
import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
import static javax.ws.rs.core.Response.Status.NOT_FOUND;
@@ -9,18 +10,21 @@ import javax.servlet.ServletContext;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.FormParam;
+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;
-import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
+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.io.RootOntologyIRISource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologySource;
@@ -32,16 +36,12 @@ import org.apache.stanbol.ontologymanage
import
org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import
org.apache.stanbol.ontologymanager.ontonet.impl.renderers.SessionRenderer;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
-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 com.sun.jersey.api.view.Viewable;
import com.sun.jersey.multipart.FormDataParam;
@Path("/ontonet/session")
@@ -58,7 +58,7 @@ public class SessionResource extends Bas
this.servletContext = servletContext;
this.onm = (ONManager)
ContextHelper.getServiceFromContext(ONManager.class, servletContext);
}
-
+
@PUT
@Consumes(MediaType.MULTIPART_FORM_DATA)
public Response addOntology(@FormDataParam("scope") String scope,
@@ -152,7 +152,7 @@ public class SessionResource extends Bas
SessionOntologySpace sessionOntologySpace =
ontologySpaceFactory.createSessionOntologySpace(scopeIRI);
ontologyScope.addSessionSpace(sessionOntologySpace, ses.getID());
- return Response.ok(SessionRenderer.getSessionMetadataRDF(ses)).build();
+ return
Response.ok(SessionRenderer.getSessionMetadataRDFasOntology(ses)).build();
}
@@ -202,4 +202,10 @@ public class SessionResource extends Bas
}
+ @GET
+ @Produces(TEXT_HTML)
+ public Response getView() {
+ return Response.ok(new Viewable("index", this), TEXT_HTML).build();
+ }
+
}
Added:
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource/index.ftl
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource/index.ftl?rev=1141553&view=auto
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource/index.ftl
(added)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource/index.ftl
Thu Jun 30 14:36:53 2011
@@ -0,0 +1,12 @@
+<#import "/imports/common.ftl" as common>
+<#import "/imports/ontonetDescription.ftl" as ontonetDescription>
+
+<#escape x as x?html>
+ <@common.page title="Apache Stanbol OntoNet scope manager" hasrestapi=false>
+
+ <div class="panel" id="webview">
+ <p>This is the start page of the ontology scope manager.</p>
+ </div>
+
+ </@common.page>
+</#escape>
\ No newline at end of file
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/index.ftl
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/index.ftl?rev=1141553&r1=1141552&r2=1141553&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/index.ftl
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/index.ftl
Thu Jun 30 14:36:53 2011
@@ -2,7 +2,7 @@
<#import "/imports/ontonetDescription.ftl" as ontonetDescription>
<#escape x as x?html>
- <@common.page title="Apache Stanbol Ontonet" hasrestapi=true>
+ <@common.page title="Apache Stanbol OntoNet" hasrestapi=true>
<@ontonetDescription.view />
@@ -16,16 +16,48 @@
<p>The RESTful API of the Ontology Network Manager is structured as
follows.</p>
+ <ul>
+ <li>Homepage @<a href="${it.publicBaseUri}ontonet">/ontonet</a>:
+ This page.
+ </li>
+ </ul>
+
<h4>Ontology Scope Management
(<code>"/ontonet/ontology"</code>):</h4>
- <ul>
- <li>Ontology scope list @<a
href="${it.publicBaseUri}ontonet/ontology">/ontonet/ontology</a>:
- Perform CRUD operations on ontology scopes.
- </li>
- </ul>
+ <ul>
+ <li>Ontology scope registry @<a
href="${it.publicBaseUri}ontonet/ontology">/ontonet/ontology</a>:
+ Perform CRUD operations on ontology scopes.
+ </li>
+ <li>Ontology scope @<code>/ontonet/ontology/{scopeName}</code>:
+ Perform CRUD operations on ontology scopes.
+ </li>
+ <li>Ontology scope <a
href="${it.publicBaseUri}ontonet/ontology/get">/ontonet/ontology/get</a>:
+ Perform CRUD operations on ontology scopes.
+ </li>
+ <li>Ontology within scope
@<code>/ontonet/ontology/{scopeName}/{ontologyID}</code>:
+ Perform CRUD operations on ontology scopes.
+ </li>
+ </ul>
<h4>Session Management (<code>"/ontonet/session"</code>):</h4>
+ <ul>
+ <li>Ontology scope registry @<a
href="${it.publicBaseUri}ontonet/session">/ontonet/session</a>:
+ Perform CRUD operations on ontology scopes.
+ </li>
+ <li>Ontology scope @<code>/ontonet/session/{sessionId}</code>:
+ Perform CRUD operations on ontology scopes.
+ </li>
+ </ul>
+
+ <h4>Graph Management (<code>"/ontonet/graphs"</code>):</h4>
+
+ <ul>
+ <li>Graph storage @<a
href="${it.publicBaseUri}ontonet/graphs">/ontonet/graphs</a>:
+ Storage and retrieval operation of RDF graphs, scope-independent.
+ </li>
+ </ul>
+
</div>
</@common.page>
Added:
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/index.ftl
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/index.ftl?rev=1141553&view=auto
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/index.ftl
(added)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/index.ftl
Thu Jun 30 14:36:53 2011
@@ -0,0 +1,12 @@
+<#import "/imports/common.ftl" as common>
+<#import "/imports/ontonetDescription.ftl" as ontonetDescription>
+
+<#escape x as x?html>
+ <@common.page title="Apache Stanbol OntoNet session manager"
hasrestapi=false>
+
+ <div class="panel" id="webview">
+ <p>This is the start page of the ontology session manager.</p>
+ </div>
+
+ </@common.page>
+</#escape>
\ No newline at end of file
