Author: reto
Date: Sun May 26 08:47:50 2013
New Revision: 1486404
URL: http://svn.apache.org/r1486404
Log:
STANBOL-1082: rethrowing exception than can be rethrown, ensuring proper
wrapping of others
Added:
stanbol/trunk/reasoners/web/nbactions.xml
Modified:
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/UrlInputProvider.java
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
Added: stanbol/trunk/reasoners/web/nbactions.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/nbactions.xml?rev=1486404&view=auto
==============================================================================
--- stanbol/trunk/reasoners/web/nbactions.xml (added)
+++ stanbol/trunk/reasoners/web/nbactions.xml Sun May 26 08:47:50 2013
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+ <action>
+ <actionName>CUSTOM-deploy to localhost:8080</actionName>
+ <displayName>deploy to localhost:8080</displayName>
+ <goals>
+ <goal>install</goal>
+ <goal>org.apache.sling:maven-sling-plugin:install</goal>
+ </goals>
+ </action>
+</actions>
Modified:
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/UrlInputProvider.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/UrlInputProvider.java?rev=1486404&r1=1486403&r2=1486404&view=diff
==============================================================================
---
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/UrlInputProvider.java
(original)
+++
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/UrlInputProvider.java
Sun May 26 08:47:50 2013
@@ -100,13 +100,9 @@ public class UrlInputProvider implements
} else if (type.isAssignableFrom(Statement.class)) {
final OntModel input = ModelFactory.createOntologyModel();
synchronized (url) {
- try {
- // FIXME: use instead:
- // FileManager.get().loadModel
- input.read(url);
- } catch (Exception e) {
- throw new IOException(e);
- }
+ // FIXME: use instead:
+ // FileManager.get().loadModel
+ input.read(url);
}
final StmtIterator iterator = input.listStatements();
return new Iterator<T>(){
Modified:
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java?rev=1486404&r1=1486403&r2=1486404&view=diff
==============================================================================
---
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
(original)
+++
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
Sun May 26 08:47:50 2013
@@ -322,16 +322,12 @@ public class ReasoningServiceTaskResourc
getCurrentService(), getCurrentTask(), target, parameters);
ReasoningServiceResult<?> result = executor.call();
return new ResponseTaskBuilder(uriInfo, context,
headers).build(result);
- } catch (InconsistentInputException e) {
- new WebApplicationException(e);
- } catch (ReasoningServiceException e) {
- new WebApplicationException(e);
- } catch (UnsupportedTaskException e) {
- new WebApplicationException(e);
} catch (Exception e) {
- new WebApplicationException(e);
- }
- throw new WebApplicationException(new Exception("Error"),
Response.Status.INTERNAL_SERVER_ERROR);
+ if (e instanceof RuntimeException) {
+ throw (RuntimeException)e;
+ }
+ throw new WebApplicationException(e,
Response.Status.INTERNAL_SERVER_ERROR);
+ }
}
/**
