You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by en...@apache.org on 2011/06/20 17:04:59 UTC
svn commit: r1137648 - in /incubator/stanbol/trunk: ontologymanager/web/
ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resource/
reasoners/web/
reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/
reenginee...
Author: enridaga
Date: Mon Jun 20 15:04:59 2011
New Revision: 1137648
URL: http://svn.apache.org/viewvc?rev=1137648&view=rev
Log:
Applying patch attached on STANBOL-231 by Alberto Musetti.
Modified:
incubator/stanbol/trunk/ontologymanager/web/pom.xml
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resource/GraphsResource.java
incubator/stanbol/trunk/reasoners/web/pom.xml
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Classify.java
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistencyCheck.java
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistentRefactoring.java
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Enrichment.java
incubator/stanbol/trunk/reengineer/web/pom.xml
incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/resources/ReengineerResource.java
incubator/stanbol/trunk/rules/web/pom.xml
incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorResource.java
Modified: incubator/stanbol/trunk/ontologymanager/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/pom.xml?rev=1137648&r1=1137647&r2=1137648&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/pom.xml (original)
+++ incubator/stanbol/trunk/ontologymanager/web/pom.xml Mon Jun 20 15:04:59 2011
@@ -128,6 +128,7 @@
</build>
<dependencies>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -157,6 +158,10 @@
<artifactId>jersey-json</artifactId>
<version>${jersey-version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-multipart</artifactId>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
Modified: incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resource/GraphsResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resource/GraphsResource.java?rev=1137648&r1=1137647&r2=1137648&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resource/GraphsResource.java (original)
+++ incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resource/GraphsResource.java Mon Jun 20 15:04:59 2011
@@ -7,7 +7,6 @@ import java.util.Set;
import javax.servlet.ServletContext;
import javax.ws.rs.Consumes;
-import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
@@ -39,6 +38,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.sun.jersey.api.view.ImplicitProduces;
+import com.sun.jersey.multipart.FormDataParam;
@Path("/ontonet/graphs")
@ImplicitProduces(MediaType.TEXT_HTML + ";qs=2")
@@ -120,7 +120,7 @@ public class GraphsResource extends Base
@POST
@Consumes(MediaType.MULTIPART_FORM_DATA)
- public Response storeGraph(@FormParam("graph") InputStream graph, @FormParam("id") String id) {
+ public Response storeGraph(@FormDataParam("graph") InputStream graph, @FormDataParam("id") String id) {
try {
OWLOntology ontology = onManager.getOntologyManagerFactory().createOntologyManager(true)
.loadOntologyFromOntologyDocument(graph);
Modified: incubator/stanbol/trunk/reasoners/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/pom.xml?rev=1137648&r1=1137647&r2=1137648&view=diff
==============================================================================
--- incubator/stanbol/trunk/reasoners/web/pom.xml (original)
+++ incubator/stanbol/trunk/reasoners/web/pom.xml Mon Jun 20 15:04:59 2011
@@ -193,11 +193,10 @@
</exclusion>
</exclusions>
</dependency>
- <!--
- <dependency> <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-multipart</artifactId> <version>1.4</version>
- </dependency>
- -->
+ <dependency>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-multipart</artifactId>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
Modified: incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Classify.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Classify.java?rev=1137648&r1=1137647&r2=1137648&view=diff
==============================================================================
--- incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Classify.java (original)
+++ incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Classify.java Mon Jun 20 15:04:59 2011
@@ -63,6 +63,7 @@ import org.slf4j.LoggerFactory;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Resource;
+import com.sun.jersey.multipart.FormDataParam;
import org.apache.stanbol.commons.web.base.format.KRFormat;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
@@ -213,12 +214,12 @@ if (storage == null) {
@Produces(value = { KRFormat.RDF_XML, KRFormat.TURTLE,
KRFormat.OWL_XML })
public Response ontologyClassify(
- @FormParam(value = "session") String session,
- @FormParam(value = "scope") String scope,
- @FormParam(value = "recipe") String recipe,
- @FormParam(value = "input-graph") String input_graph,
- @FormParam(value = "file") File file,
- @FormParam(value = "owllink-endpoint") String owllink_endpoint) {
+ @FormDataParam(value = "session") String session,
+ @FormDataParam(value = "scope") String scope,
+ @FormDataParam(value = "recipe") String recipe,
+ @FormDataParam(value = "input-graph") String input_graph,
+ @FormDataParam(value = "file") File file,
+ @FormDataParam(value = "owllink-endpoint") String owllink_endpoint) {
try{
Modified: incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistencyCheck.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistencyCheck.java?rev=1137648&r1=1137647&r2=1137648&view=diff
==============================================================================
--- incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistencyCheck.java (original)
+++ incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistencyCheck.java Mon Jun 20 15:04:59 2011
@@ -63,6 +63,7 @@ import org.slf4j.LoggerFactory;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Resource;
+import com.sun.jersey.multipart.FormDataParam;
/**
@@ -287,12 +288,12 @@ if (storage == null) {
@POST
@Consumes(MediaType.MULTIPART_FORM_DATA)
public Response getConsistencyCheck(
- @FormParam(value = "session") String session,
- @FormParam(value = "scope") String scope,
- @FormParam(value = "recipe") String recipe,
- @FormParam(value = "input-graph") String input_graph,
- @FormParam(value = "file") File file,
- @FormParam(value = "owllink-endpoint") String owllink_endpoint) {
+ @FormDataParam(value = "session") String session,
+ @FormDataParam(value = "scope") String scope,
+ @FormDataParam(value = "recipe") String recipe,
+ @FormDataParam(value = "input-graph") String input_graph,
+ @FormDataParam(value = "file") File file,
+ @FormDataParam(value = "owllink-endpoint") String owllink_endpoint) {
try {
Modified: incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistentRefactoring.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistentRefactoring.java?rev=1137648&r1=1137647&r2=1137648&view=diff
==============================================================================
--- incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistentRefactoring.java (original)
+++ incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistentRefactoring.java Mon Jun 20 15:04:59 2011
@@ -1,12 +1,12 @@
package org.apache.stanbol.reasoners.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.io.InputStream;
import javax.servlet.ServletContext;
import javax.ws.rs.Consumes;
-import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
@@ -28,6 +28,8 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
+import com.sun.jersey.multipart.FormDataParam;
+
/**
* Special refactoring services that employ a DL reasoner for ensuring/checking consistency.
*
@@ -78,8 +80,8 @@ public class ConsistentRefactoring exten
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Produces({KRFormat.TURTLE, KRFormat.FUNCTIONAL_OWL, KRFormat.MANCHESTER_OWL, KRFormat.RDF_XML,
KRFormat.OWL_XML, KRFormat.RDF_JSON})
- public Response consistentRefactoringOfNewGraph(@FormParam("recipe") String recipe,
- @FormParam("input") InputStream input) {
+ public Response consistentRefactoringOfNewGraph(@FormDataParam("recipe") String recipe,
+ @FormDataParam("input") InputStream input) {
IRI recipeIRI = IRI.create(recipe);
Modified: incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Enrichment.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Enrichment.java?rev=1137648&r1=1137647&r2=1137648&view=diff
==============================================================================
--- incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Enrichment.java (original)
+++ incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Enrichment.java Mon Jun 20 15:04:59 2011
@@ -15,7 +15,6 @@ import java.util.Set;
import javax.servlet.ServletContext;
import javax.ws.rs.Consumes;
-import javax.ws.rs.FormParam;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
@@ -65,6 +64,8 @@ import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Resource;
+import com.sun.jersey.multipart.FormDataParam;
+
/**
*
@@ -213,12 +214,12 @@ if (storage == null) {
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Produces("application/rdf+xml")
public Response ontologyEnrichment(
- @FormParam(value = "session") String session,
- @FormParam(value = "scope") String scope,
- @FormParam(value = "recipe") String recipe,
- @FormParam(value = "input-graph") String input_graph,
- @FormParam(value = "file") File file,
- @FormParam(value = "owllink-endpoint") String owllink_endpoint) {
+ @FormDataParam(value = "session") String session,
+ @FormDataParam(value = "scope") String scope,
+ @FormDataParam(value = "recipe") String recipe,
+ @FormDataParam(value = "input-graph") String input_graph,
+ @FormDataParam(value = "file") File file,
+ @FormDataParam(value = "owllink-endpoint") String owllink_endpoint) {
try{
Modified: incubator/stanbol/trunk/reengineer/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/web/pom.xml?rev=1137648&r1=1137647&r2=1137648&view=diff
==============================================================================
--- incubator/stanbol/trunk/reengineer/web/pom.xml (original)
+++ incubator/stanbol/trunk/reengineer/web/pom.xml Mon Jun 20 15:04:59 2011
@@ -99,6 +99,10 @@
<artifactId>jersey-json</artifactId>
<version>${jersey-version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-multipart</artifactId>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
Modified: incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/resources/ReengineerResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/resources/ReengineerResource.java?rev=1137648&r1=1137647&r2=1137648&view=diff
==============================================================================
--- incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/resources/ReengineerResource.java (original)
+++ incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/resources/ReengineerResource.java Mon Jun 20 15:04:59 2011
@@ -47,6 +47,7 @@ import org.slf4j.LoggerFactory;
import com.sun.jersey.api.view.ImplicitProduces;
import com.sun.jersey.api.view.Viewable;
+import com.sun.jersey.multipart.FormDataParam;
@Path("/reengineer")
@@ -79,9 +80,9 @@ public class ReengineerResource extends
@POST
@Consumes(MediaType.MULTIPART_FORM_DATA)
public Response reengineering(
- @FormParam("output-graph") String outputGraph,
- @FormParam("input-type") String inputType,
- @FormParam("input") InputStream input,
+ @FormDataParam("output-graph") String outputGraph,
+ @FormDataParam("input-type") String inputType,
+ @FormDataParam("input") InputStream input,
@Context HttpHeaders headers, @Context HttpServletRequest httpServletRequest){
@@ -131,9 +132,9 @@ public class ReengineerResource extends
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Path("/schema")
public Response schemaReengineering(
- @FormParam("output-graph") String outputGraph,
- @FormParam("input-type") String inputType,
- @FormParam("input") InputStream input,
+ @FormDataParam("output-graph") String outputGraph,
+ @FormDataParam("input-type") String inputType,
+ @FormDataParam("input") InputStream input,
@Context HttpHeaders headers,
@Context HttpServletRequest httpServletRequest){
Modified: incubator/stanbol/trunk/rules/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/pom.xml?rev=1137648&r1=1137647&r2=1137648&view=diff
==============================================================================
--- incubator/stanbol/trunk/rules/web/pom.xml (original)
+++ incubator/stanbol/trunk/rules/web/pom.xml Mon Jun 20 15:04:59 2011
@@ -83,6 +83,10 @@
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-multipart</artifactId>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
Modified: incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorResource.java?rev=1137648&r1=1137647&r2=1137648&view=diff
==============================================================================
--- incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorResource.java (original)
+++ incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorResource.java Mon Jun 20 15:04:59 2011
@@ -40,6 +40,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.sun.jersey.api.view.ImplicitProduces;
+import com.sun.jersey.multipart.FormDataParam;
/**
*
@@ -82,7 +83,7 @@ public class RefactorResource extends Ba
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Produces(value = {KRFormat.TURTLE, KRFormat.FUNCTIONAL_OWL, KRFormat.MANCHESTER_OWL, KRFormat.RDF_XML,
KRFormat.OWL_XML, KRFormat.RDF_JSON})
- public Response applyRefactoring(@FormParam("recipe") String recipe, @FormParam("input") InputStream input) {
+ public Response applyRefactoring(@FormDataParam("recipe") String recipe, @FormDataParam("input") InputStream input) {
// Refactorer semionRefactorer = semionManager.getRegisteredRefactorer();
@@ -123,8 +124,8 @@ public class RefactorResource extends Ba
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Produces(value = {KRFormat.TURTLE, KRFormat.FUNCTIONAL_OWL, KRFormat.MANCHESTER_OWL, KRFormat.RDF_XML,
KRFormat.OWL_XML, KRFormat.RDF_JSON})
- public Response performRefactoring(@FormParam("recipe") String recipe,
- @FormParam("input") InputStream input) {
+ public Response performRefactoring(@FormDataParam("recipe") String recipe,
+ @FormDataParam("input") InputStream input) {
// Refactorer semionRefactorer = semionManager.getRegisteredRefactorer();