svn commit: r1206760 - in /incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web: input/provider/impl/ resources/ utils/

[enridaga]

Author: enridaga
Date: Sun Nov 27 16:34:57 2011
New Revision: 1206760

URL: http://svn.apache.org/viewvc?rev=1206760&view=rev
Log:
STANBOL-398
Fixed the location of the local file when giving it to the UrlInputProvider

STANBOL-399
Changed response code to 409 (Conflict)

Modified:
    
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/UrlInputProvider.java
    
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
    
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningServiceExecutor.java
    
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ResponseTaskBuilder.java

Modified: 
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/UrlInputProvider.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/UrlInputProvider.java?rev=1206760&r1=1206759&r2=1206760&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/UrlInputProvider.java
 (original)
+++ 
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/UrlInputProvider.java
 Sun Nov 27 16:34:57 2011
@@ -56,6 +56,7 @@ public class UrlInputProvider implements
      * @param url
      */
     public UrlInputProvider(String url) {
+       log.debug("Tesm file is {}", url);
         this.url = url;
     }
 

Modified: 
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java?rev=1206760&r1=1206759&r2=1206760&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
 (original)
+++ 
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
 Sun Nov 27 16:34:57 2011
@@ -424,7 +424,9 @@ public class ReasoningServiceTaskResourc
                 if(!entry.getValue().isEmpty()){
                     // We keep only the first value
                     // FIXME We create the file once again...
-                    inmgr.addInputProvider(new FileInputProvider(new 
File(entry.getValue().iterator().next())));
+                       String fv = entry.getValue().iterator().next();
+                       log.debug("File value is: {}",fv);
+                    inmgr.addInputProvider(new FileInputProvider(new 
File(URI.create(fv))));
                     // We remove it form the additional parameter list
                     this.parameters.remove("url");
                 }else{

Modified: 
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningServiceExecutor.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningServiceExecutor.java?rev=1206760&r1=1206759&r2=1206760&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningServiceExecutor.java
 (original)
+++ 
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningServiceExecutor.java
 Sun Nov 27 16:34:57 2011
@@ -200,7 +200,7 @@ public class ReasoningServiceExecutor im
                        }
                } catch (InconsistentInputException e) {
             log.warn("The input is not consistent");
-            throw e;
+                       return new 
ReasoningServiceResult<OWLOntology>(ReasoningServiceExecutor.TASK_CHECK, false);
         } catch (ReasoningServiceException e) {
                        throw e;
                } catch (OWLOntologyCreationException e) {

Modified: 
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ResponseTaskBuilder.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ResponseTaskBuilder.java?rev=1206760&r1=1206759&r2=1206760&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ResponseTaskBuilder.java
 (original)
+++ 
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ResponseTaskBuilder.java
 Sun Nov 27 16:34:57 2011
@@ -179,7 +179,7 @@ public class ResponseTaskBuilder {
             } else {
                 log.debug("The input is not consistent");
                 return Response
-                        .status(Status.NO_CONTENT)
+                        .status(Status.CONFLICT)
                         .entity(new Viewable("result",
                                 new ReasoningPrettyResultResource(
                                         context, info,
@@ -192,7 +192,7 @@ public class ResponseTaskBuilder {
                 return Response.ok("The input is consistent :)").build();
             } else {
                 log.debug("The input is not consistent");
-                return Response.status(Status.NO_CONTENT).build();
+                return Response.status(Status.CONFLICT).build();
             }
         }
     }