svn commit: r1377778 - in /jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki: server/SPARQLServer.java servlets/SPARQL_Dataset.java

[an...@apache.org]

Author: andy
Date: Mon Aug 27 18:25:54 2012
New Revision: 1377778

URL: http://svn.apache.org/viewvc?rev=1377778&view=rev
Log:
More of SPARQL Graph Store direct naming.

Modified:
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Dataset.java

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java?rev=1377778&r1=1377777&r2=1377778&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java Mon Aug 27 18:25:54 2012
@@ -244,6 +244,7 @@ public class SPARQLServer
         // The servlet naming rules and priorities are a bit obscure - this takes priority over the above!
         // ??No compression support because it is right sometimes and not others.
         
+        // Eventually, as an alternative, this should handle everything (no named services) 
         //addServlet(context, datasetPath, sparqlDataset, epDataset, enableCompression) ;
     }
     

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Dataset.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Dataset.java?rev=1377778&r1=1377777&r2=1377778&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Dataset.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Dataset.java Mon Aug 27 18:25:54 2012
@@ -75,8 +75,8 @@ public class SPARQL_Dataset extends SPAR
     private SPARQL_ServletBase updateServlet   = new SPARQL_Update(verbose_debug) ;
     // No upload support on the dataset itself - use service (or REST!) 
     //private SPARQL_ServletBase uploadServlet   = new SPARQL_Upload(verbose_debug) ;
-    private SPARQL_ServletBase restServlet_RW  = new SPARQL_REST_RW(verbose_debug) ;
-    private SPARQL_ServletBase restServlet_R   = new SPARQL_REST_R(verbose_debug) ;
+    private SPARQL_REST_RW     restServlet_RW  = new SPARQL_REST_RW(verbose_debug) ;
+    private SPARQL_REST_R      restServlet_R   = new SPARQL_REST_R(verbose_debug) ;
     private SPARQL_ServletBase restQuads       = new REST_Quads(verbose_debug) ;
 
     
@@ -94,10 +94,9 @@ public class SPARQL_Dataset extends SPAR
     @Override
     protected void validate(HttpServletRequest request)
     {
-        // already checked in SPARQ_Dataset?
     }
 
-    // Developement : calls to other srvlets marked ****
+    // Developement : calls to other servlets marked ****
     // This will need to do a proper servlet dispatch if they are going to be filterd (security, compression).
     
     @Override
@@ -131,10 +130,16 @@ public class SPARQL_Dataset extends SPAR
                 // Direct naming to indirect naming.
                 String absURI = request.getRequestURL().toString() ;
                 HttpActionREST a = new HttpActionREST(id, desc, absURI, request, response, verbose_debug) ;
-                // Conneg.
-                // Check access.
-                // ****
-                new SPARQL_REST_RW(verbose_debug).dispatch(a) ;
+                
+                if ( desc.readWriteGraphStoreEP.size() > 0 )
+                    // ****
+                    restServlet_RW.dispatch(a) ;
+                else if ( desc.readGraphStoreEP.size() > 0 )
+                    // ****
+                    restServlet_R.dispatch(a) ;
+                else
+                    errorMethodNotAllowed(method) ;
+                return ;
             }
             else
             {
@@ -172,7 +177,7 @@ public class SPARQL_Dataset extends SPAR
         if ( c > 1 )
             errorBadRequest("Multiple possible actions") ;
         if ( c == 0 )
-            errorBadRequest("Query string does not contain a speific action") ;
+            errorBadRequest("Query string does not contain a specific action") ;
 
         // Check an endpoint is registered.
         if ( hasParamQuery )
@@ -264,6 +269,10 @@ public class SPARQL_Dataset extends SPAR
     { doCommon(request, response) ; }
 
     @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response)
+    { doCommon(request, response) ; }
+
+    @Override
     protected void doOptions(HttpServletRequest request, HttpServletResponse response)
     { doCommon(request, response) ; }