Refactor to make the HttpAction objects and servlets independent of J…

…etty.

An indirect dependency existed for HttpAction on SPARQLServer.
Refactoring is a step towards JENA-201 (Deliver Fuseki as a WAR file).

git-svn-id: https://svn.apache.org/repos/asf/jena/trunk@1517341 13f79535-47bb-0310-9956-ffa450edef68

jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java

@@ -114,6 +114,9 @@ private static Metadata initMetadata()
     /** Instance of log for config server message s*/
     public static final Logger configLog        = LoggerFactory.getLogger(configLogName) ;
 
+    /** Instance of log for config server message s*/
+    public static boolean verboseLogging        = false ;
+
     /** An instance of management for stream opening, including redirecting through a 
      * location mapper whereby a name (e.g. URL) is redirected to another name (e.g. local file).
      * */

jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java

@@ -72,7 +72,6 @@ public class SPARQLServer {
     private ServerConfig        serverConfig ;
 
     private Server              server         = null ;
-    public static boolean       verboseLogging = false ;
     private static List<String> epDataset      = Arrays.asList("*") ;
 
     /**
@@ -83,7 +82,8 @@ public class SPARQLServer {
      */
     public SPARQLServer(ServerConfig config) {
         this.serverConfig = config ;
-        verboseLogging = config.verboseLogging ;
+        // Currently server-wide.
+        Fuseki.verboseLogging = config.verboseLogging ;
 
         // GZip compression
         // Note that regardless of this setting we'll always leave it turned off

jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java

@@ -99,13 +99,12 @@ protected void doCommon(HttpServletRequest request, HttpServletResponse response
         }
     }
 
-
     // ---- Operation lifecycle
 
     /** Return a fresh WebAction for this request */
     protected HttpAction allocHttpAction(long id, HttpServletRequest request, HttpServletResponse response) {
         // Need a way to set verbose logging on a per servlet and per request basis. 
-        return new HttpAction(id, request, response, SPARQLServer.verboseLogging ) ;
+        return new HttpAction(id, request, response, verboseLogging) ;
     }
 
     protected abstract void validate(HttpAction action) ;
@@ -309,15 +308,9 @@ protected String mapRequestToDataset(String uri)
         }
 
         return uri.substring(0, i) ;
-    }    /** Find the dataset name even if direct naming */ 
-    protected static String findTrailing(String uri, String dsname) 
-    {
-        if ( dsname.length() >= uri.length() )
-            return "" ;
-        return uri.substring(dsname.length()+1) ;   // Skip the separating "/"
     }
 
-    protected static String mapRequestToService(DatasetRef dsRef, String uri, String serviceName)
+    protected String mapRequestToService(DatasetRef dsRef, String uri, String serviceName)
     {
         if ( dsRef == null )
             return "" ;

jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java

@@ -304,7 +304,7 @@ private boolean serviceDispatch(HttpAction action, ServiceRef service, String sr
     }
 
     /** Find the graph (direct naming) or service name */ 
-    protected static String findTrailing(String uri, String dsname) 
+    protected String findTrailing(String uri, String dsname) 
     {
         if ( dsname.length() >= uri.length() )
             return "" ;
@@ -334,6 +334,5 @@ protected void doPut(HttpServletRequest request, HttpServletResponse response)
     @Override
     protected void doDelete(HttpServletRequest request, HttpServletResponse response)
     { doCommon(request, response) ; }
-
 }
 

jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java

@@ -35,6 +35,7 @@
 public abstract class ServletBase extends HttpServlet
 {
     protected static final Logger log = Fuseki.requestLog ;
+    public final boolean verboseLogging = Fuseki.verboseLogging ;
     private static AtomicLong requestIdAlloc = new AtomicLong(0) ;
 
     protected ServletBase()     { }