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/08/25 19:11:07 UTC
svn commit: r1517341 - in
/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki: Fuseki.java
server/SPARQLServer.java servlets/SPARQL_ServletBase.java
servlets/SPARQL_UberServlet.java servlets/ServletBase.java
Author: andy
Date: Sun Aug 25 17:11:06 2013
New Revision: 1517341
URL: http://svn.apache.org/r1517341
Log:
Refactor to make the HttpAction objects and servlets independent of Jetty.
An indirect dependency existed for HttpAction on SPARQLServer.
Refactoring is a step towards JENA-201 (Deliver Fuseki as a WAR file).
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java
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_ServletBase.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java?rev=1517341&r1=1517340&r2=1517341&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java Sun Aug 25 17:11:06 2013
@@ -114,6 +114,9 @@ public class Fuseki
/** 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).
* */
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=1517341&r1=1517340&r2=1517341&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 Sun Aug 25 17:11:06 2013
@@ -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
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java?rev=1517341&r1=1517340&r2=1517341&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java Sun Aug 25 17:11:06 2013
@@ -99,13 +99,12 @@ public abstract class SPARQL_ServletBase
}
}
-
// ---- 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 @@ public abstract class SPARQL_ServletBase
}
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 "" ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java?rev=1517341&r1=1517340&r2=1517341&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java Sun Aug 25 17:11:06 2013
@@ -304,7 +304,7 @@ public abstract class SPARQL_UberServlet
}
/** 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 @@ public abstract class SPARQL_UberServlet
@Override
protected void doDelete(HttpServletRequest request, HttpServletResponse response)
{ doCommon(request, response) ; }
-
}
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java?rev=1517341&r1=1517340&r2=1517341&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java Sun Aug 25 17:11:06 2013
@@ -35,6 +35,7 @@ import org.slf4j.Logger ;
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() { }