You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/08/04 10:35:56 UTC
jena git commit: Support quads-only services.
Repository: jena
Updated Branches:
refs/heads/master 52efaadb4 -> e9c26ab08
Support quads-only services.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e9c26ab0
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e9c26ab0
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e9c26ab0
Branch: refs/heads/master
Commit: e9c26ab0883cb668ebbda24fe645b2b807fd86ea
Parents: 52efaad
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 4 11:35:12 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 4 11:35:12 2016 +0100
----------------------------------------------------------------------
.../jena/fuseki/server/DataAccessPointRegistry.java | 14 ++++++++------
.../jena/fuseki/servlets/SPARQL_UberServlet.java | 12 +++++-------
2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e9c26ab0/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java
index b9cbd5a..78dc1ba 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java
@@ -34,12 +34,14 @@ public class DataAccessPointRegistry extends Registry<String, DataAccessPoint>
System.out.flush() ;
if ( string == null )
string = "DataAccessPointRegistry" ;
- System.err.println("== "+string) ;
- DataAccessPointRegistry.get().keys().iterator().forEachRemaining((k) -> {
- System.err.print(" (key="+k) ;
- DataAccessPoint ref = DataAccessPointRegistry.get().get(k) ;
- System.err.print(", ref="+ref.getName()) ;
- System.err.println(")") ;
+ System.out.println("== "+string) ;
+ DataAccessPointRegistry.get().forEach((k,ref)->{
+ System.out.printf(" (key=%s, ref=%s)\n", k, ref.getName()) ;
+ ref.getDataService().getOperations().forEach((opName)->{
+ ref.getDataService().getOperation(opName).forEach(ep->{
+ System.out.printf(" %s : %s\n", opName, ep.getEndpoint()) ;
+ });
+ });
}) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/e9c26ab0/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
index 2b41487..7388b46 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
@@ -34,10 +34,7 @@ import org.apache.jena.fuseki.DEF ;
import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.FusekiException ;
import org.apache.jena.fuseki.conneg.ConNeg ;
-import org.apache.jena.fuseki.server.DataAccessPoint ;
-import org.apache.jena.fuseki.server.DataService ;
-import org.apache.jena.fuseki.server.Endpoint ;
-import org.apache.jena.fuseki.server.OperationName ;
+import org.apache.jena.fuseki.server.* ;
import org.apache.jena.riot.web.HttpNames ;
/** This servlet can be attached to a dataset location
@@ -154,8 +151,7 @@ public abstract class SPARQL_UberServlet extends ActionSPARQL
@Override
protected void executeAction(HttpAction action) {
- //SPARQL Update direct
- //SPARQL Query POST
+ // DEBUG: DataAccessPointRegistry.print("UberServlet ");
long id = action.id ;
HttpServletRequest request = action.request ;
@@ -245,7 +241,7 @@ public abstract class SPARQL_UberServlet extends ActionSPARQL
// Check enabled.
if ( isGET || isHEAD ) {
- if ( allowREST_R(action) )
+ if ( allowREST_R(action) || allowQuadsR(action) )
restQuads_R.executeLifecycle(action) ;
else
ServletOps.errorMethodNotAllowed("Read-only dataset : "+method) ;
@@ -279,6 +275,8 @@ public abstract class SPARQL_UberServlet extends ActionSPARQL
if ( serviceDispatch(action, OperationName.GSP_R, restQuads_R) ) return ;
if ( serviceDispatch(action, OperationName.GSP_RW, restQuads_RW) ) return ;
}
+ if ( serviceDispatch(action, OperationName.Quads_RW, restQuads_RW) ) return ;
+ if ( serviceDispatch(action, OperationName.Quads_R, restQuads_R) ) return ;
}
// There is a trailing part - params are illegal by this point.
if ( hasParams )