You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/03/11 14:32:50 UTC
[4/8] git commit: reorganized
reorganized
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/bc20e88c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/bc20e88c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/bc20e88c
Branch: refs/heads/master
Commit: bc20e88cf267368944de5e7955aaf78722362d26
Parents: c15a3cc
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Mar 11 11:24:33 2013 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Mar 11 11:24:33 2013 +0100
----------------------------------------------------------------------
.../sparql/webservices/SparqlWebService.java | 46 +++++++-------
1 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/bc20e88c/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
index b3879d5..bbd2e27 100644
--- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
+++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
@@ -86,28 +86,6 @@ public class SparqlWebService {
private ConfigurationService configurationService;
/**
- * For CORS operations TODO: make it more fine grained (maybe user dependent)
- * + TODO filter chain do not work properly
- *
- * @param reqHeaders
- * @return responde
- */
- @OPTIONS
- @Path("/update")
- public Response optionsResourceRemote(@HeaderParam("Access-Control-Request-Headers") String reqHeaders) {
- if(reqHeaders == null) {
- reqHeaders = "Accept, Content-Type";
- }
- return Response.ok()
- .header("Allow", "POST")
- .header("Access-Control-Allow-Methods","POST")
- .header("Access-Control-Allow-Headers", reqHeaders)
- .header("Access-Control-Allow-Origin",configurationService.getStringConfiguration("sparql.allow_origin","*"))
- .build();
-
- }
-
- /**
* Execute a SPARQL 1.1 tuple query on the LMF triple store using the query passed as query parameter to the
* GET request. Result will be formatted using the result type passed as argument (either "html", "json" or "xml").
* <p/>
@@ -121,7 +99,7 @@ public class SparqlWebService {
*/
@GET
@Path("/select")
- public Response query(@QueryParam("query") String query, @QueryParam("output") String resultType, @Context HttpServletRequest request) {
+ public Response select(@QueryParam("query") String query, @QueryParam("output") String resultType, @Context HttpServletRequest request) {
if(resultType == null) {
List<ContentType> acceptedTypes = LMFHttpUtils.parseAcceptHeader(request.getHeader("Accept"));
List<ContentType> offeredTypes = LMFHttpUtils.parseStringList(Lists.newArrayList("application/sparql-results+xml","application/sparql-results+json","text/html", "application/rdf+xml", "text/csv"));
@@ -155,6 +133,28 @@ public class SparqlWebService {
}
/**
+ * For CORS operations TODO: make it more fine grained (maybe user dependent)
+ * + TODO filter chain do not work properly
+ *
+ * @param reqHeaders
+ * @return responde
+ */
+ @OPTIONS
+ @Path("/update")
+ public Response optionsResourceRemote(@HeaderParam("Access-Control-Request-Headers") String reqHeaders) {
+ if(reqHeaders == null) {
+ reqHeaders = "Accept, Content-Type";
+ }
+ return Response.ok()
+ .header("Allow", "POST")
+ .header("Access-Control-Allow-Methods", "POST")
+ .header("Access-Control-Allow-Headers", reqHeaders)
+ .header("Access-Control-Allow-Origin", configurationService.getStringConfiguration("sparql.allow_origin","*"))
+ .build();
+
+ }
+
+ /**
* Execute a SPARQL 1.1 tuple query on the LMF triple store using the query passed as form parameter to the
* POST request. Result will be formatted using the result type passed as argument (either "html", "json" or "xml").
* <p/>