Author: andy
Date: Sat Jul 27 15:51:33 2013
New Revision: 1507674
URL: http://svn.apache.org/r1507674
Log:
Take out 'verbose' flag from each servlet; use a global default.
The flag should be set on a per-action basis (inc JMX)
or from the dataset context.
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.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/HttpAction.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.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/SPARQL_Update.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.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/mgt/ActionBackup.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java?rev=1507674&r1=1507673&r2=1507674&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
Sat Jul 27 15:51:33 2013
@@ -47,10 +47,7 @@ import com.hp.hpl.jena.sparql.util.Utils
public class ActionBackup extends ServletBase
{
- public ActionBackup()
- {
- super(false) ;
- }
+ public ActionBackup() { super() ; }
// Limit to one backup at a time.
public static final ExecutorService backupService =
Executors.newFixedThreadPool(1) ;
@@ -83,7 +80,6 @@ public class ActionBackup extends Servle
response.sendError(HttpSC.BAD_REQUEST_400, "No such dataset: " +
dataset) ;
return ;
}
-
long id = allocRequestId(request, response);
HttpAction action = new HttpAction(id, request, response, false) ;
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java?rev=1507674&r1=1507673&r2=1507674&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
Sat Jul 27 15:51:33 2013
@@ -109,6 +109,7 @@ public class FusekiConfig
config.jettyConfigFile = null ;
config.pages = Fuseki.PagesStatic ;
config.enableCompression = true ;
+ config.verboseLogging = false ;
return config ;
}
@@ -156,6 +157,7 @@ public class FusekiConfig
config.jettyConfigFile = null ;
config.pages = Fuseki.PagesStatic ;
config.enableCompression = true ;
+ config.verboseLogging = false ;
return config ;
}
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=1507674&r1=1507673&r2=1507674&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
Sat Jul 27 15:51:33 2013
@@ -71,11 +71,9 @@ public class SPARQLServer {
private ServerConfig serverConfig ;
private Server server = null ;
- private boolean verboseLogging = false ;
+ public static boolean verboseLogging = false ;
private static List<String> epDataset = Arrays.asList("*") ;
- // private static int ThreadPoolSize = 100 ;
-
/**
* Default constructor which requires a {@link
org.apache.jena.fuseki.server.ServerConfig}
* object as input. We use this config to specify (verbose) logging,
enable compression
@@ -300,12 +298,12 @@ public class SPARQLServer {
DatasetRegistry.get().put(datasetPath, dsDesc) ;
serverLog.info(format("Dataset path = %s", datasetPath)) ;
- HttpServlet sparqlQuery = new SPARQL_QueryDataset(verboseLogging) ;
- HttpServlet sparqlUpdate = new SPARQL_Update(verboseLogging) ;
- HttpServlet sparqlUpload = new SPARQL_Upload(verboseLogging) ;
- HttpServlet sparqlHttpR = new SPARQL_REST_R(verboseLogging) ;
- HttpServlet sparqlHttpRW = new SPARQL_REST_RW(verboseLogging) ;
- HttpServlet sparqlDataset = new
SPARQL_UberServlet.AccessByConfig(verboseLogging) ;
+ HttpServlet sparqlQuery = new SPARQL_QueryDataset() ;
+ HttpServlet sparqlUpdate = new SPARQL_Update() ;
+ HttpServlet sparqlUpload = new SPARQL_Upload() ;
+ HttpServlet sparqlHttpR = new SPARQL_REST_R() ;
+ HttpServlet sparqlHttpRW = new SPARQL_REST_RW() ;
+ HttpServlet sparqlDataset = new SPARQL_UberServlet.AccessByConfig() ;
if ( !überServlet ) {
// If uberserver, these are unnecessary but can be used.
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java?rev=1507674&r1=1507673&r2=1507674&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
Sat Jul 27 15:51:33 2013
@@ -35,7 +35,6 @@ import org.apache.jena.fuseki.server.Dat
import org.apache.jena.fuseki.server.ServiceRef ;
import com.hp.hpl.jena.query.ReadWrite ;
-import com.hp.hpl.jena.shared.Lock ;
import com.hp.hpl.jena.sparql.SystemARQ ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphWithLock ;
@@ -76,47 +75,27 @@ public class HttpAction
public HttpServletRequest request;
public HttpServletResponseTracker response ;
-
-
-// // ---- Concurrency checking.
-// private static Map<Lock, ConcurrencyPolicyMRSW> lockCounters = new
HashMap<Lock, ConcurrencyPolicyMRSW>() ;
-// private static ConcurrencyPolicyMRSW getConcurrencyPolicy(Lock lock)
-// {
-// synchronized(lockCounters)
-// {
-// ConcurrencyPolicyMRSW x = lockCounters.get(lock) ;
-// if ( x == null )
-// {
-// x = new ConcurrencyPolicyMRSW() ;
-// lockCounters.put(lock, x) ;
-// }
-// return x ;
-// }
-// }
-
- public HttpAction(long id, HttpServletRequest request, HttpServletResponse
response, boolean verbose)
- {
+ public HttpAction(long id, HttpServletRequest request, HttpServletResponse
response, boolean verbose) {
this.id = id ;
this.request = request ;
this.response = new HttpServletResponseTracker(this, response) ;
+ // Should this be set when setDataset is called from the dataset
context?
+ // Currently server-wide, e.g. from the command line.
this.verbose = verbose ;
}
- public void setDataset(DatasetRef desc)
- {
+ public void setDataset(DatasetRef desc) {
this.dsRef = desc ;
this.dsg = desc.dataset ;
- if ( dsg instanceof Transactional )
- {
+ if ( dsg instanceof Transactional ) {
transactional = (Transactional)dsg ;
isTransactional = true ;
- }
- else
- {
- // Non-transactional - wrap in something that does locking to give
the same
+ } else {
+ // Non-transactional - wrap in something that does locking to give
+ // the same
// functionality in the absense of errors, with less concurrency.
- DatasetGraphWithLock dsglock = new DatasetGraphWithLock(dsg) ;
+ DatasetGraphWithLock dsglock = new DatasetGraphWithLock(dsg) ;
transactional = dsglock ;
isTransactional = false ;
dsg = dsglock ;
@@ -130,62 +109,57 @@ public class HttpAction
/**
* Returns whether or not the underlying DatasetGraph is fully
transactional (supports rollback)
*/
- public boolean isTransactional()
- {
- return isTransactional;
+ public boolean isTransactional() {
+ return isTransactional ;
}
-
- public void beginRead()
- {
+
+ public void beginRead() {
activeMode = READ ;
transactional.begin(READ) ;
activeDSG = dsg ;
dsRef.startTxn(READ) ;
}
- public void endRead()
- {
+ public void endRead() {
dsRef.finishTxn(READ) ;
activeMode = null ;
transactional.end() ;
activeDSG = null ;
}
- public void beginWrite()
- {
+ public void beginWrite() {
transactional.begin(WRITE) ;
activeMode = WRITE ;
activeDSG = dsg ;
dsRef.startTxn(WRITE) ;
}
- public void commit()
- {
+ public void commit() {
transactional.commit() ;
activeDSG = null ;
}
- public void abort()
- {
+ public void abort() {
transactional.abort() ;
activeDSG = null ;
}
- public void endWrite()
- {
+ public void endWrite() {
dsRef.finishTxn(WRITE) ;
activeMode = null ;
- if (transactional.isInTransaction())
- {
+ if ( transactional.isInTransaction() ) {
Log.warn(this, "Transaction still active in endWriter - no commit
or abort seen (forced abort)") ;
- try { transactional.abort() ; }
- catch (RuntimeException ex) { Log.warn(this, "Exception in forced
abort (trying to continue)", ex) ;}
+ try {
+ transactional.abort() ;
+ } catch (RuntimeException ex) {
+ Log.warn(this, "Exception in forced abort (trying to
continue)", ex) ;
+ }
}
transactional.end() ;
activeDSG = null ;
}
-
+
public final DatasetGraph getActiveDSG() {
return activeDSG ;
}
@@ -193,10 +167,9 @@ public class HttpAction
public final DatasetRef getDatasetRef() {
return dsRef ;
}
-
- /** Reduce to a size that can be kept around for sometime */
- public void minimize()
- {
+
+ /** Reduce to a size that can be kept around for sometime */
+ public void minimize() {
this.request = null ;
this.response = null ;
}
@@ -214,15 +187,11 @@ public class HttpAction
finishTimeIsSet = true ;
this.finishTime = System.nanoTime() ;
}
-
-// public Map <String, String> getHeaders() { return headers ; }
-//
-// public HttpServletRequest getRequest() { return request ; }
-//
-// public HttpServletResponseTracker getResponse() { return response ; }
-
+ public HttpServletRequest getRequest() { return request ; }
+ public HttpServletResponseTracker getResponse() { return response ; }
+
/** Return the recorded time taken in milliseconds.
* {@linkplain #setStartTime} and {@linkplain #setFinishTime}
* must have been called.
@@ -236,51 +205,22 @@ public class HttpAction
return (finishTime-startTime)/(1000*1000) ;
}
-
-// // External, additional lock.
-// private void enter(DatasetGraph dsg, Lock lock, boolean readLock)
-// {
-// if ( lock == null && dsg == null )
-// return ;
-// if ( lock == null )
-// lock = dsg.getLock() ;
-// if ( lock == null )
-// return ;
-// lock.enterCriticalSection(readLock) ;
-// }
-
- private void leave(DatasetGraph dsg, Lock lock, boolean readLock)
- {
- if ( lock == null && dsg == null )
- return ;
-
- if ( lock == null )
- lock = dsg.getLock() ;
- if ( lock == null )
- return ;
- lock.leaveCriticalSection() ;
- }
-
- public void sync()
- {
+ public void sync() {
SystemARQ.sync(dsg) ;
}
-
- public static MediaType contentNegotationRDF(HttpAction action)
- {
+
+ public static MediaType contentNegotationRDF(HttpAction action) {
MediaType mt = ConNeg.chooseContentType(action.request, DEF.rdfOffer,
DEF.acceptRDFXML) ;
if ( mt == null )
return null ;
if ( mt.getContentType() != null )
- action.response.setContentType(mt.getContentType());
+ action.response.setContentType(mt.getContentType()) ;
if ( mt.getCharset() != null )
- action.response.setCharacterEncoding(mt.getCharset()) ;
+ action.response.setCharacterEncoding(mt.getCharset()) ;
return mt ;
}
-
- public static MediaType contentNegotationQuads(HttpAction action)
- {
+
+ public static MediaType contentNegotationQuads(HttpAction action) {
return ConNeg.chooseContentType(action.request, DEF.quadsOffer,
DEF.acceptNQuads) ;
}
-
}
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java?rev=1507674&r1=1507673&r2=1507674&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
Sat Jul 27 15:51:33 2013
@@ -44,8 +44,7 @@ import com.hp.hpl.jena.sparql.core.Datas
public class REST_Quads extends SPARQL_REST
{
- public REST_Quads(boolean verbose)
- { super(verbose) ; }
+ public REST_Quads() { super(); }
@Override
protected void validate(HttpAction action)
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java?rev=1507674&r1=1507673&r2=1507674&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java
Sat Jul 27 15:51:33 2013
@@ -39,10 +39,7 @@ import com.hp.hpl.jena.sparql.core.Datas
*/
public abstract class SPARQL_Protocol extends SPARQL_ServletBase
{
- protected SPARQL_Protocol(boolean verbose_debug)
- {
- super(verbose_debug) ;
- }
+ protected SPARQL_Protocol() { super() ; }
protected static String messageForQPE(QueryParseException ex)
{
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java?rev=1507674&r1=1507673&r2=1507674&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
Sat Jul 27 15:51:33 2013
@@ -46,12 +46,7 @@ import com.hp.hpl.jena.sparql.resultset.
public abstract class SPARQL_Query extends SPARQL_Protocol
{
- public SPARQL_Query(boolean verbose)
- { super(verbose) ; }
-
-
- public SPARQL_Query()
- { this(false) ; }
+ public SPARQL_Query() { super() ; }
// Choose REST verbs to support.
@@ -212,7 +207,7 @@ public abstract class SPARQL_Query exten
private void execute(String queryString, HttpAction action)
{
String queryStringLog = formatForLog(queryString) ;
- if ( super.verbose_debug || action.verbose )
+ if ( action.verbose )
log.info(format("[%d] Query = \n%s", action.id, queryString));
else
log.info(format("[%d] Query = %s", action.id, queryStringLog));
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java?rev=1507674&r1=1507673&r2=1507674&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java
Sat Jul 27 15:51:33 2013
@@ -27,8 +27,7 @@ import com.hp.hpl.jena.sparql.core.Dynam
public class SPARQL_QueryDataset extends SPARQL_Query
{
- public SPARQL_QueryDataset(boolean verbose)
- { super(verbose) ; }
+ public SPARQL_QueryDataset(boolean verbose) { super() ; }
public SPARQL_QueryDataset()
{ this(false) ; }
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java?rev=1507674&r1=1507673&r2=1507674&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java
Sat Jul 27 15:51:33 2013
@@ -37,13 +37,7 @@ public class SPARQL_QueryGeneral extends
{
final static int MaxTriples = 100*1000 ;
- public SPARQL_QueryGeneral(boolean verbose)
- {
- super(verbose) ;
- }
-
- public SPARQL_QueryGeneral()
- { this(false) ; }
+ public SPARQL_QueryGeneral() { super() ; }
@Override
protected void validateRequest(HttpAction action) {}
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java?rev=1507674&r1=1507673&r2=1507674&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
Sat Jul 27 15:51:33 2013
@@ -171,11 +171,8 @@ public abstract class SPARQL_REST extend
}
}
- public SPARQL_REST(boolean verbose)
- { super(verbose) ; }
-
public SPARQL_REST()
- { this(false) ; }
+ { super() ; }
@Override
protected void service(HttpServletRequest request, HttpServletResponse
response) throws ServletException, IOException {
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java?rev=1507674&r1=1507673&r2=1507674&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
Sat Jul 27 15:51:33 2013
@@ -36,11 +36,8 @@ import com.hp.hpl.jena.rdf.model.ModelFa
/** Only the READ operations */
public class SPARQL_REST_R extends SPARQL_REST
{
- public SPARQL_REST_R(boolean verbose)
- { super(verbose) ; }
-
public SPARQL_REST_R()
- { this(false) ; }
+ { super() ; }
@Override
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java?rev=1507674&r1=1507673&r2=1507674&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java
Sat Jul 27 15:51:33 2013
@@ -25,11 +25,8 @@ import com.hp.hpl.jena.sparql.core.Datas
/** The WRITE operations added to the READ operations */
public class SPARQL_REST_RW extends SPARQL_REST_R
{
- public SPARQL_REST_RW(boolean verbose)
- { super(verbose) ; }
-
public SPARQL_REST_RW()
- { this(false) ; }
+ { super() ; }
@Override
protected void doOptions(HttpAction action)
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=1507674&r1=1507673&r2=1507674&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
Sat Jul 27 15:51:33 2013
@@ -48,11 +48,7 @@ public abstract class SPARQL_ServletBase
{
private static DatasetGraph dummyDSG = new
DatasetGraphReadOnly(DatasetGraphFactory.createMemFixed()) ;
- protected SPARQL_ServletBase(boolean verbose_debug)
- {
- super(verbose_debug) ;
- //this.queryStringHandling = noQueryStringIsOK ;
- }
+ protected SPARQL_ServletBase() { super() ; }
// Common framework for handling HTTP requests
protected void doCommon(HttpServletRequest request, HttpServletResponse
response)
@@ -108,10 +104,10 @@ public abstract class SPARQL_ServletBase
/** Return a fresh WebAction for this request */
protected HttpAction allocHttpAction(long id, HttpServletRequest request,
HttpServletResponse response) {
- return new HttpAction(id, request, response, verbose_debug) ;
+ // Need a way to set verbose logging on a per servlet and per request
basis.
+ return new HttpAction(id, request, response,
SPARQLServer.verboseLogging ) ;
}
-
protected abstract void validate(HttpAction action) ;
protected abstract void perform(HttpAction action) ;
@@ -229,7 +225,7 @@ public abstract class SPARQL_ServletBase
String method = action.request.getMethod() ;
log.info(format("[%d] %s %s", action.id, method, url)) ;
- if (verbose_debug) {
+ if ( action.verbose ) {
Enumeration<String> en = action.request.getHeaderNames() ;
for (; en.hasMoreElements();) {
String h = en.nextElement() ;
@@ -258,7 +254,7 @@ public abstract class SPARQL_ServletBase
long time = action.getTime() ;
HttpServletResponseTracker response = action.response ;
- if ( verbose_debug )
+ if ( action.verbose )
{
if ( action.contentType != null )
log.info(format("[%d] %-20s %s", action.id,
HttpNames.hContentType, action.contentType)) ;
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=1507674&r1=1507673&r2=1507674&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
Sat Jul 27 15:51:33 2013
@@ -49,7 +49,7 @@ public abstract class SPARQL_UberServlet
public static class ReadOnly extends SPARQL_UberServlet
{
- public ReadOnly(boolean verbose_debug) { super(verbose_debug) ; }
+ public ReadOnly() { super() ; }
@Override protected boolean allowQuery(HttpAction action) { return
true ; }
@Override protected boolean allowUpdate(HttpAction action) { return
false ; }
@Override protected boolean allowREST_R(HttpAction action) { return
true ; }
@@ -60,7 +60,7 @@ public abstract class SPARQL_UberServlet
public static class ReadWrite extends SPARQL_UberServlet
{
- public ReadWrite(boolean verbose_debug) { super(verbose_debug) ; }
+ public ReadWrite() { super() ; }
@Override protected boolean allowQuery(HttpAction action) { return
true ; }
@Override protected boolean allowUpdate(HttpAction action) { return
true ; }
@Override protected boolean allowREST_R(HttpAction action) { return
true ; }
@@ -71,7 +71,7 @@ public abstract class SPARQL_UberServlet
public static class AccessByConfig extends SPARQL_UberServlet
{
- public AccessByConfig(boolean verbose_debug) { super(verbose_debug) ; }
+ public AccessByConfig() { super() ; }
@Override protected boolean allowQuery(HttpAction action) { return
isEnabled(action.dsRef.query) ; }
@Override protected boolean allowUpdate(HttpAction action) { return
isEnabled(action.dsRef.update) ; }
@Override protected boolean allowREST_R(HttpAction action) { return
isEnabled(action.dsRef.readGraphStore) || allowREST_W(action); }
@@ -92,17 +92,14 @@ public abstract class SPARQL_UberServlet
// Refactor? Extract the direct naming handling.
// To test: enable in SPARQLServer.configureOneDataset
- private final SPARQL_ServletBase queryServlet = new
SPARQL_QueryDataset(verbose_debug) ;
- private final SPARQL_ServletBase updateServlet = new
SPARQL_Update(verbose_debug) ;
- private final SPARQL_ServletBase uploadServlet = new
SPARQL_Upload(verbose_debug) ;
- private final SPARQL_REST restServlet_RW = new
SPARQL_REST_RW(verbose_debug) ;
- private final SPARQL_REST restServlet_R = new
SPARQL_REST_R(verbose_debug) ;
- private final SPARQL_ServletBase restQuads = new
REST_Quads(verbose_debug) ;
+ private final SPARQL_ServletBase queryServlet = new
SPARQL_QueryDataset() ;
+ private final SPARQL_ServletBase updateServlet = new SPARQL_Update() ;
+ private final SPARQL_ServletBase uploadServlet = new SPARQL_Upload() ;
+ private final SPARQL_REST restServlet_RW = new SPARQL_REST_RW() ;
+ private final SPARQL_REST restServlet_R = new SPARQL_REST_R() ;
+ private final SPARQL_ServletBase restQuads = new REST_Quads() ;
- public SPARQL_UberServlet(boolean verbose_debug)
- {
- super(verbose_debug) ;
- }
+ public SPARQL_UberServlet() { super(); }
private String getEPName(String dsname, List<String> endpoints)
{
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java?rev=1507674&r1=1507673&r2=1507674&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
Sat Jul 27 15:51:33 2013
@@ -63,11 +63,8 @@ public class SPARQL_Update extends SPARQ
private static final String UpdateParseBase =
"http://example/update-base/"; ;
private static final IRIResolver resolver =
IRIResolver.create(UpdateParseBase) ;
- public SPARQL_Update(boolean verbose)
- { super(verbose) ; }
-
public SPARQL_Update()
- { this(false) ; }
+ { super() ; }
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse
response)
@@ -181,7 +178,7 @@ public class SPARQL_Update extends SPARQ
try { input = action.request.getInputStream() ; }
catch (IOException ex) { errorOccurred(ex) ; }
- if ( super.verbose_debug || action.verbose )
+ if ( action.verbose )
{
// Verbose mode only .... capture request for logging (does not
scale).
String requestStr = null ;
@@ -203,7 +200,7 @@ public class SPARQL_Update extends SPARQ
if ( requestStr == null )
requestStr = action.request.getParameter(paramRequest) ;
- if ( super.verbose_debug || action.verbose )
+ if ( action.verbose )
//requestLog.info(format("[%d] Form update = %s", action.id,
formatForLog(requestStr))) ;
requestLog.info(format("[%d] Form update = \n%s", action.id,
requestStr)) ;
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java?rev=1507674&r1=1507673&r2=1507674&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
Sat Jul 27 15:51:33 2013
@@ -50,9 +50,8 @@ public class SPARQL_Upload extends SPARQ
{
private static ErrorHandler errorHandler =
ErrorHandlerFactory.errorHandlerStd(log) ;
- public SPARQL_Upload(boolean verbose_debug)
- {
- super(verbose_debug) ;
+ public SPARQL_Upload() {
+ super() ;
}
// Methods to respond to.
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=1507674&r1=1507673&r2=1507674&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
Sat Jul 27 15:51:33 2013
@@ -36,12 +36,8 @@ public abstract class ServletBase extend
{
protected static final Logger log = Fuseki.requestLog ;
private static AtomicLong requestIdAlloc = new AtomicLong(0) ;
- protected final boolean verbose_debug ;
- protected ServletBase(boolean verbose_debug)
- {
- this.verbose_debug = verbose_debug ;
- }
+ protected ServletBase() { }
/**
* Helper method which gets a unique request ID and appends it as a header
to the response
