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 2011/03/28 18:42:58 UTC
svn commit: r1086295 - in /incubator/stanbol/trunk/kres: jersey/
jersey/src/main/java/org/apache/stanbol/kres/jersey/
jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/
jersey/src/main/java/org/apache/stanbol/kres/jersey/util/ ontologymanage...
Author: alexdma
Date: Mon Mar 28 16:42:57 2011
New Revision: 1086295
URL: http://svn.apache.org/viewvc?rev=1086295&view=rev
Log:
STANBOL-39 :
- Moved RESTful resources in ontologymanager/web to new Java package
- Moved GraphsResource and OntologyRenderUtils classes from jersey to ontologymanager/web
- Updated JerseyEndpointApplication classes
- Replaced ontonet dependency in jersey module POM with owlapi dependency (due to transformation package)
Added:
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/kres/
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/GraphsResource.java
- copied, changed from r1085463, incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/GraphsResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMOntResource.java
- copied, changed from r1085463, incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMOntResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java
- copied, changed from r1085463, incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMRootResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java
- copied, changed from r1085463, incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeOntologyResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java
- copied, changed from r1085463, incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionIDResource.java
- copied, changed from r1086236, incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/SessionIDResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
- copied, changed from r1086236, incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/SessionResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/
- copied from r1085463, incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/util/
Removed:
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/GraphsResource.java
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/util/
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMOntResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMRootResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeOntologyResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/SessionIDResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/SessionResource.java
Modified:
incubator/stanbol/trunk/kres/jersey/pom.xml
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpointApplication.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyRenderUtils.java
Modified: incubator/stanbol/trunk/kres/jersey/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/pom.xml?rev=1086295&r1=1086294&r2=1086295&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/pom.xml (original)
+++ incubator/stanbol/trunk/kres/jersey/pom.xml Mon Mar 28 16:42:57 2011
@@ -207,14 +207,15 @@
<version>${pax-exam-version}</version>
<scope>test</scope>
</dependency>
-
+
<!-- Stanbol deps -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
+ <artifactId>org.apache.stanbol.owlapi</artifactId>
<version>${stanbol-version}</version>
+ <scope>provided</scope>
</dependency>
-
+
<!-- OWL deps -->
<dependency>
<groupId>com.hp.hpl.jena</groupId>
Modified: incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpointApplication.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpointApplication.java?rev=1086295&r1=1086294&r2=1086295&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpointApplication.java (original)
+++ incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpointApplication.java Mon Mar 28 16:42:57 2011
@@ -7,7 +7,6 @@ import javax.ws.rs.core.Application;
import org.apache.stanbol.kres.jersey.processors.KReSViewProcessor;
import org.apache.stanbol.kres.jersey.resource.DocumentationResource;
-import org.apache.stanbol.kres.jersey.resource.GraphsResource;
import org.apache.stanbol.kres.jersey.resource.RESTfulResource;
import org.apache.stanbol.kres.jersey.resource.RootResource;
import org.apache.stanbol.kres.jersey.writers.GraphWriter;
@@ -34,7 +33,6 @@ public class JerseyEndpointApplication e
// resources
classes.add(RootResource.class);
- classes.add(GraphsResource.class);
classes.add(DocumentationResource.class);
/* REST services */
Modified: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java?rev=1086295&r1=1086294&r2=1086295&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java Mon Mar 28 16:42:57 2011
@@ -5,12 +5,17 @@ import java.util.Set;
import javax.ws.rs.core.Application;
-import org.apache.stanbol.kres.jersey.SessionIDResource;
-import org.apache.stanbol.kres.jersey.SessionResource;
import org.apache.stanbol.kres.jersey.processors.KReSViewProcessor;
import org.apache.stanbol.kres.jersey.writers.GraphWriter;
import org.apache.stanbol.kres.jersey.writers.OWLOntologyWriter;
import org.apache.stanbol.kres.jersey.writers.ResultSetWriter;
+import org.apache.stanbol.ontologymanager.web.resources.GraphsResource;
+import org.apache.stanbol.ontologymanager.web.resources.ONMOntResource;
+import org.apache.stanbol.ontologymanager.web.resources.ONMRootResource;
+import org.apache.stanbol.ontologymanager.web.resources.ONMScopeOntologyResource;
+import org.apache.stanbol.ontologymanager.web.resources.ONMScopeResource;
+import org.apache.stanbol.ontologymanager.web.resources.SessionIDResource;
+import org.apache.stanbol.ontologymanager.web.resources.SessionResource;
/**
* Statically define the list of available resources and providers to be used by the KReS JAX-RS Endpoint.
@@ -30,6 +35,8 @@ public class JerseyEndpointApplication e
public Set<Class<?>> getClasses() {
Set<Class<?>> classes = new HashSet<Class<?>>();
+ classes.add(GraphsResource.class);
+
classes.add(ONMRootResource.class);
classes.add(ONMScopeResource.class);
classes.add(ONMScopeOntologyResource.class);
Copied: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/GraphsResource.java (from r1085463, incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/GraphsResource.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/GraphsResource.java?p2=incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/GraphsResource.java&p1=incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/GraphsResource.java&r1=1085463&r2=1086295&rev=1086295&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/GraphsResource.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/GraphsResource.java Mon Mar 28 16:42:57 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.kres.jersey.resource;
+package org.apache.stanbol.ontologymanager.web.resources;
import java.io.InputStream;
import java.util.ArrayList;
@@ -20,6 +20,8 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.rdf.core.access.TcManager;
+import org.apache.stanbol.kres.jersey.format.KReSFormat;
+import org.apache.stanbol.kres.jersey.resource.NavigationMixin;
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.NoSuchStoreException;
@@ -38,8 +40,6 @@ import org.slf4j.LoggerFactory;
import com.sun.jersey.api.view.ImplicitProduces;
-import org.apache.stanbol.kres.jersey.format.KReSFormat;
-
@Path("/graphs")
@ImplicitProduces(MediaType.TEXT_HTML + ";qs=2")
public class GraphsResource extends NavigationMixin {
Copied: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMOntResource.java (from r1085463, incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMOntResource.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMOntResource.java?p2=incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMOntResource.java&p1=incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMOntResource.java&r1=1085463&r2=1086295&rev=1086295&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMOntResource.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMOntResource.java Mon Mar 28 16:42:57 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.ontologymanager.web;
+package org.apache.stanbol.ontologymanager.web.resources;
import java.util.Hashtable;
Copied: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java (from r1085463, incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMRootResource.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java?p2=incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java&p1=incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMRootResource.java&r1=1085463&r2=1086295&rev=1086295&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMRootResource.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java Mon Mar 28 16:42:57 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.ontologymanager.web;
+package org.apache.stanbol.ontologymanager.web.resources;
import java.util.Hashtable;
import java.util.Set;
Copied: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java (from r1085463, incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeOntologyResource.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java?p2=incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java&p1=incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeOntologyResource.java&r1=1085463&r2=1086295&rev=1086295&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeOntologyResource.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java Mon Mar 28 16:42:57 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.ontologymanager.web;
+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;
@@ -28,6 +28,7 @@ import org.apache.stanbol.ontologymanage
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.apibinding.OWLManager;
import org.semanticweb.owlapi.io.RDFXMLOntologyFormat;
import org.semanticweb.owlapi.model.IRI;
@@ -43,7 +44,6 @@ import org.slf4j.LoggerFactory;
import org.apache.stanbol.kres.jersey.format.KReSFormat;
import org.apache.stanbol.kres.jersey.resource.NavigationMixin;
-import org.apache.stanbol.kres.jersey.util.OntologyRenderUtils;
/**
* This resource represents ontologies loaded within a scope.
Copied: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java (from r1085463, incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeResource.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java?p2=incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java&p1=incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeResource.java&r1=1085463&r2=1086295&rev=1086295&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/ONMScopeResource.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java Mon Mar 28 16:42:57 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.ontologymanager.web;
+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;
Copied: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionIDResource.java (from r1086236, incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/SessionIDResource.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionIDResource.java?p2=incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionIDResource.java&p1=incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/SessionIDResource.java&r1=1086236&r2=1086295&rev=1086295&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/SessionIDResource.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionIDResource.java Mon Mar 28 16:42:57 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.ontologymanager.web;
+package org.apache.stanbol.ontologymanager.web.resources;
import javax.servlet.ServletContext;
import javax.ws.rs.GET;
Copied: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java (from r1086236, incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/SessionResource.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java?p2=incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java&p1=incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/SessionResource.java&r1=1086236&r2=1086295&rev=1086295&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/SessionResource.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java Mon Mar 28 16:42:57 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.ontologymanager.web;
+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;
Modified: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyRenderUtils.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyRenderUtils.java?rev=1086295&r1=1085463&r2=1086295&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyRenderUtils.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyRenderUtils.java Mon Mar 28 16:42:57 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.kres.jersey.util;
+package org.apache.stanbol.ontologymanager.web.util;
import java.util.ArrayList;
import java.util.List;
@@ -26,6 +26,12 @@ import org.semanticweb.owlapi.model.OWLO
import org.apache.stanbol.kres.jersey.format.KReSFormat;
+/**
+ * Contains hacks to regular ontology renderers with replacements for input statements.
+ *
+ * @author alessandro
+ *
+ */
public class OntologyRenderUtils {
/**