Author: rwesten
Date: Tue Dec 17 11:23:30 2013
New Revision: 1551517
URL: http://svn.apache.org/r1551517
Log:
fix for STANBOL-1216; Also added JSON-LD to @Produce annotations (STANBOL-1236)
Modified:
stanbol/trunk/enhancer/jersey/pom.xml
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java
Modified: stanbol/trunk/enhancer/jersey/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/pom.xml?rev=1551517&r1=1551516&r2=1551517&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/pom.xml (original)
+++ stanbol/trunk/enhancer/jersey/pom.xml Tue Dec 17 11:23:30 2013
@@ -217,6 +217,11 @@
<version>2.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified:
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java?rev=1551517&r1=1551516&r2=1551517&view=diff
==============================================================================
---
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java
(original)
+++
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java
Tue Dec 17 11:23:30 2013
@@ -24,6 +24,7 @@ import static org.apache.clerezza.rdf.co
import static
org.apache.clerezza.rdf.core.serializedform.SupportedFormat.RDF_XML;
import static
org.apache.clerezza.rdf.core.serializedform.SupportedFormat.TURTLE;
import static
org.apache.clerezza.rdf.core.serializedform.SupportedFormat.X_TURTLE;
+import static org.apache.stanbol.commons.web.base.utils.MediaTypeUtil.JSON_LD;
import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.INCLUDE_EXECUTION_METADATA;
import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.OMIT_METADATA;
import static
org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.OMIT_PARSED_CONTENT;
@@ -136,7 +137,7 @@ public abstract class AbstractEnhancerRe
@GET
@Path("/ep")
- @Produces(value = {APPLICATION_JSON, N3, N_TRIPLE, RDF_JSON, RDF_XML,
TURTLE, X_TURTLE})
+ @Produces(value = {JSON_LD, APPLICATION_JSON, N3, N_TRIPLE, RDF_JSON,
RDF_XML, TURTLE, X_TURTLE})
public Response getExecutionPlan(@Context HttpHeaders headers) {
ResponseBuilder res;
Chain chain = null;
Modified:
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java?rev=1551517&r1=1551516&r2=1551517&view=diff
==============================================================================
---
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java
(original)
+++
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java
Tue Dec 17 11:23:30 2013
@@ -26,9 +26,13 @@ import static org.apache.clerezza.rdf.co
import static
org.apache.clerezza.rdf.core.serializedform.SupportedFormat.RDF_XML;
import static
org.apache.clerezza.rdf.core.serializedform.SupportedFormat.TURTLE;
import static
org.apache.clerezza.rdf.core.serializedform.SupportedFormat.X_TURTLE;
+import static org.apache.stanbol.commons.web.base.utils.MediaTypeUtil.JSON_LD;
import static
org.apache.stanbol.enhancer.jersey.utils.EnhancerUtils.addActiveChains;
import static
org.apache.stanbol.enhancer.jersey.utils.EnhancerUtils.addActiveEngines;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
import javax.ws.rs.Consumes;
import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
@@ -60,7 +64,6 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.enhancer.servicesapi.rdf.Enhancer;
-
import org.apache.stanbol.commons.viewable.Viewable;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.commons.web.base.resource.LayoutConfiguration;
@@ -118,7 +121,7 @@ public final class EnhancerRootResource
}
@GET
- @Produces(value = {APPLICATION_JSON, N3, N_TRIPLE, RDF_JSON, RDF_XML,
TURTLE, X_TURTLE})
+ @Produces(value = {JSON_LD, APPLICATION_JSON, N3, N_TRIPLE, RDF_JSON,
RDF_XML, TURTLE, X_TURTLE})
public Response getEngines(@Context HttpHeaders headers) {
MGraph graph = getEnhancerConfigGraph();
ResponseBuilder res = Response.ok(graph);
@@ -150,14 +153,18 @@ public final class EnhancerRootResource
if (sparqlQuery == null) {
return Response.ok(new Viewable("sparql",
EnhancerRootResource.this), TEXT_HTML).build();
}
- Query query = QueryParser.getInstance().parse(sparqlQuery);
+ final Query query = QueryParser.getInstance().parse(sparqlQuery);
String mediaType = "application/sparql-results+xml";
if (query instanceof DescribeQuery || query instanceof
ConstructQuery) {
mediaType = "application/rdf+xml";
}
ResponseBuilder responseBuilder;
if (queryEngine != null) {
- Object result = queryEngine.execute(null,
getEnhancerConfigGraph(), query);
+ Object result = AccessController.doPrivileged(new
PrivilegedAction<Object>() {
+ public Object run() {
+ return queryEngine.execute(null,
getEnhancerConfigGraph(), query);
+ }
+ });
responseBuilder = Response.ok(result, mediaType);
} else {
responseBuilder = Response.status(Status.SERVICE_UNAVAILABLE)
