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 2013/12/14 18:37:49 UTC

svn commit: r1550957 [1/2] - in /jena/branches/jena-fuseki-new-ui: src-dev/dev/ src/main/java/org/apache/jena/fuseki/ src/main/java/org/apache/jena/fuseki/mgt/ src/main/java/org/apache/jena/fuseki/servlets/ src/main/java/org/apache/jena/fuseki/validation/

Author: andy
Date: Sat Dec 14 17:37:48 2013
New Revision: 1550957

URL: http://svn.apache.org/r1550957
Log:
Integrate multipart update with single part update.
Combine with support on the dataset URI for quad ops.
Reorganise and simplify code.

Added:
    jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ServletOps.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/Upload.java
Modified:
    jena/branches/jena-fuseki-new-ui/src-dev/dev/RunFuseki.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/Fuseki.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionLib.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/IRIValidator.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/QueryValidator.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/UpdateValidator.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/ValidatorBaseJson.java

Added: jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java?rev=1550957&view=auto
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java (added)
+++ jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java Sat Dec 14 17:37:48 2013
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dev;
+
+public class PROJECT {
+    // Andy's ToDo list
+    // All TODO and XXX
+    // Graph upload in ActionDatasets == Upload.
+    // REST_Quads
+    // Remove all direct naming (put in separate servlet if ever needed)  
+    //   last place : SPARQL_UberServlet
+    
+    // Document (write/update) all protocol modes.
+    // TESTS
+}
+

Modified: jena/branches/jena-fuseki-new-ui/src-dev/dev/RunFuseki.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src-dev/dev/RunFuseki.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src-dev/dev/RunFuseki.java (original)
+++ jena/branches/jena-fuseki-new-ui/src-dev/dev/RunFuseki.java Sat Dec 14 17:37:48 2013
@@ -61,7 +61,7 @@ public class RunFuseki
         
         FusekiCmd.main(
                      //  "-v",
-                     "--update", "--mem", "--mgtPort=0", "/ds"
+                     "--update", "--memtdb", "--mgtPort=0", "/ds"
                      //"--update", "--loc="+tmpdir+"DB", "--set=tdb:unionDefaultGraph=true", "/ds"
                      //"--update", "--mem", "/ds"
 

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/Fuseki.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/Fuseki.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/Fuseki.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/Fuseki.java Sat Dec 14 17:37:48 2013
@@ -66,17 +66,11 @@ public class Fuseki {
      */
     static public String    FusekiSymbolIRI              = "http://jena.apache.org/fuseki#" ;
 
-    /** ??? */
+    /** TODO Default location of the pages for the Fuseki UI  */
     static public String    PagesStatic                  = "pages" ;
 
     /**
-     * TEMPORARY - this enables POST of triples to the dataset URI causing a
-     * graph to be created. POSTing to /dataset?graph=uri is preferred
-     */
-    static public boolean   graphStoreProtocolPostCreate = false ;
-
-    /**
-     * an relative path to the location of <code>fuseki-properties.xml</code>
+     * A relative path to the location of <code>fuseki-properties.xml</code>
      * file
      */
     static private String   metadataLocation             = "org/apache/jena/fuseki/fuseki-properties.xml" ;
@@ -104,10 +98,7 @@ public class Fuseki {
     static public final String        VERSION           = metadata.get(PATH + ".version", "development") ;
 
     /** Date when Fuseki was built */
-    static public final String        BUILD_DATE        = metadata.get(PATH + ".build.datetime", "unknown") ; // call
-                                                                                                              // Date
-                                                                                                              // if
-                                                                                                              // unavailable.
+    static public final String        BUILD_DATE        = metadata.get(PATH + ".build.datetime", "unknown") ;
 
     /** An identifier for the HTTP Fuseki server instance */
     static public final String        serverHttpName    = NAME + " (" + VERSION + ")" ;

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java Sat Dec 14 17:37:48 2013
@@ -150,8 +150,6 @@ public class FusekiCmd extends CmdARQ {
     
     // Ignored - it's always dynamic dispatch 
     private static ArgDecl             argUber         = new ArgDecl(ArgDecl.NoValue, "uber", "über") ;
-    private static ArgDecl             argGSP          = new ArgDecl(ArgDecl.NoValue, "gsp") ;                  // GSP
-
     private static ArgDecl             argBasicAuth    = new ArgDecl(ArgDecl.HasValue, "basic-auth") ;
 
     private static ArgDecl             argHome         = new ArgDecl(ArgDecl.HasValue, "home") ;
@@ -384,11 +382,6 @@ public class FusekiCmd extends CmdARQ {
 
         if ( contains(argUber) )
             Fuseki.configLog.info("Dynamic dispatch is now the only mode: --uber is not needed" );
-        
-        if ( contains(argGSP) ) {
-            Fuseki.graphStoreProtocolPostCreate = true ;
-        }
-
     }
 
     private static String sort_out_dir(String path) {

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java Sat Dec 14 17:37:48 2013
@@ -37,6 +37,7 @@ import org.apache.jena.fuseki.FusekiLib 
 import org.apache.jena.fuseki.server.DatasetRef ;
 import org.apache.jena.fuseki.server.DatasetRegistry ;
 import org.apache.jena.fuseki.servlets.HttpAction ;
+import org.apache.jena.fuseki.servlets.ServletOps ;
 import org.apache.jena.riot.Lang ;
 import org.apache.jena.riot.RDFDataMgr ;
 import org.apache.jena.web.HttpSC ;
@@ -62,7 +63,7 @@ public class ActionBackup extends Action
         String dataset = FusekiLib.safeParameter(action.request, "dataset") ;
         if ( dataset == null )
         {
-            errorBadRequest("Required parameter missing: ?dataset=") ;
+            ServletOps.errorBadRequest("Required parameter missing: ?dataset=") ;
             return ;
         }
         
@@ -76,14 +77,14 @@ public class ActionBackup extends Action
         boolean known = DatasetRegistry.get().isRegistered(dataset) ;
         if (!known)
         {
-            errorBadRequest("No such dataset: " + dataset) ;
+            ServletOps.errorBadRequest("No such dataset: " + dataset) ;
             return ;
         }
         
         DatasetRef ref = DatasetRegistry.get().get(dataset) ;
-        action.setRequestRef(ref);
+        action.setRequestRef(ref, dataset);
         scheduleBackup(action) ;
-        success(action) ;
+        ServletOps.success(action) ;
     }
 
     static final String BackupArea = "backups" ;  

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java Sat Dec 14 17:37:48 2013
@@ -34,17 +34,16 @@ public abstract class ActionCtl extends 
     protected void execCommonWorker(HttpAction action)
     {
         DatasetRef dsRef = null ;
-        String name = mapRequestToDatasetName(action) ;
-        if ( name != null )
-            dsRef = DatasetRegistry.get().get(name) ;
+        String dsURI = mapRequestToDatasetName(action) ;
+        if ( dsURI != null )
+            dsRef = DatasetRegistry.get().get(dsURI) ;
         else {
             // This is a placeholder when creating new DatasetRefs
-            // and also if addressig a container, not a dataset
+            // and also if addressing a container, not a dataset
             dsRef = new DatasetRef() ;
-            dsRef.name = name ;
+            dsRef.name = dsURI ;
         }
-        action.datasetName = name ;
-        action.setControlRef(dsRef) ;
+        action.setControlRef(dsRef, dsURI) ;
         executeAction(action) ;
     }
 

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java Sat Dec 14 17:37:48 2013
@@ -39,7 +39,9 @@ import org.apache.jena.atlas.lib.StrUtil
 import org.apache.jena.atlas.web.ContentType ;
 import org.apache.jena.fuseki.FusekiLib ;
 import org.apache.jena.fuseki.server.* ;
+import org.apache.jena.fuseki.servlets.ActionLib ;
 import org.apache.jena.fuseki.servlets.HttpAction ;
+import org.apache.jena.fuseki.servlets.ServletOps ;
 import org.apache.jena.riot.* ;
 import org.apache.jena.riot.lang.LangRIOT ;
 import org.apache.jena.riot.system.ErrorHandler ;
@@ -106,7 +108,7 @@ public class ActionDatasets extends Acti
         else if ( method.equals("DELETE") )
             execDelete(action) ;
         else
-            error(HttpSC.METHOD_NOT_ALLOWED_405) ;
+            ServletOps.error(HttpSC.METHOD_NOT_ALLOWED_405) ;
         
 //      system.begin(ReadWrite.READ) ;
 //      try { RDFDataMgr.write(System.out, system, Lang.TRIG); }
@@ -128,8 +130,8 @@ public class ActionDatasets extends Acti
             JSON.write(out, v) ;
             out.println() ; 
             out.flush() ;
-        } catch (IOException ex) { errorOccurred(ex) ; }
-        success(action);
+        } catch (IOException ex) { ServletOps.errorOccurred(ex) ; }
+        ServletOps.success(action);
     }
     
     // This does not consult the system database for dormant etc.
@@ -148,7 +150,7 @@ public class ActionDatasets extends Acti
         String datasetPath = DatasetRef.canocialDatasetPath(action.dsRef.name) ;
         DatasetRef dsDesc = DatasetRegistry.get().get(datasetPath) ;
         if ( dsDesc == null )
-            errorNotFound("Not found: dataset "+action.dsRef.name);
+            ServletOps.errorNotFound("Not found: dataset "+action.dsRef.name);
         JsonDescription.describe(builder, dsDesc) ;
         return builder.build() ;
     }
@@ -172,11 +174,11 @@ public class ActionDatasets extends Acti
         action.log.info(format("[%d] POST dataset %s", action.id, name)) ;
         
         if ( action.dsRef.dataset == null )
-            errorNotFound("Not found: dataset "+action.dsRef.name);
+            ServletOps.errorNotFound("Not found: dataset "+action.dsRef.name);
         DatasetRef dsDesc = action.dsRef ;
         String s = action.request.getParameter("status") ;
         if ( s == null || s.isEmpty() )
-            errorBadRequest("No state change given") ;
+            ServletOps.errorBadRequest("No state change given") ;
 
         // setDatasetState is a transaction on the pesistent state of the server. 
         if ( s.equalsIgnoreCase("active") ) {
@@ -186,8 +188,8 @@ public class ActionDatasets extends Acti
             setDatasetState(name, FusekiVocab.stateDormant) ;        
             dsDesc.dormant() ;
         } else
-            errorBadRequest("New state '"+s+"' not recognized");
-        success(action) ;
+            ServletOps.errorBadRequest("New state '"+s+"' not recognized");
+        ServletOps.success(action) ;
     }
 
     // Persistent state change.
@@ -236,15 +238,15 @@ public class ActionDatasets extends Acti
             if ( stmt == null ) {
                 StmtIterator sIter = model.listStatements(null, pServiceName, (RDFNode)null ) ;
                 if ( ! sIter.hasNext() )
-                    errorBadRequest("No name given in description of Fuseki service") ;
+                    ServletOps.errorBadRequest("No name given in description of Fuseki service") ;
                 sIter.next() ;
                 if ( sIter.hasNext() )
-                    errorBadRequest("Multiple names given in description of Fuseki service") ;
+                    ServletOps.errorBadRequest("Multiple names given in description of Fuseki service") ;
                 throw new InternalErrorException("Inconsistent: getOne didn't fail the second time") ;
             }
                 
             if ( ! stmt.getObject().isLiteral() )
-                errorBadRequest("Found "+FmtUtils.stringForRDFNode(stmt.getObject())+" : Service names are strings, then used to build the external URI") ;
+                ServletOps.errorBadRequest("Found "+FmtUtils.stringForRDFNode(stmt.getObject())+" : Service names are strings, then used to build the external URI") ;
             
             Resource subject = stmt.getSubject() ;
             Literal object = stmt.getObject().asLiteral() ;
@@ -262,7 +264,7 @@ public class ActionDatasets extends Acti
             SPARQLServer.registerDataset(datasetPath, dsRef) ;
             system.commit();
             committed = true ;
-            success(action) ;
+            ServletOps.success(action) ;
         } finally { 
             if ( ! committed ) system.abort() ; 
             system.end() ; 
@@ -276,7 +278,7 @@ public class ActionDatasets extends Acti
             name = "" ;
         action.log.info(format("[%d] DELETE ds=%s", action.id, name)) ;
         if ( action.dsRef.name == null ) {
-            errorBadRequest("DELETE only to the container entries.") ;
+            ServletOps.errorBadRequest("DELETE only to the container entries.") ;
             return ;
         }
 
@@ -286,7 +288,7 @@ public class ActionDatasets extends Acti
             // Name to graph
             Quad q = getOne(SystemState.dsg, null, null, pServiceName.asNode(), null) ;
             if ( q == null )
-                errorBadRequest("Failed to find dataset for '"+name+"'");
+                ServletOps.errorBadRequest("Failed to find dataset for '"+name+"'");
             Node gn = q.getGraph() ;
             
             DatasetRef dsRef = DatasetRegistry.get().get(name) ;
@@ -296,7 +298,7 @@ public class ActionDatasets extends Acti
             systemDSG.deleteAny(gn, null, null, null) ;
             systemDSG.commit() ;
             committed = true ;
-            success(action) ;
+            ServletOps.success(action) ;
         } finally { 
             if ( ! committed ) systemDSG.abort() ; 
             systemDSG.end() ; 
@@ -335,15 +337,15 @@ public class ActionDatasets extends Acti
         } catch (IOException ex) { IO.exception(ex); }
     }
     
-    // XXX Merge with SPARQL_REST_RW.incomingData
+    // XXX Merge with Upload.incomingData
     
     private static void bodyAsGraph(HttpAction action, StreamRDF dest) {
         HttpServletRequest request = action.request ;
-        String base = wholeRequestURL(request) ;
+        String base = ActionLib.wholeRequestURL(request) ;
         ContentType ct = FusekiLib.getContentType(request) ;
         Lang lang = RDFLanguages.contentTypeToLang(ct.getContentType()) ;
         if ( lang == null ) {
-            errorBadRequest("Unknown content type for triples: " + ct) ;
+            ServletOps.errorBadRequest("Unknown content type for triples: " + ct) ;
             return ;
         }
         InputStream input = null ;
@@ -373,7 +375,7 @@ public class ActionDatasets extends Acti
         ErrorHandler errorHandler = ErrorHandlerFactory.errorHandlerStd(action.log) ;
         parser.getProfile().setHandler(errorHandler) ;
         try { parser.parse() ; } 
-        catch (RiotException ex) { errorBadRequest("Parse error: "+ex.getMessage()) ; }
+        catch (RiotException ex) { ServletOps.errorBadRequest("Parse error: "+ex.getMessage()) ; }
     }
 }
 

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java Sat Dec 14 17:37:48 2013
@@ -30,6 +30,7 @@ import org.apache.jena.atlas.json.JsonVa
 import org.apache.jena.fuseki.Fuseki ;
 import org.apache.jena.fuseki.server.DatasetRegistry ;
 import org.apache.jena.fuseki.servlets.HttpAction ;
+import org.apache.jena.fuseki.servlets.ServletOps ;
 import org.apache.jena.riot.WebContent ;
 import org.eclipse.jetty.server.Server ;
 
@@ -47,10 +48,10 @@ public class ActionDescription extends A
     {
         try {
             description(action) ;
-            success(action) ;
+            ServletOps.success(action) ;
         }
         catch (IOException e) {
-            errorOccurred(e) ;
+            ServletOps.errorOccurred(e) ;
         }
     }
     

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java Sat Dec 14 17:37:48 2013
@@ -72,20 +72,20 @@ public abstract class ActionBase extends
                 // Also need the per query info ...
                 String message = String.format("The query timed out (restricted to %s ms)", cxt.get(ARQ.queryTimeout));
                 // Possibility :: response.setHeader("Retry-after", "600") ;    // 5 minutes
-                responseSendError(response, HttpSC.SERVICE_UNAVAILABLE_503, message);
+                ServletOps.responseSendError(response, HttpSC.SERVICE_UNAVAILABLE_503, message);
             } catch (ActionErrorException ex) {
                 if ( ex.exception != null )
                     ex.exception.printStackTrace(System.err) ;
                 // Log message done by printResponse in a moment.
                 if ( ex.message != null )
-                    responseSendError(response, ex.rc, ex.message) ;
+                    ServletOps.responseSendError(response, ex.rc, ex.message) ;
                 else
-                    responseSendError(response, ex.rc) ;
+                    ServletOps.responseSendError(response, ex.rc) ;
             } catch (Throwable ex) {
                 // This should not happen.
                 //ex.printStackTrace(System.err) ;
                 log.warn(format("[%d] RC = %d : %s", id, HttpSC.INTERNAL_SERVER_ERROR_500, ex.getMessage()), ex) ;
-                responseSendError(response, HttpSC.INTERNAL_SERVER_ERROR_500, ex.getMessage()) ;
+                ServletOps.responseSendError(response, HttpSC.INTERNAL_SERVER_ERROR_500, ex.getMessage()) ;
             }
     
             action.setFinishTime() ;
@@ -105,13 +105,11 @@ public abstract class ActionBase extends
     }
 
     // Default start/finish steps. 
-    protected void startRequest(HttpAction action) {
-    }
+    protected void startRequest(HttpAction action) { }
     
     protected void finishRequest(HttpAction action) { }
     
-    private void archiveHttpAction(HttpAction action)
-    {
+    private void archiveHttpAction(HttpAction action) {
         action.minimize() ;
     }
 
@@ -123,9 +121,8 @@ public abstract class ActionBase extends
         response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "HTTP PATCH not supported");
     }
     
-    private void printRequest(HttpAction action)
-    {
-        String url = wholeRequestURL(action.request) ;
+    private void printRequest(HttpAction action) {
+        String url = ActionLib.wholeRequestURL(action.request) ;
         String method = action.request.getMethod() ;
 
         log.info(format("[%d] %s %s", action.id, method, url)) ;
@@ -134,7 +131,7 @@ public abstract class ActionBase extends
             for (; en.hasMoreElements();) {
                 String h = en.nextElement() ;
                 Enumeration<String> vals = action.request.getHeaders(h) ;
-                if (!vals.hasMoreElements())
+                if ( !vals.hasMoreElements() )
                     log.info(format("[%d]   ", action.id, h)) ;
                 else {
                     for (; vals.hasMoreElements();)
@@ -143,44 +140,41 @@ public abstract class ActionBase extends
             }
         }
     }
-    
-    private void initResponse(HttpServletRequest request, HttpServletResponse response)
-    {
+
+    private void initResponse(HttpServletRequest request, HttpServletResponse response) {
         setCommonHeaders(response) ;
         String method = request.getMethod() ;
         // All GET and HEAD operations are sensitive to conneg so ...
         if ( HttpNames.METHOD_GET.equalsIgnoreCase(method) || HttpNames.METHOD_HEAD.equalsIgnoreCase(method) )
             setVaryHeader(response) ;
     }
-    
-    private void printResponse(HttpAction action)
-    {
+
+    private void printResponse(HttpAction action) {
         long time = action.getTime() ;
-        
+
         HttpServletResponseTracker response = action.response ;
-        if ( action.verbose )
-        {
+        if ( action.verbose ) {
             if ( action.contentType != null )
                 log.info(format("[%d]   %-20s %s", action.id, HttpNames.hContentType, action.contentType)) ;
             if ( action.contentLength != -1 )
                 log.info(format("[%d]   %-20s %d", action.id, HttpNames.hContentLengh, action.contentLength)) ;
-            for ( Map.Entry<String, String> e: action.headers.entrySet() )
+            for (Map.Entry<String, String> e : action.headers.entrySet())
                 log.info(format("[%d]   %-20s %s", action.id, e.getKey(), e.getValue())) ;
         }
 
         String timeStr = fmtMillis(time) ;
 
         if ( action.message == null )
-            log.info(String.format("[%d] %d %s (%s) ", action.id, action.statusCode, HttpSC.getMessage(action.statusCode), timeStr)) ;
+            log.info(String.format("[%d] %d %s (%s) ", action.id, action.statusCode,
+                                   HttpSC.getMessage(action.statusCode), timeStr)) ;
         else
             log.info(String.format("[%d] %d %s (%s) ", action.id, action.statusCode, action.message, timeStr)) ;
     }
-    
-    private static String fmtMillis(long time)
-    {
+
+    private static String fmtMillis(long time) {
         // Millis only? seconds only?
         if ( time < 1000 )
             return String.format("%,d ms", time) ;
-        return String.format("%,.3f s", time/1000.0) ;
+        return String.format("%,.3f s", time / 1000.0) ;
     }
 }

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionLib.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionLib.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionLib.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionLib.java Sat Dec 14 17:37:48 2013
@@ -18,6 +18,8 @@
 
 package org.apache.jena.fuseki.servlets;
 
+import javax.servlet.http.HttpServletRequest ;
+
 import org.apache.jena.fuseki.server.DatasetRef ;
 import org.apache.jena.fuseki.server.DatasetRegistry ;
 
@@ -25,6 +27,9 @@ import org.apache.jena.fuseki.server.Dat
 
 public class ActionLib {
 
+    
+    // TODO Combine ServletOps?
+    
     /** Map request to uri in the registry.
      * A possible implementation for mapRequestToDataset(String)
      *  that assumes the form /dataset/service 
@@ -89,5 +94,16 @@ public class ActionLib {
         return ds ;
     }
 
+    public static String wholeRequestURL(HttpServletRequest request) {
+        StringBuffer sb = request.getRequestURL() ;
+        String queryString = request.getQueryString() ;
+        if ( queryString != null ) {
+            sb.append("?") ;
+            sb.append(queryString) ;
+        }
+        return sb.toString() ;
+    }
+
+
 }
 

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java Sat Dec 14 17:37:48 2013
@@ -18,27 +18,21 @@
 
 package org.apache.jena.fuseki.servlets;
 
-import static java.lang.String.format ;
 import static org.apache.jena.fuseki.server.CounterName.Requests ;
 import static org.apache.jena.fuseki.server.CounterName.RequestsBad ;
 import static org.apache.jena.fuseki.server.CounterName.RequestsGood ;
 
 import java.io.InputStream ;
-import java.util.zip.GZIPInputStream ;
 
-import org.apache.commons.fileupload.FileItemIterator ;
-import org.apache.commons.fileupload.FileItemStream ;
-import org.apache.commons.fileupload.servlet.ServletFileUpload ;
-import org.apache.jena.atlas.web.ContentType ;
 import org.apache.jena.fuseki.Fuseki ;
 import org.apache.jena.fuseki.server.* ;
-import org.apache.jena.riot.* ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.RiotReader ;
 import org.apache.jena.riot.lang.LangRIOT ;
-import org.apache.jena.riot.lang.StreamRDFCounting ;
 import org.apache.jena.riot.system.ErrorHandler ;
 import org.apache.jena.riot.system.ErrorHandlerFactory ;
 import org.apache.jena.riot.system.StreamRDF ;
-import org.apache.jena.riot.system.StreamRDFLib ;
 
 import com.hp.hpl.jena.query.QueryCancelledException ;
 
@@ -60,17 +54,19 @@ public abstract class ActionSPARQL exten
         if ( datasetUri != null ) {
             dsRef = DatasetRegistry.get().get(datasetUri) ;
             if ( dsRef == null ) {
-                errorNotFound("No dataset for URI: "+datasetUri) ;
+                ServletOps.errorNotFound("No dataset for URI: "+datasetUri) ;
                 return ;
             }
         } else
             dsRef = FusekiConfig.serviceOnlyDatasetRef() ;
 
-        action.setRequestRef(dsRef) ;
         String uri = action.request.getRequestURI() ;
-        String serviceName = ActionLib.mapRequestToService(dsRef, uri, datasetUri) ;
-        ServiceRef srvRef = dsRef.getServiceRef(serviceName) ;
-        action.setService(srvRef) ;
+        String serviceEndpointName = ActionLib.mapRequestToService(dsRef, uri, datasetUri) ;
+        ServiceRef srvRef = dsRef.getServiceRef(serviceEndpointName) ;
+
+        action.setRequestRef(dsRef, datasetUri) ;
+        action.setService(srvRef, serviceEndpointName) ;
+        
         executeAction(action) ;
     }
 
@@ -123,6 +119,8 @@ public abstract class ActionSPARQL exten
     }
     
     protected static void incCounter(Counters counters, CounterName name) {
+        if ( counters == null )
+            return ;
         try {
             if ( counters.getCounters().contains(name) )
                 counters.getCounters().inc(name) ;
@@ -132,6 +130,8 @@ public abstract class ActionSPARQL exten
     }
     
     protected static void decCounter(Counters counters, CounterName name) {
+        if ( counters == null )
+            return ;
         try {
             if ( counters.getCounters().contains(name) )
                 counters.getCounters().dec(name) ;
@@ -140,7 +140,7 @@ public abstract class ActionSPARQL exten
         }
     }
 
-        public static void parse(HttpAction action, StreamRDF dest, InputStream input, Lang lang, String base) {
+    public static void parse(HttpAction action, StreamRDF dest, InputStream input, Lang lang, String base) {
             // Need to adjust the error handler.
     //        try { RDFDataMgr.parse(dest, input, base, lang) ; }
     //        catch (RiotException ex) { errorBadRequest("Parse error: "+ex.getMessage()) ; }
@@ -148,74 +148,6 @@ public abstract class ActionSPARQL exten
             ErrorHandler errorHandler = ErrorHandlerFactory.errorHandlerStd(action.log); 
             parser.getProfile().setHandler(errorHandler) ;
             try { parser.parse() ; } 
-            catch (RiotException ex) { errorBadRequest("Parse error: "+ex.getMessage()) ; }
+            catch (RiotException ex) { ServletOps.errorBadRequest("Parse error: "+ex.getMessage()) ; }
         }
-
-    /**  Process an HTTP upload of RDF files (triples or quads)
-     *   Stream straight into a graph or dataset -- unlike SPARQL_Upload the destination
-     *   is known at the start of the multipart file body
-     */
-    
-    static public void fileUploadWorker(HttpAction action, StreamRDF dest, boolean isGraph) {
-        String base = wholeRequestURL(action.request) ;
-        String item = (isGraph)?"quad":"triple" ;
-        ServletFileUpload upload = new ServletFileUpload();
-        long count = -1 ;
-        
-        //log.info(format("[%d] Upload: Field=%s ignored", action.id, fieldName)) ;
-        
-        try {
-            FileItemIterator iter = upload.getItemIterator(action.request);
-            while (iter.hasNext()) {
-                FileItemStream fileStream = iter.next();
-                if (fileStream.isFormField())
-                    errorBadRequest("Only files accept in multipart file upload") ;
-                //Ignore the field name.
-                //String fieldName = fileStream.getFieldName();
-    
-                InputStream stream = fileStream.openStream();
-                // Process the input stream
-                String contentTypeHeader = fileStream.getContentType() ;
-                ContentType ct = ContentType.create(contentTypeHeader) ;
-                Lang lang = RDFLanguages.contentTypeToLang(ct.getContentType()) ;
-    
-                if ( lang == null ) {
-                    String name = fileStream.getName() ; 
-                    if ( name == null || name.equals("") ) 
-                        errorBadRequest("No name for content - can't determine RDF syntax") ;
-                    lang = RDFLanguages.filenameToLang(name) ;
-                    if (name.endsWith(".gz"))
-                        stream = new GZIPInputStream(stream);
-                }
-                if ( lang == null )
-                    // Desperate.
-                    lang = RDFLanguages.RDFXML ;
-    
-                String printfilename = fileStream.getName() ; 
-                if ( printfilename == null  || printfilename.equals("") )
-                    printfilename = "<none>" ; 
-    
-                // Before
-                // action.log.info(format("[%d] Filename: %s, Content-Type=%s, Charset=%s => %s", 
-                //                        action.id, printfilename,  ct.getContentType(), ct.getCharset(), lang.getName())) ;
-                
-                StreamRDFCounting countingDest =  StreamRDFLib.count(dest) ;
-                try {
-                    ActionSPARQL.parse(action, countingDest, stream, lang, base);
-                    long c = countingDest.count() ;
-                    
-                    action.log.info(format("[%d] Filename: %s, Content-Type=%s, Charset=%s => %s : %d %s%s", 
-                                           action.id, printfilename,  ct.getContentType(), ct.getCharset(), lang.getName(),
-                                           c, item, (c==1)?"":"s")) ;
-                } catch (RiotParseException ex) {
-                    action.log.info(format("[%d] Filename: %s, Content-Type=%s, Charset=%s => %s : %s",
-                                           action.id, printfilename,  ct.getContentType(), ct.getCharset(), lang.getName(),
-                                           ex.getMessage())) ;
-                    throw ex ;
-                }
-            }
-        }
-        catch (ActionErrorException ex) { throw ex ; }
-        catch (Exception ex)            { errorOccurred(ex) ; }
-    }
 }

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java Sat Dec 14 17:37:48 2013
@@ -55,22 +55,20 @@ public class HttpAction
     
     // -- Valid only for operational actions (e.g. SPARQL).
     
-    private DatasetGraph dsg                = null ;
-    public  ServiceRef srvRef               = null ;
+    public  String          endpointName    = null ;        // Endpoint name srv was found under 
+    public  ServiceRef      srvRef          = null ;
     private Transactional   transactional   = null ;
     private boolean         isTransactional = false ;
     private DatasetGraph    activeDSG       = null ;        // Set when inside begin/end.
     private ReadWrite       activeMode      = null ;        // Set when inside begin/end.
     
-    
     // -- Valid only for administration actions.
-    /** Name of dataset being acted upon in a admin operation (may be null) */
-    public String datasetName               = null ;
-    
     
     // -- Shared items (but exact meaning may differ)
     /** Handle to dataset+services being acted on (maybe null) */
     public  DatasetRef dsRef                = null ;
+    public  String datasetName              = null ;        // Dataset URI used (e.g. registry)
+    private DatasetGraph dsg                = null ;
 
     // ----
     
@@ -102,7 +100,7 @@ public class HttpAction
     }
 
     /** Initialization after action creation during lifecycle setup */
-    public void setRequestRef(DatasetRef desc) {
+    public void setRequestRef(DatasetRef desc, String datasetUri) {
         if ( this.dsRef != null )
             throw new FusekiException("Redefintion of DatasetRef in the request action") ;
         
@@ -110,6 +108,7 @@ public class HttpAction
         if ( desc == null || desc.dataset == null )
             throw new FusekiException("Null DatasetRef in the request action") ;
         
+        this.datasetName = datasetUri ;
         this.dsg = desc.dataset ;
         DatasetGraph basedsg = unwrap(dsg) ;
 
@@ -125,13 +124,14 @@ public class HttpAction
         }
     }
     
-    public void setControlRef(DatasetRef desc) {
+    public void setControlRef(DatasetRef desc, String datasetUri) {
         if ( desc == null )
             throw new FusekiException("Null DatasetRef in the control action") ;
 
         if ( this.dsRef != null )
             throw new FusekiException("Redefintion of DatasetRef in the control action") ;
         this.dsRef = desc ;
+        this.datasetName = datasetUri ;
     }
     
     private static boolean isTransactional(DatasetGraph dsg) {
@@ -145,8 +145,9 @@ public class HttpAction
         return dsg ;
     }
         
-    public void setService(ServiceRef srvRef) {
+    public void setService(ServiceRef srvRef, String endpointName) {
         this.srvRef = srvRef ; 
+        this.endpointName = endpointName ;
     }
     
     /**

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java Sat Dec 14 17:37:48 2013
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.jena.fuseki.servlets;
+package org.apache.jena.fuseki.servlets ;
 
 import static java.lang.String.format ;
 
@@ -26,187 +26,201 @@ import javax.servlet.ServletOutputStream
 
 import org.apache.jena.atlas.web.MediaType ;
 import org.apache.jena.atlas.web.TypedOutputStream ;
-import org.apache.jena.fuseki.Fuseki ;
+import org.apache.jena.fuseki.FusekiLib ;
 import org.apache.jena.fuseki.HttpNames ;
 import org.apache.jena.riot.Lang ;
 import org.apache.jena.riot.RDFDataMgr ;
 import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.RiotReader ;
-import org.apache.jena.riot.lang.LangRIOT ;
+import org.apache.jena.riot.RiotException ;
 import org.apache.jena.riot.system.StreamRDF ;
 import org.apache.jena.riot.system.StreamRDFLib ;
 
-import com.hp.hpl.jena.graph.Graph ;
-import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.sparql.core.DatasetGraph ;
+import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
 
-/** 
- * Servlet that serves up quads for a dataset.
+/**
+ * Servlet for operations directly on a dataset - REST(ish) behaviour on the
+ * dataset URI.
  */
 
-public class REST_Quads extends SPARQL_REST
-{
-    public REST_Quads()     { super(); }
-    
+public class REST_Quads extends SPARQL_REST {
+    // Not supported: GSP direct naming.
+
+    public REST_Quads() {
+        super() ;
+    }
+
     @Override
-    protected void validate(HttpAction action)
-    {
+    protected void validate(HttpAction action) {
         // already checked?
     }
-    
+
     @Override
-    protected void doGet(HttpAction action)
-    {
+    protected void doGet(HttpAction action) {
         MediaType mediaType = HttpAction.contentNegotationQuads(action) ;
         ServletOutputStream output ;
-        try { output = action.response.getOutputStream() ; }
-        catch (IOException ex) { errorOccurred(ex) ; output = null ; }
-        
+        try {
+            output = action.response.getOutputStream() ;
+        } catch (IOException ex) {
+            ServletOps.errorOccurred(ex) ;
+            output = null ;
+        }
+
         TypedOutputStream out = new TypedOutputStream(output, mediaType) ;
         Lang lang = RDFLanguages.contentTypeToLang(mediaType.getContentType()) ;
         if ( lang == null )
             lang = RDFLanguages.TRIG ;
 
         if ( action.verbose )
-            action.log.info(format("[%d]   Get: Content-Type=%s, Charset=%s => %s", 
-                                  action.id, mediaType.getContentType(), mediaType.getCharset(), lang.getName())) ;
-        if ( ! RDFLanguages.isQuads(lang) )
-            errorBadRequest("Not a quads format: "+mediaType) ;
-        
+            action.log.info(format("[%d]   Get: Content-Type=%s, Charset=%s => %s", action.id,
+                                   mediaType.getContentType(), mediaType.getCharset(), lang.getName())) ;
+        if ( !RDFLanguages.isQuads(lang) )
+            ServletOps.errorBadRequest("Not a quads format: " + mediaType) ;
+
         action.beginRead() ;
         try {
             DatasetGraph dsg = action.getActiveDSG() ;
             RDFDataMgr.write(out, dsg, lang) ;
-            success(action) ;
-        } finally { action.endRead() ; }
+            ServletOps.success(action) ;
+        } finally {
+            action.endRead() ;
+        }
     }
-    
+
     @Override
-    protected void doOptions(HttpAction action)
-    {
+    protected void doOptions(HttpAction action) {
         action.response.setHeader(HttpNames.hAllow, "GET, HEAD, OPTIONS") ;
         action.response.setHeader(HttpNames.hContentLengh, "0") ;
-        success(action) ;
+        ServletOps.success(action) ;
     }
 
     @Override
-    protected void doHead(HttpAction action)
-    {
+    protected void doHead(HttpAction action) {
         action.beginRead() ;
-        try { 
+        try {
             MediaType mediaType = HttpAction.contentNegotationQuads(action) ;
-            success(action) ;
-        } finally { action.endRead() ; }
+            ServletOps.success(action) ;
+        } finally {
+            action.endRead() ;
+        }
     }
 
-    static int counter = 0 ;
     @Override
-    protected void doPost(HttpAction action)
-    { 
-        if ( ! action.getDatasetRef().allowDatasetUpdate )
-            errorMethodNotAllowed("POST") ;
-
-        // Graph Store Protocol mode - POST triples to dataset causes
-        // a new graph to be created and the new URI returned via Location.
-        // Normally off.  
-        // When off, POST of triples goes to default graph.
-        boolean gspMode = Fuseki.graphStoreProtocolPostCreate ;
-        
-        // Code to pass the GSP test suite.
-        // Not necessarily good code.
-        String x = action.request.getContentType() ;
-        if ( x == null )
-            errorBadRequest("Content-type required for data format") ;
-        
-        MediaType mediaType = MediaType.create(x) ;
-        Lang lang = RDFLanguages.contentTypeToLang(mediaType.getContentType()) ;
-        if ( lang == null )
-            lang = RDFLanguages.TRIG ;
+    protected void doPost(HttpAction action) {
+        if ( !action.getDatasetRef().allowDatasetUpdate )
+            ServletOps.errorMethodNotAllowed("POST") ;
 
-        if ( action.verbose )
-            action.log.info(format("[%d]   Post: Content-Type=%s, Charset=%s => %s", 
-                                  action.id, mediaType.getContentType(), mediaType.getCharset(), lang.getName())) ;
-        
-        if ( RDFLanguages.isQuads(lang) )
-            doPostQuads(action, lang) ;
-        else if ( gspMode && RDFLanguages.isTriples(lang) )
-            doPostTriplesGSP(action, lang) ;
-        else if ( RDFLanguages.isTriples(lang) )
-            doPostTriples(action, lang) ;
+        if ( action.isTransactional() )
+            doPutPostTxn(action, false) ;
         else
-            errorBadRequest("Not a triples or quads format: "+mediaType) ;
+            doPutPostNonTxn(action, false) ;
     }
-        
-    protected void doPostQuads(HttpAction action, Lang lang)
-    {
+
+    @Override
+    protected void doPut(HttpAction action) {
+        if ( !action.getDatasetRef().allowDatasetUpdate )
+            ServletOps.errorMethodNotAllowed("POST") ;
+
+        if ( action.isTransactional() )
+            doPutPostTxn(action, false) ;
+        else
+            doPutPostNonTxn(action, false) ;
+    }
+
+    // These are very similar to SPARQL_REST_RW.addDataIntoTxn/nonTxn
+    // Maybe can be usually DRYed.
+
+    @Override
+    protected void doDelete(HttpAction action) {
+        ServletOps.errorMethodNotAllowed("DELETE") ;
+    }
+
+    @Override
+    protected void doPatch(HttpAction action) {
+        ServletOps.errorMethodNotAllowed("PATCH") ;
+    }
+
+    private void doPutPostTxn(HttpAction action, boolean clearFirst) {
         action.beginWrite() ;
         try {
-            String name = action.request.getRequestURL().toString() ;
             DatasetGraph dsg = action.getActiveDSG() ;
             StreamRDF dest = StreamRDFLib.dataset(dsg) ;
-            LangRIOT parser = RiotReader.createParser(action.request.getInputStream(), lang, name , dest) ;
-            parser.parse() ;
-            action.commit();
-            success(action) ;
-        } catch (IOException ex) { action.abort() ; } 
-        finally { action.endWrite() ; }
+            Upload.incomingData(action, dest, false) ;
+            action.commit() ;
+            ServletOps.success(action) ;
+        } catch (RiotException ex) {
+            // Parse error
+            action.abort() ;
+            ServletOps.errorBadRequest(ex.getMessage()) ;
+        } catch (Exception ex) {
+            // Something else went wrong. Backout.
+            action.abort() ;
+            ServletOps.errorOccurred(ex.getMessage()) ;
+        } finally {
+            action.endWrite() ;
+        }
     }
     
-  
-    // POST triples to dataset -- send to default graph.  
-    protected void doPostTriples(HttpAction action, Lang lang) 
-    {
-        action.beginWrite() ;
+    // XXX Logging
+    // XXX Logging in Upload.incomingData
+
+    private void doPutPostNonTxn(HttpAction action, boolean clearFirst) {
+        DatasetGraph dsgTmp = DatasetGraphFactory.createMem() ;
+        StreamRDF dest = StreamRDFLib.dataset(dsgTmp) ;
+
         try {
-            DatasetGraph dsg = action.getActiveDSG() ;
-            // This should not be anythign other than the datasets name via this route.  
-            String name = action.request.getRequestURL().toString() ;
-            //log.info(format("[%d] ** Content-length: %d", action.id, action.request.getContentLength())) ;  
-            Graph g = dsg.getDefaultGraph() ;
-            StreamRDF dest = StreamRDFLib.graph(g) ;
-            LangRIOT parser = RiotReader.createParser(action.request.getInputStream(), lang, name , dest) ;
-            parser.parse() ;
-            action.commit();
-            success(action) ;
-        } catch (IOException ex) { action.abort() ; } 
-        finally { action.endWrite() ; }
-    }
-    
-    protected void doPostTriplesGSP(HttpAction action, Lang lang) 
-    {
+            Upload.incomingData(action, dest, false) ;
+        } catch (RiotException ex) {
+            ServletOps.errorBadRequest(ex.getMessage()) ;
+        }
+        // Now insert into dataset
         action.beginWrite() ;
         try {
-            DatasetGraph dsg = action.getActiveDSG() ;
-            //log.info(format("[%d] ** Content-length: %d", action.id, action.request.getContentLength())) ;  
-            
-            String name = action.request.getRequestURL().toString() ;
-            if ( ! name.endsWith("/") )
-                name = name+ "/"  ;
-            name = name+(++counter) ;
-            Node gn = NodeFactory.createURI(name) ;
-            Graph g = dsg.getGraph(gn) ;
-            StreamRDF dest = StreamRDFLib.graph(g) ;
-            LangRIOT parser = RiotReader.createParser(action.request.getInputStream(), lang, name , dest) ;
-            parser.parse() ;
-            action.log.info(format("[%d] Location: %s", action.id, name)) ;
-            action.response.setHeader("Location",  name) ;
-            action.commit();
-            successCreated(action) ;
-        } catch (IOException ex) { action.abort() ; } 
-        finally { action.endWrite() ; }
-    }
-
-    @Override
-    protected void doDelete(HttpAction action)
-    { errorMethodNotAllowed("DELETE") ; }
+            FusekiLib.addDataInto(dsgTmp, action.getActiveDSG()) ;
+            action.commit() ;
+            ServletOps.success(action) ;
+        } catch (Exception ex) {
+            // We're in the non-transactional branch, this probably will not
+            // work
+            // but it might and there is no harm safely trying.
+            try {
+                action.abort() ;
+            } catch (Exception ex2) {}
+            ServletOps.errorOccurred(ex.getMessage()) ;
+        } finally {
+            action.endWrite() ;
+        }
 
-    @Override
-    protected void doPut(HttpAction action)
-    { errorMethodNotAllowed("PUT") ; }
+    }
 
-    @Override
-    protected void doPatch(HttpAction action)
-    { errorMethodNotAllowed("PATCH") ; }
+//    static int counter = 0 ;
+//
+//    protected void doPostTriplesGSP(HttpAction action, Lang lang) {
+//        // Old code.
+//        // Assumes transactional.
+//        action.beginWrite() ;
+//        try {
+//            DatasetGraph dsg = action.getActiveDSG() ;
+//            // log.info(format("[%d] ** Content-length: %d", action.id,
+//            // action.request.getContentLength())) ;
+//
+//            String name = action.request.getRequestURL().toString() ;
+//            if ( !name.endsWith("/") )
+//                name = name + "/" ;
+//            name = name + (++counter) ;
+//            Node gn = NodeFactory.createURI(name) ;
+//            Graph g = dsg.getGraph(gn) ;
+//            StreamRDF dest = StreamRDFLib.graph(g) ;
+//            LangRIOT parser = RiotReader.createParser(action.request.getInputStream(), lang, name, dest) ;
+//            parser.parse() ;
+//            action.log.info(format("[%d] Location: %s", action.id, name)) ;
+//            action.response.setHeader("Location", name) ;
+//            action.commit() ;
+//            ServletOps.successCreated(action) ;
+//        } catch (IOException ex) {
+//            action.abort() ;
+//        } finally {
+//            action.endWrite() ;
+//        }
+//    }
 }
-

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java Sat Dec 14 17:37:48 2013
@@ -18,10 +18,6 @@
 
 package org.apache.jena.fuseki.servlets;
 
-import static org.apache.jena.fuseki.servlets.ServletBase.error ;
-import static org.apache.jena.fuseki.servlets.ServletBase.errorBadRequest ;
-import static org.apache.jena.fuseki.servlets.ServletBase.errorOccurred ;
-
 import java.util.HashMap ;
 import java.util.Map ;
 
@@ -89,7 +85,7 @@ public class ResponseModel
                 msg = "No Accept: header" ;
             else
                 msg = "Accept: "+x+" : Not understood" ;
-            error(HttpSC.NOT_ACCEPTABLE_406, msg) ;
+            ServletOps.error(HttpSC.NOT_ACCEPTABLE_406, msg) ;
         }
 
         String contentType = mimeType ;
@@ -104,7 +100,7 @@ public class ResponseModel
 
         Lang lang = RDFLanguages.contentTypeToLang(contentType) ;
         if ( lang == null )
-            errorBadRequest("Can't determine output content type: "+contentType) ;
+            ServletOps.errorBadRequest("Can't determine output content type: "+contentType) ;
         
 //        if ( rdfw instanceof RDFXMLWriterI )
 //            rdfw.setProperty("showXmlDeclaration", "true") ;
@@ -129,7 +125,7 @@ public class ResponseModel
         }
         catch (Exception ex) { 
             action.log.info("Exception while writing the response model: "+ex.getMessage(), ex) ;
-            errorOccurred("Exception while writing the response model: "+ex.getMessage(), ex) ;
+            ServletOps.errorOccurred("Exception while writing the response model: "+ex.getMessage(), ex) ;
         }
     }
 }

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java Sat Dec 14 17:37:48 2013
@@ -20,8 +20,6 @@ package org.apache.jena.fuseki.servlets;
 
 import static java.lang.String.format ;
 import static org.apache.jena.atlas.lib.Lib.equal ;
-import static org.apache.jena.fuseki.servlets.ServletBase.errorBadRequest ;
-import static org.apache.jena.fuseki.servlets.ServletBase.errorOccurred ;
 
 import java.io.IOException ;
 import java.util.HashMap ;
@@ -146,7 +144,7 @@ public class ResponseResultSet
         else if (equal(serializationType, WebContent.contentTypeTextTSV) )
             tsvOutput(action, contentType, resultSet, booleanResult) ;
         else
-            errorBadRequest("Can't determine output serialization: "+serializationType) ;
+            ServletOps.errorBadRequest("Can't determine output serialization: "+serializationType) ;
     }
     
     
@@ -223,7 +221,7 @@ public class ResponseResultSet
 
             if ( callback != null )
                 out.println(")") ;
-        } catch (IOException ex) { errorOccurred(ex) ; }
+        } catch (IOException ex) { ServletOps.errorOccurred(ex) ; }
     }
     
     private static void textOutput(HttpAction action, String contentType, final ResultSet resultSet, final Prologue qPrologue, final Boolean booleanResult)
@@ -293,7 +291,7 @@ public class ResponseResultSet
             }
         // Includes client gone.
         } catch (IOException ex) 
-        { errorOccurred(ex) ; }
+        { ServletOps.errorOccurred(ex) ; }
         // Do not call httpResponse.flushBuffer(); here - Jetty closes the stream if it is a gzip stream
         // then the JSON callback closing details can't be added. 
     }

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java Sat Dec 14 17:37:48 2013
@@ -97,7 +97,7 @@ public abstract class SPARQL_Query exten
             return ;
         }
 
-        error(HttpSC.UNSUPPORTED_MEDIA_TYPE_415, "Bad content type: "+incoming) ;
+        ServletOps.error(HttpSC.UNSUPPORTED_MEDIA_TYPE_415, "Bad content type: "+incoming) ;
     }
 
     // All the params we support
@@ -119,12 +119,12 @@ public abstract class SPARQL_Query exten
         String method = action.request.getMethod().toUpperCase(Locale.ROOT) ;
         
         if ( ! HttpNames.METHOD_POST.equals(method) && ! HttpNames.METHOD_GET.equals(method) )
-            errorMethodNotAllowed("Not a GET or POST request") ;
+            ServletOps.errorMethodNotAllowed("Not a GET or POST request") ;
             
         if ( HttpNames.METHOD_GET.equals(method) && action.request.getQueryString() == null )
         {
-            warning(action, "Service Description / SPARQL Query / "+action.request.getRequestURI()) ;
-            errorNotFound("Service Description: "+action.request.getRequestURI()) ;
+            ServletOps.warning(action, "Service Description / SPARQL Query / "+action.request.getRequestURI()) ;
+            ServletOps.errorNotFound("Service Description: "+action.request.getRequestURI()) ;
         }
         
         // Use of the dataset describing parameters is check later.
@@ -157,7 +157,7 @@ public abstract class SPARQL_Query exten
             }
             else if ( WebContent.contentTypeForm.equals(incoming) ) {}
             else
-                error(HttpSC.UNSUPPORTED_MEDIA_TYPE_415, "Unsupported: "+incoming) ;
+                ServletOps.error(HttpSC.UNSUPPORTED_MEDIA_TYPE_415, "Unsupported: "+incoming) ;
         }
         
         // GET/POST of a form at this point.
@@ -166,16 +166,16 @@ public abstract class SPARQL_Query exten
         {
             int N = countParamOccurences(request, paramQuery) ; 
             
-            if ( N == 0 ) errorBadRequest("SPARQL Query: No 'query=' parameter") ;
-            if ( N > 1 ) errorBadRequest("SPARQL Query: Multiple 'query=' parameters") ;
+            if ( N == 0 ) ServletOps.errorBadRequest("SPARQL Query: No 'query=' parameter") ;
+            if ( N > 1 ) ServletOps.errorBadRequest("SPARQL Query: Multiple 'query=' parameters") ;
             
             // application/sparql-query does not use a query param.
             String queryStr = request.getParameter(HttpNames.paramQuery) ;
             
             if ( queryStr == null )
-                errorBadRequest("SPARQL Query: No query specified (no 'query=' found)") ;
+                ServletOps.errorBadRequest("SPARQL Query: No query specified (no 'query=' found)") ;
             if ( queryStr.isEmpty() )
-                errorBadRequest("SPARQL Query: Empty query string") ;
+                ServletOps.errorBadRequest("SPARQL Query: Empty query string") ;
         }
 
         if ( params != null )
@@ -185,7 +185,7 @@ public abstract class SPARQL_Query exten
             {
                 String name = en.nextElement() ;
                 if ( ! params.contains(name) )
-                    warning(action, "SPARQL Query: Unrecognize request parameter (ignored): "+name) ;
+                    ServletOps.warning(action, "SPARQL Query: Unrecognize request parameter (ignored): "+name) ;
             }
         }
     }
@@ -203,13 +203,13 @@ public abstract class SPARQL_Query exten
             InputStream input = action.request.getInputStream() ; 
             queryString = IO.readWholeFileAsUTF8(input) ;
         }
-        catch (IOException ex) { errorOccurred(ex) ; }
+        catch (IOException ex) { ServletOps.errorOccurred(ex) ; }
         execute(queryString, action) ;
     }
 
     private void execute(String queryString, HttpAction action)
     {
-        String queryStringLog = formatForLog(queryString) ;
+        String queryStringLog = ServletOps.formatForLog(queryString) ;
         if ( action.verbose )
             action.log.info(format("[%d] Query = \n%s", action.id, queryString));
         else
@@ -226,11 +226,11 @@ public abstract class SPARQL_Query exten
             throw ex ;
         } catch (QueryParseException ex) {
             incCounter(action.srvRef, RequestsBad) ;
-            errorBadRequest("Parse error: \n" + queryString + "\n\r" + messageForQPE(ex)) ;
+            ServletOps.errorBadRequest("Parse error: \n" + queryString + "\n\r" + messageForQPE(ex)) ;
         }
         // Should not happen.
         catch (QueryException ex) {
-            errorBadRequest("Error: \n" + queryString + "\n\r" + ex.getMessage()) ;
+            ServletOps.errorBadRequest("Error: \n" + queryString + "\n\r" + ex.getMessage()) ;
         }
         
         // Assumes finished whole thing by end of sendResult. 
@@ -311,7 +311,7 @@ public abstract class SPARQL_Query exten
             return new SPARQLResult(b) ;
         }
 
-        errorBadRequest("Unknown query type - "+queryStringLog) ;
+        ServletOps.errorBadRequest("Unknown query type - "+queryStringLog) ;
         return null ;
     }
 
@@ -352,7 +352,7 @@ public abstract class SPARQL_Query exten
         else if ( result.isBoolean() )
             ResponseResultSet.doResponseResultSet(action, result.getBooleanResult()) ;
         else
-            errorOccurred("Unknown or invalid result type") ;
+            ServletOps.errorOccurred("Unknown or invalid result type") ;
     }
     
     private String formatForLog(Query query)

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java Sat Dec 14 17:37:48 2013
@@ -56,7 +56,7 @@ public class SPARQL_QueryGeneral extends
         if ( datasetDesc == null )
             datasetDesc = getDatasetDescription(query) ;
         if ( datasetDesc == null )
-            errorBadRequest("No dataset description in protocol request or in the query string") ;
+            ServletOps.errorBadRequest("No dataset description in protocol request or in the query string") ;
 
         return datasetFromDescription(action, datasetDesc) ;
     }
@@ -95,11 +95,11 @@ public class SPARQL_QueryGeneral extends
                         action.log.info(format("[%d] Load (default graph) %s", action.id, uri)) ;
                     } catch (RiotException ex) {
                         action.log.info(format("[%d] Parsing error loading %s: %s", action.id, uri, ex.getMessage())) ;
-                        errorBadRequest("Failed to load URL (parse error) "+uri+" : "+ex.getMessage()) ;
+                        ServletOps.errorBadRequest("Failed to load URL (parse error) "+uri+" : "+ex.getMessage()) ;
                     } catch (Exception ex)
                     {
                         action.log.info(format("[%d] Failed to load (default) %s: %s", action.id, uri, ex.getMessage())) ;
-                        errorBadRequest("Failed to load URL "+uri) ;
+                        ServletOps.errorBadRequest("Failed to load URL "+uri) ;
                     }
                 }
                 dataset.setDefaultModel(model) ;
@@ -119,11 +119,11 @@ public class SPARQL_QueryGeneral extends
                         dataset.addNamedModel(uri, model) ;
                     } catch (RiotException ex) {
                         action.log.info(format("[%d] Parsing error loading %s: %s", action.id, uri, ex.getMessage())) ;
-                        errorBadRequest("Failed to load URL (parse error) "+uri+" : "+ex.getMessage()) ;
+                        ServletOps.errorBadRequest("Failed to load URL (parse error) "+uri+" : "+ex.getMessage()) ;
                     } catch (Exception ex)
                     {
                         action.log.info(format("[%d] Failed to load (named graph) %s: %s", action.id, uri, ex.getMessage())) ;
-                        errorBadRequest("Failed to load URL "+uri) ;
+                        ServletOps.errorBadRequest("Failed to load URL "+uri) ;
                     }
                 }
             }
@@ -135,7 +135,7 @@ public class SPARQL_QueryGeneral extends
         catch (Exception ex)
         {
             action.log.info(format("[%d] SPARQL parameter error: "+ex.getMessage(),action.id, ex)) ;
-            errorBadRequest("Parameter error: "+ex.getMessage());
+            ServletOps.errorBadRequest("Parameter error: "+ex.getMessage());
             return null ;
         }
     }

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java Sat Dec 14 17:37:48 2013
@@ -46,19 +46,29 @@ public abstract class SPARQL_REST extend
     protected final static Target determineTarget(HttpAction action) {
         // Delayed until inside a transaction.
         if ( action.getActiveDSG() == null )
-            errorOccurred("Internal error : No action graph (not in a transaction?)") ;
+            ServletOps.errorOccurred("Internal error : No action graph (not in a transaction?)") ;
         
         boolean dftGraph = getOneOnly(action.request, HttpNames.paramGraphDefault) != null ;
         String uri = getOneOnly(action.request, HttpNames.paramGraph) ;
         
         if ( !dftGraph && uri == null ) {
+            ServletOps.errorBadRequest("Neither default graph nor named graph specified; no direct name") ;
+            
             // Direct naming or error.
             uri = action.request.getRequestURL().toString() ;
             if ( action.request.getRequestURI().equals(action.getDatasetRef().name) )
                 // No name 
-                errorBadRequest("Neither default graph nor named graph specified; no direct name") ;
+                ServletOps.errorBadRequest("Neither default graph nor named graph specified; no direct name") ;
         }
         
+//        // Put these in action.
+//        String datasetUri = mapRequestToDataset(action) ;
+//        String reqUri = action.request.getRequestURI() ;
+//        String serviceName = ActionLib.mapRequestToService(dsRef, reqUri, reqUri) ;
+
+        String dsTarget = action.datasetName ;
+        
+        
         if ( dftGraph )
             return Target.createDefault(action.getActiveDSG()) ;
         
@@ -69,6 +79,9 @@ public abstract class SPARQL_REST extend
         
         // Strictly, a bit naughty on the URI resolution.  But more sensible. 
         // Base is dataset.
+        
+        // XXX Remove service.
+        
         String base = action.request.getRequestURL().toString() ; //wholeRequestURL(request) ;
         // Make sure it ends in "/", ie. dataset as container.
         if ( action.request.getQueryString() != null && ! base.endsWith("/") )
@@ -199,13 +212,13 @@ public abstract class SPARQL_REST extend
             doOptions$(action) ;
         else if (method.equals(METHOD_TRACE))
             //doTrace(action) ;
-            errorMethodNotAllowed("TRACE") ;
+            ServletOps.errorMethodNotAllowed("TRACE") ;
         else if (method.equals(METHOD_PUT))
             doPut$(action) ;   
         else if (method.equals(METHOD_DELETE))
             doDelete$(action) ;
         else
-            errorNotImplemented("Unknown method: "+method) ;
+            ServletOps.errorNotImplemented("Unknown method: "+method) ;
     }
 
     // Counter wrappers
@@ -299,37 +312,37 @@ public abstract class SPARQL_REST extend
     protected void validate(HttpAction action)
     {
         HttpServletRequest request = action.request ;
-        // Direct naming.
-        if ( request.getQueryString() == null )
+        if ( request.getQueryString() == null ) {
             //errorBadRequest("No query string") ;
             return ;
+        }
         
         String g = request.getParameter(HttpNames.paramGraph) ;
         String d = request.getParameter(HttpNames.paramGraphDefault) ;
         
         if ( g != null && d !=null )
-            errorBadRequest("Both ?default and ?graph in the query string of the request") ;
+            ServletOps.errorBadRequest("Both ?default and ?graph in the query string of the request") ;
         
         if ( g == null && d == null )
-            errorBadRequest("Neither ?default nor ?graph in the query string of the request") ;
+            ServletOps.errorBadRequest("Neither ?default nor ?graph in the query string of the request") ;
         
         int x1 = SPARQL_Protocol.countParamOccurences(request, HttpNames.paramGraph) ;
         int x2 = SPARQL_Protocol.countParamOccurences(request, HttpNames.paramGraphDefault) ;
         
         if ( x1 > 1 )
-            errorBadRequest("Multiple ?default in the query string of the request") ;
+            ServletOps.errorBadRequest("Multiple ?default in the query string of the request") ;
         if ( x2 > 1 )
-            errorBadRequest("Multiple ?graph in the query string of the request") ;
+            ServletOps.errorBadRequest("Multiple ?graph in the query string of the request") ;
         
         Enumeration<String> en = request.getParameterNames() ;
         for ( ; en.hasMoreElements() ; )
         {
             String h = en.nextElement() ;
             if ( ! HttpNames.paramGraph.equals(h) && ! HttpNames.paramGraphDefault.equals(h) )
-                errorBadRequest("Unknown parameter '"+h+"'") ;
+                ServletOps.errorBadRequest("Unknown parameter '"+h+"'") ;
             // one of ?default and &graph
             if ( request.getParameterValues(h).length != 1 )
-                errorBadRequest("Multiple parameters '"+h+"'") ;
+                ServletOps.errorBadRequest("Multiple parameters '"+h+"'") ;
         }
     }
 
@@ -341,7 +354,7 @@ public abstract class SPARQL_REST extend
         if ( values.length == 0 )
             return null ;
         if ( values.length > 1 )
-            errorBadRequest("Multiple occurrences of '"+name+"'") ;
+            ServletOps.errorBadRequest("Multiple occurrences of '"+name+"'") ;
         return values[0] ;
     }
 }

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java Sat Dec 14 17:37:48 2013
@@ -50,7 +50,7 @@ public class SPARQL_REST_R extends SPARQ
         
         ServletOutputStream output ;
         try { output = action.response.getOutputStream() ; }
-        catch (IOException ex) { errorOccurred(ex) ; output = null ; }
+        catch (IOException ex) { ServletOps.errorOccurred(ex) ; output = null ; }
         
         TypedOutputStream out = new TypedOutputStream(output, mediaType) ;
         Lang lang = RDFLanguages.contentTypeToLang(mediaType.getContentType()) ;
@@ -67,7 +67,7 @@ public class SPARQL_REST_R extends SPARQ
                 action.log.debug("GET->"+target) ;
             boolean exists = target.exists() ;
             if ( ! exists )
-                errorNotFound("No such graph: <"+target.name+">") ;
+                ServletOps.errorNotFound("No such graph: <"+target.name+">") ;
             // If we want to set the Content-Length, we need to buffer.
             //response.setContentLength(??) ;
             String ct = lang.getContentType().toHeaderString() ;
@@ -77,7 +77,7 @@ public class SPARQL_REST_R extends SPARQ
             RDFFormat fmt = 
                 ( lang == Lang.RDFXML ) ? RDFFormat.RDFXML_PLAIN : RDFWriterRegistry.defaultSerialization(lang) ;  
             RDFDataMgr.write(out, g, fmt) ;
-            success(action) ;
+            ServletOps.success(action) ;
         } finally { action.endRead() ; }
     }
     
@@ -86,7 +86,7 @@ public class SPARQL_REST_R extends SPARQ
     {
         action.response.setHeader(HttpNames.hAllow, "GET,HEAD,OPTIONS") ;
         action.response.setHeader(HttpNames.hContentLengh, "0") ;
-        success(action) ;
+        ServletOps.success(action) ;
     }
 
     @Override
@@ -99,27 +99,27 @@ public class SPARQL_REST_R extends SPARQ
                 action.log.debug("HEAD->"+target) ;
             if ( ! target.exists() )
             {
-                successNotFound(action) ;
+                ServletOps.successNotFound(action) ;
                 return ;
             }
             MediaType mediaType = HttpAction.contentNegotationRDF(action) ;
-            success(action) ;
+            ServletOps.success(action) ;
         } finally { action.endRead() ; }
     }
 
     @Override
     protected void doPost(HttpAction action)
-    { errorMethodNotAllowed("POST") ; }
+    { ServletOps.errorMethodNotAllowed("POST") ; }
 
     @Override
     protected void doDelete(HttpAction action)
-    { errorMethodNotAllowed("DELETE") ; }
+    { ServletOps.errorMethodNotAllowed("DELETE") ; }
 
     @Override
     protected void doPut(HttpAction action)
-    { errorMethodNotAllowed("PUT") ; }
+    { ServletOps.errorMethodNotAllowed("PUT") ; }
 
     @Override
     protected void doPatch(HttpAction action)
-    { errorMethodNotAllowed("PATCH") ; }
+    { ServletOps.errorMethodNotAllowed("PATCH") ; }
 }

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java?rev=1550957&r1=1550956&r2=1550957&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java Sat Dec 14 17:37:48 2013
@@ -18,17 +18,9 @@
 
 package org.apache.jena.fuseki.servlets;
 
-import static java.lang.String.format ;
-
-import java.io.IOException ;
-import java.io.InputStream ;
-
-import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.web.ContentType ;
 import org.apache.jena.fuseki.FusekiLib ;
 import org.apache.jena.fuseki.HttpNames ;
-import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RDFLanguages ;
 import org.apache.jena.riot.RiotException ;
 import org.apache.jena.riot.WebContent ;
 import org.apache.jena.riot.system.StreamRDF ;
@@ -36,8 +28,6 @@ import org.apache.jena.riot.system.Strea
 import org.apache.jena.web.HttpSC ;
 
 import com.hp.hpl.jena.graph.Graph ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
 import com.hp.hpl.jena.sparql.graph.GraphFactory ;
 
 /** The WRITE operations added to the READ operations */
@@ -51,7 +41,7 @@ public class SPARQL_REST_RW extends SPAR
     {
         action.response.setHeader(HttpNames.hAllow, "GET,HEAD,OPTIONS,PUT,DELETE,POST");
         action.response.setHeader(HttpNames.hContentLengh, "0") ;
-        success(action) ;
+        ServletOps.success(action) ;
     }
     
     @Override
@@ -67,13 +57,13 @@ public class SPARQL_REST_RW extends SPAR
             {
                 // commit, not abort, because locking "transactions" don't support abort. 
                 action.commit() ;
-                errorNotFound("No such graph: "+target.name) ;
+                ServletOps.errorNotFound("No such graph: "+target.name) ;
             } 
             deleteGraph(action) ;
             action.commit() ;
         }
         finally { action.endWrite() ; }
-        ActionSPARQL.successNoContent(action) ;
+        ServletOps.successNoContent(action) ;
     }
 
     @Override
@@ -85,10 +75,10 @@ public class SPARQL_REST_RW extends SPAR
     private void doPutPost(HttpAction action, boolean overwrite) {
         ContentType ct = FusekiLib.getContentType(action) ;
         if ( ct == null )
-            errorBadRequest("No Content-Type:") ;
+            ServletOps.errorBadRequest("No Content-Type:") ;
 
         if ( WebContent.contentTypeMultiMixed.equals(ct.getContentType()) ) {
-            error(HttpSC.UNSUPPORTED_MEDIA_TYPE_415, "multipart/mixed not supported") ;
+            ServletOps.error(HttpSC.UNSUPPORTED_MEDIA_TYPE_415, "multipart/mixed not supported") ;
         }
         
         boolean existedBefore = false ;
@@ -98,9 +88,9 @@ public class SPARQL_REST_RW extends SPAR
             existedBefore = addDataIntoNonTxn(action, overwrite) ;
             
         if ( existedBefore )
-            successNoContent(action) ;
+            ServletOps.successNoContent(action) ;
         else
-            successCreated(action) ;
+            ServletOps.successCreated(action) ;
     }
 
     /** Directly add data in a transaction.
@@ -122,27 +112,24 @@ public class SPARQL_REST_RW extends SPAR
             if ( overwrite && existedBefore )
                 clearGraph(target) ;
             StreamRDF sink = StreamRDFLib.graph(g) ;
-            incomingData(action, sink);
+            Upload.incomingData(action, sink, true);
             action.commit() ;
             return existedBefore ;
         } catch (RiotException ex) { 
             // Parse error
             action.abort() ;
-            errorBadRequest(ex.getMessage()) ;
+            ServletOps.errorBadRequest(ex.getMessage()) ;
             return existedBefore ;
         } catch (Exception ex) {
             // Something else went wrong.  Backout.
             action.abort() ;
-            errorOccurred(ex.getMessage()) ;
+            ServletOps.errorOccurred(ex.getMessage()) ;
             return existedBefore ;
         } finally {
             action.endWrite() ;
         }
     }
     
-    
-    
-
     /** Add data where the destination does not support full transactions.
      *  In particular, with no abort, and actions probably going to the real storage
      *  parse errors can lead to partial updates.  Instead, parse to a temporary
@@ -156,9 +143,9 @@ public class SPARQL_REST_RW extends SPAR
         Graph graphTmp = GraphFactory.createGraphMem() ;
         StreamRDF dest = StreamRDFLib.graph(graphTmp) ;
 
-        try { incomingData(action, dest); }
+        try { Upload.incomingData(action, dest, true); }
         catch (RiotException ex) {
-            errorBadRequest(ex.getMessage()) ;
+            ServletOps.errorBadRequest(ex.getMessage()) ;
             return false ;
         }
         // Now insert into dataset
@@ -180,83 +167,11 @@ public class SPARQL_REST_RW extends SPAR
             // We're in the non-transactional branch, this probably will not work
             // but it might and there is no harm safely trying. 
             try { action.abort() ; } catch (Exception ex2) {} 
-            errorOccurred(ex.getMessage()) ;
+            ServletOps.errorOccurred(ex.getMessage()) ;
             return existedBefore ;            
         } finally { action.endWrite() ; }
     }
     
-     private static void uploadNonTxn(HttpAction action, String base) {
-         DatasetGraph dsg = DatasetGraphFactory.createMem() ;
-         // Need temporary destination
-         action.beginWrite() ;
-         try {
-             Target target = determineTarget(action) ;
-             boolean isGraph = (target == null) ;
-             // Load quads or triples.
-             // Caution: if a target graph is given and then a quads format found,
-             // the default graph of the quad steram is sent to the target graph.
-             Target target1 = Target.retarget(target, dsg) ;
-             StreamRDF dest = 
-                 (target == null) 
-                 ? StreamRDFLib.dataset(target1.dsg)
-                 : StreamRDFLib.graph(target1.graph()) ; 
-             
-             fileUploadWorker(action, dest, isGraph) ;
-         
-             // Copy temp dsg to target.dsg - hopefuly, nothing can go wrong.
-             FusekiLib.addDataInto(dsg, target.dsg);
-             action.commit() ;
-             success(action) ;
-         } catch (Exception ex) {
-             // Something else went wrong.  Try to backout (unlikely).
-             try { action.abort() ; } catch (Exception ex2) {} 
-             errorOccurred(ex.getMessage()) ;
-             return ;
-         } finally {
-             action.endWrite() ;
-         } 
-     }
-    
-    private static void incomingData(HttpAction action, StreamRDF dest) {
-        ContentType ct = FusekiLib.getContentType(action) ;
-         
-        if ( WebContent.contentTypeMultiFormData.equalsIgnoreCase(ct.getContentType()) ) 
-        {
-            boolean isGraph = true ;    // Only for the tripels/quads logging.
-            fileUploadWorker(action, dest, isGraph) ;
-            return ;
-        }
-//        else
-//            incomingDataGraphBody(action, ct, dest) ;
-//    }
-//        
-//    private static void incomingDataGraphBody(HttpAction action, ContentType ct, StreamRDF dest) {
-        
-        String base = wholeRequestURL(action.request) ; // XXX Actually wrong?!
-        Lang lang = RDFLanguages.contentTypeToLang(ct.getContentType()) ;
-        if ( lang == null ) {
-            errorBadRequest("Unknown content type for triples: " + ct) ;
-            return ;
-        }
-        InputStream input = null ;
-        try { input = action.request.getInputStream() ; } 
-        catch (IOException ex) { IO.exception(ex) ; }
-    
-        int len = action.request.getContentLength() ;
-        if ( action.verbose ) {
-            if ( len >= 0 )
-                action.log.info(format("[%d]   Body: Content-Length=%d, Content-Type=%s, Charset=%s => %s", action.id, len,
-                                ct.getContentType(), ct.getCharset(), lang.getName())) ;
-            else
-                action.log.info(format("[%d]   Body: Content-Type=%s, Charset=%s => %s", action.id, ct.getContentType(),
-                                ct.getCharset(), lang.getName())) ;
-        }
-    
-        ActionSPARQL.parse(action, dest, input, lang, base) ;
-    }
-    
-    // XXX Tests for file upload.
-    
     protected static void deleteGraph(HttpAction action) {
         Target target = determineTarget(action) ;
         if ( target.isDefault )