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 2011/06/15 15:09:43 UTC
svn commit: r1136022 - in /incubator/jena/Jena2/Fuseki/trunk: ./
src/main/java/org/openjena/fuseki/ src/main/java/org/openjena/fuseki/server/
src/main/java/org/openjena/fuseki/servlets/
src/main/java/org/openjena/fuseki/validation/ src/test/java/org/op...
Author: andy
Date: Wed Jun 15 13:09:42 2011
New Revision: 1136022
URL: http://svn.apache.org/viewvc?rev=1136022&view=rev
Log:
Split logging into server and per-request loggers.
Modified:
incubator/jena/Jena2/Fuseki/trunk/ChangeLog.txt
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/Fuseki.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/ConcurrencyPolicyMRSW.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/ResponseQuery.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Query.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST_R.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_ServletBase.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Update.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Upload.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/validation/ValidatorBase.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/ServerTest.java
Modified: incubator/jena/Jena2/Fuseki/trunk/ChangeLog.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/ChangeLog.txt?rev=1136022&r1=1136021&r2=1136022&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/ChangeLog.txt (original)
+++ incubator/jena/Jena2/Fuseki/trunk/ChangeLog.txt Wed Jun 15 13:09:42 2011
@@ -2,6 +2,10 @@
== Version 1.0
+== 0.2.1
+
++ Split loggin into 2 loggers: general messages and per-request messages.
+ http://openjena.org/wiki/Fuseki#Logging
== 0.2.0
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/Fuseki.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/Fuseki.java?rev=1136022&r1=1136021&r2=1136022&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/Fuseki.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/Fuseki.java Wed Jun 15 13:09:42 2011
@@ -41,7 +41,10 @@ public class Fuseki
static public String BUILD_DATE = metadata.get(PATH+".build.datetime", "unknown") ; // call Date if unavailable.
public static String serverHttpName = NAME+" ("+VERSION+")" ;
- public static Logger serverlog = LoggerFactory.getLogger(PATH+".Fuseki") ;
+ // Log for operations
+ public static Logger requestLog = LoggerFactory.getLogger(PATH+".Fuseki") ;
+ // Log for general server messages.
+ public static Logger serverLog = LoggerFactory.getLogger(PATH+".Server") ;
private static boolean initialized = false ;
public static void init()
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java?rev=1136022&r1=1136021&r2=1136022&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java Wed Jun 15 13:09:42 2011
@@ -105,7 +105,7 @@ public class FusekiCmd extends CmdARQ
{
int x = 0 ;
- Logger log = Fuseki.serverlog ; //SPARQLServer.log ;
+ Logger log = Fuseki.serverLog ;
ArgDecl assemblerDescDecl = new ArgDecl(ArgDecl.HasValue, "desc", "dataset") ;
if ( contains(argMem) ) x++ ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java?rev=1136022&r1=1136021&r2=1136022&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java Wed Jun 15 13:09:42 2011
@@ -7,7 +7,7 @@
package org.openjena.fuseki.server;
import static java.lang.String.format ;
-import static org.openjena.fuseki.Fuseki.serverlog ;
+import static org.openjena.fuseki.Fuseki.serverLog ;
import javax.servlet.http.HttpServlet ;
@@ -65,11 +65,11 @@ public class SPARQLServer
public void start()
{
String now = Utils.nowAsString() ;
- serverlog.info(format("%s %s", Fuseki.NAME, Fuseki.VERSION)) ;
+ serverLog.info(format("%s %s", Fuseki.NAME, Fuseki.VERSION)) ;
String jettyVersion = org.eclipse.jetty.server.Server.getVersion() ;
- serverlog.info(format("Jetty %s",jettyVersion)) ;
- serverlog.info(format("Dataset = %s", datasetPath)) ;
- serverlog.info(format("Started %s on port %d", now, server.getConnectors()[0].getPort())) ;
+ serverLog.info(format("Jetty %s",jettyVersion)) ;
+ serverLog.info(format("Dataset = %s", datasetPath)) ;
+ serverLog.info(format("Started %s on port %d", now, server.getConnectors()[0].getPort())) ;
try { server.start() ; }
catch (Exception ex)
@@ -81,10 +81,10 @@ public class SPARQLServer
public void stop()
{
String now = Utils.nowAsString() ;
- serverlog.info(format("Stopped %s on port %d", now, server.getConnectors()[0].getPort())) ;
+ serverLog.info(format("Stopped %s on port %d", now, server.getConnectors()[0].getPort())) ;
try { server.stop() ; }
catch (Exception ex)
- { Fuseki.serverlog.warn("SPARQLServer: Exception while stopping server: " + ex.getMessage(), ex) ; }
+ { Fuseki.serverLog.warn("SPARQLServer: Exception while stopping server: " + ex.getMessage(), ex) ; }
}
public Server getServer() { return server ; }
@@ -140,7 +140,7 @@ public class SPARQLServer
if ( enableUpdate )
installManager = true ;
- serverlog.info(enableUpdate ? "Update enabled" : "Read-only server") ;
+ serverLog.info(enableUpdate ? "Update enabled" : "Read-only server") ;
// Set the max form size much higher.
context.setMaxFormContentSize(1*1024*1024) ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/ConcurrencyPolicyMRSW.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/ConcurrencyPolicyMRSW.java?rev=1136022&r1=1136021&r2=1136022&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/ConcurrencyPolicyMRSW.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/ConcurrencyPolicyMRSW.java Wed Jun 15 13:09:42 2011
@@ -14,7 +14,7 @@ import org.slf4j.Logger ;
public final class ConcurrencyPolicyMRSW
{
- static private Logger log = Fuseki.serverlog ; //org.slf4j.LoggerFactory.getLogger(ConcurrencyPolicyMRSW.class) ;
+ static private Logger log = Fuseki.requestLog ; //org.slf4j.LoggerFactory.getLogger(ConcurrencyPolicyMRSW.class) ;
static private final boolean logging = false ; //log.isDebugEnabled() ;
// This is a simplified version of ConcurrencyPolicyMRSW from TDB.
@@ -31,14 +31,14 @@ public final class ConcurrencyPolicyMRSW
public void startRead()
{
readCounter.getAndIncrement() ;
- if ( logging ) log() ;
+ log() ;
checkConcurrency() ;
}
//@Override
public void finishRead()
{
- if ( logging ) log() ;
+ log() ;
readCounter.decrementAndGet() ;
checkConcurrency() ;
}
@@ -47,14 +47,14 @@ public final class ConcurrencyPolicyMRSW
public void startUpdate()
{
writeCounter.getAndIncrement() ;
- if ( logging ) log() ;
+ log() ;
checkConcurrency() ;
}
//@Override
public void finishUpdate()
{
- if ( logging ) log() ;
+ log() ;
writeCounter.decrementAndGet() ;
checkConcurrency() ;
}
@@ -70,8 +70,10 @@ public final class ConcurrencyPolicyMRSW
policyError(id, R, W) ;
}
- private synchronized void log()
+ private void log()
{
+ if ( ! logging )
+ return ;
long R , W , id ;
synchronized(this)
{
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/ResponseQuery.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/ResponseQuery.java?rev=1136022&r1=1136021&r2=1136022&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/ResponseQuery.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/ResponseQuery.java Wed Jun 15 13:09:42 2011
@@ -56,7 +56,7 @@ public class ResponseQuery
if ( mimeType == null )
{
- Fuseki.serverlog.warn("Can't find MIME type for response") ;
+ Fuseki.requestLog.warn("Can't find MIME type for response") ;
String x = request.getHeader("Accept") ;
String msg ;
if ( x == null )
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Query.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Query.java?rev=1136022&r1=1136021&r2=1136022&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Query.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Query.java Wed Jun 15 13:09:42 2011
@@ -7,7 +7,6 @@
package org.openjena.fuseki.servlets;
import static java.lang.String.format ;
-import static org.openjena.fuseki.Fuseki.serverlog ;
import static org.openjena.fuseki.HttpNames.paramQuery ;
import java.io.IOException ;
@@ -26,8 +25,6 @@ import org.openjena.fuseki.http.HttpSC ;
import org.openjena.fuseki.migrate.WebIO ;
import org.openjena.riot.ContentType ;
import org.openjena.riot.WebContent ;
-import org.slf4j.Logger ;
-import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.Query ;
@@ -43,8 +40,6 @@ import com.hp.hpl.jena.sparql.resultset.
public abstract class SPARQL_Query extends SPARQL_ServletBase
{
- private static Logger log = LoggerFactory.getLogger(SPARQL_Query.class) ;
-
protected class HttpActionQuery extends HttpAction {
public HttpActionQuery(long id, DatasetGraph dsg, HttpServletRequest request, HttpServletResponse response, boolean verbose)
{
@@ -216,7 +211,7 @@ public abstract class SPARQL_Query exten
private void execute(String queryString, HttpActionQuery action)
{
String queryStringLog = formatForLog(queryString) ;
- serverlog.info(format("[%d] Query = %s", action.id, queryString));
+ log.info(format("[%d] Query = %s", action.id, queryString));
Query query = null ;
try {
@@ -267,28 +262,28 @@ public abstract class SPARQL_Query exten
// // Not necessary if we are inside readlock under end of sending results.
// rs = ResultSetFactory.copyResults(rs) ;
- serverlog.info(format("[%d] OK/select", action.id)) ;
+ log.info(format("[%d] OK/select", action.id)) ;
return new SPARQLResult(rs) ;
}
if ( query.isConstructType() )
{
Model model = qexec.execConstruct() ;
- serverlog.info(format("[%d] OK/construct", action.id)) ;
+ log.info(format("[%d] OK/construct", action.id)) ;
return new SPARQLResult(model) ;
}
if ( query.isDescribeType() )
{
Model model = qexec.execDescribe() ;
- serverlog.info(format("[%d] OK/describe",action.id)) ;
+ log.info(format("[%d] OK/describe",action.id)) ;
return new SPARQLResult(model) ;
}
if ( query.isAskType() )
{
boolean b = qexec.execAsk() ;
- serverlog.info(format("[%d] OK/ask",action.id)) ;
+ log.info(format("[%d] OK/ask",action.id)) ;
return new SPARQLResult(b) ;
}
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST.java?rev=1136022&r1=1136021&r2=1136022&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST.java Wed Jun 15 13:09:42 2011
@@ -7,7 +7,6 @@
package org.openjena.fuseki.servlets;
import static java.lang.String.format ;
-import static org.openjena.fuseki.Fuseki.serverlog ;
import static org.openjena.fuseki.HttpNames.HEADER_LASTMOD ;
import static org.openjena.fuseki.HttpNames.METHOD_DELETE ;
import static org.openjena.fuseki.HttpNames.METHOD_GET ;
@@ -57,7 +56,7 @@ public abstract class SPARQL_REST extend
{
protected static Logger classLog = LoggerFactory.getLogger(SPARQL_REST.class) ;
- protected static ErrorHandler errorHandler = ErrorHandlerFactory.errorHandlerStd(serverlog) ;
+ protected static ErrorHandler errorHandler = ErrorHandlerFactory.errorHandlerStd(log) ;
class HttpActionREST extends HttpAction {
final Target target ;
@@ -283,7 +282,7 @@ public abstract class SPARQL_REST extend
{
if ( dest.isDefault )
errorOccurred("Dataset does not have a default graph") ;
- serverlog.info(format("[%d] Creating in-memory graph for <%s>", action.id, dest.graphName)) ;
+ log.info(format("[%d] Creating in-memory graph for <%s>", action.id, dest.graphName)) ;
// Not default graph.
// Not an autocreate dataset - create something.
g = GraphFactory.createDefaultGraph() ;
@@ -314,10 +313,10 @@ public abstract class SPARQL_REST extend
if ( action.verbose )
{
if ( len >= 0 )
- serverlog.info(format("[%d] Body: Content-Length=%d, Content-Type=%s, Charset=%s => %s",
+ log.info(format("[%d] Body: Content-Length=%d, Content-Type=%s, Charset=%s => %s",
action.id, len, ct.getContentType(), ct.getCharset(), lang.getName())) ;
else
- serverlog.info(format("[%d] Body: Content-Type=%s, Charset=%s => %s",
+ log.info(format("[%d] Body: Content-Type=%s, Charset=%s => %s",
action.id, ct.getContentType(), ct.getCharset(), lang.getName())) ;
}
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST_R.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST_R.java?rev=1136022&r1=1136021&r2=1136022&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST_R.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_REST_R.java Wed Jun 15 13:09:42 2011
@@ -7,7 +7,6 @@
package org.openjena.fuseki.servlets;
import static java.lang.String.format ;
-import static org.openjena.fuseki.Fuseki.serverlog ;
import java.io.IOException ;
@@ -47,7 +46,7 @@ public class SPARQL_REST_R extends SPARQ
Lang lang = FusekiLib.langFromContentType(mediaType.getContentType()) ;
if ( action.verbose )
- serverlog.info(format("[%d] Get: Content-Type=%s, Charset=%s => %s",
+ log.info(format("[%d] Get: Content-Type=%s, Charset=%s => %s",
action.id, mediaType.getContentType(), mediaType.getCharset(), lang.getName())) ;
action.beginRead() ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_ServletBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_ServletBase.java?rev=1136022&r1=1136021&r2=1136022&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_ServletBase.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_ServletBase.java Wed Jun 15 13:09:42 2011
@@ -7,7 +7,6 @@
package org.openjena.fuseki.servlets;
import static java.lang.String.format ;
-import static org.openjena.fuseki.Fuseki.serverlog ;
import java.io.IOException ;
import java.io.PrintWriter ;
@@ -24,11 +23,13 @@ import org.openjena.fuseki.Fuseki ;
import org.openjena.fuseki.HttpNames ;
import org.openjena.fuseki.http.HttpSC ;
import org.openjena.fuseki.server.DatasetRegistry ;
+import org.slf4j.Logger ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
public abstract class SPARQL_ServletBase extends HttpServlet
{
+ protected static final Logger log = Fuseki.requestLog ;
protected static AtomicLong requestIdAlloc = new AtomicLong(0) ;
private final PlainRequestFlag noQueryString ;
protected final boolean verbose_debug ;
@@ -114,7 +115,7 @@ public abstract class SPARQL_ServletBase
String url = wholeRequestURL(request) ;
String method = request.getMethod() ;
- serverlog.info(format("[%d] %s %s", id, method, url)) ;
+ log.info(format("[%d] %s %s", id, method, url)) ;
if ( verbose_debug )
{
@SuppressWarnings("unchecked")
@@ -125,11 +126,11 @@ public abstract class SPARQL_ServletBase
@SuppressWarnings("unchecked")
Enumeration<String> vals = request.getHeaders(h) ;
if ( ! vals.hasMoreElements() )
- serverlog.info(format("[%d] ",id, h)) ;
+ log.info(format("[%d] ",id, h)) ;
else
{
for ( ; vals.hasMoreElements() ; )
- serverlog.info(format("[%d] %-20s %s", id, h, vals.nextElement())) ;
+ log.info(format("[%d] %-20s %s", id, h, vals.nextElement())) ;
}
}
}
@@ -141,17 +142,17 @@ public abstract class SPARQL_ServletBase
if ( verbose_debug )
{
if ( response.contentType != null )
- serverlog.info(format("[%d] %-20s %s", id, HttpNames.hContentType, response.contentType)) ;
+ log.info(format("[%d] %-20s %s", id, HttpNames.hContentType, response.contentType)) ;
if ( response.contentLength != -1 )
- serverlog.info(format("[%d] %-20s %d", id, HttpNames.hContentLengh, response.contentLength)) ;
+ log.info(format("[%d] %-20s %d", id, HttpNames.hContentLengh, response.contentLength)) ;
for ( Map.Entry<String, String> e: response.headers.entrySet() )
- serverlog.info(format("[%d] %-20s %s", id, e.getKey(), e.getValue())) ;
+ log.info(format("[%d] %-20s %s", id, e.getKey(), e.getValue())) ;
}
if ( response.message == null )
- serverlog.info(String.format("[%d] %d %s", id, response.statusCode, HttpSC.getMessage(response.statusCode))) ;
+ log.info(String.format("[%d] %d %s", id, response.statusCode, HttpSC.getMessage(response.statusCode))) ;
else
- serverlog.info(String.format("[%d] %d %s", id, response.statusCode, response.message)) ;
+ log.info(String.format("[%d] %d %s", id, response.statusCode, response.message)) ;
}
private void responseSendError(HttpServletResponse response, int statusCode, String message)
@@ -249,12 +250,12 @@ public abstract class SPARQL_ServletBase
protected static void warning(String string)
{
- serverlog.warn(string) ;
+ log.warn(string) ;
}
protected static void warning(String string, Throwable thorwable)
{
- serverlog.warn(string, thorwable) ;
+ log.warn(string, thorwable) ;
}
protected static void errorBadRequest(String string)
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Update.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Update.java?rev=1136022&r1=1136021&r2=1136022&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Update.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Update.java Wed Jun 15 13:09:42 2011
@@ -7,7 +7,7 @@
package org.openjena.fuseki.servlets;
import static java.lang.String.format ;
-import static org.openjena.fuseki.Fuseki.serverlog ;
+import static org.openjena.fuseki.Fuseki.requestLog ;
import static org.openjena.fuseki.HttpNames.paramRequest ;
import static org.openjena.fuseki.HttpNames.paramUpdate ;
@@ -26,8 +26,6 @@ import org.openjena.fuseki.HttpNames ;
import org.openjena.fuseki.http.HttpSC ;
import org.openjena.riot.ContentType ;
import org.openjena.riot.WebContent ;
-import org.slf4j.Logger ;
-import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.query.QueryParseException ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
@@ -38,7 +36,6 @@ import com.hp.hpl.jena.update.UpdateRequ
public class SPARQL_Update extends SPARQL_ServletBase
{
- private static Logger log = LoggerFactory.getLogger(SPARQL_Update.class) ;
private static String updateParseBase = "http://example/base/" ;
private class HttpActionUpdate extends HttpAction {
@@ -190,7 +187,7 @@ public class SPARQL_Update extends SPARQ
byte[] b = IO.readWholeFile(input) ;
String requestStr = Bytes.bytes2string(b) ;
String requestStrLog = formatForLog(requestStr) ;
- serverlog.info(format("[%d] Update = %s", action.id, requestStrLog)) ;
+ requestLog.info(format("[%d] Update = %s", action.id, requestStrLog)) ;
req = UpdateFactory.create(requestStr) ;
}
else
@@ -209,7 +206,7 @@ public class SPARQL_Update extends SPARQ
requestStr = action.request.getParameter(paramRequest) ;
if ( action.verbose )
- serverlog.info(format("[%d] Form update = %s", action.id, formatForLog(requestStr))) ;
+ requestLog.info(format("[%d] Form update = %s", action.id, formatForLog(requestStr))) ;
UpdateRequest req ;
try {
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Upload.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Upload.java?rev=1136022&r1=1136021&r2=1136022&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Upload.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_Upload.java Wed Jun 15 13:09:42 2011
@@ -7,7 +7,6 @@
package org.openjena.fuseki.servlets;
import static java.lang.String.format ;
-import static org.openjena.fuseki.Fuseki.serverlog ;
import java.io.IOException ;
import java.io.InputStream ;
@@ -44,7 +43,7 @@ import com.hp.hpl.jena.sparql.util.graph
public class SPARQL_Upload extends SPARQL_ServletBase
{
- private static ErrorHandler errorHandler = ErrorHandlerFactory.errorHandlerStd(serverlog) ;
+ private static ErrorHandler errorHandler = ErrorHandlerFactory.errorHandlerStd(log) ;
private class HttpActionUpload extends HttpAction {
public HttpActionUpload(long id, DatasetGraph dsg, HttpServletRequest request, HttpServletResponse response, boolean verbose)
@@ -137,7 +136,7 @@ public class SPARQL_Upload extends SPARQ
}
// Add file type?
else
- serverlog.info(format("[%d] Upload: Field="+fieldName+" - ignored")) ;
+ log.info(format("[%d] Upload: Field="+fieldName+" - ignored")) ;
//System.out.println("Form field " + fieldName + " with value " + Streams.asString(stream) + " detected.");
} else {
// System.out.println("File field " + fieldName + " with file name "
@@ -172,7 +171,7 @@ public class SPARQL_Upload extends SPARQ
if ( graphName == null )
graphName = "default" ;
- serverlog.info(format("[%d] Upload: Filename: %s, Content-Type=%s, Charset=%s => (%s,%s,%d triple(s))",
+ log.info(format("[%d] Upload: Filename: %s, Content-Type=%s, Charset=%s => (%s,%s,%d triple(s))",
action.id, name, ct.getContentType(), ct.getCharset(), graphName, lang.getName(), tripleCount)) ;
// Delay updating until all form fields processed to get the graph name
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/validation/ValidatorBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/validation/ValidatorBase.java?rev=1136022&r1=1136021&r2=1136022&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/validation/ValidatorBase.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/validation/ValidatorBase.java Wed Jun 15 13:09:42 2011
@@ -20,7 +20,7 @@ import org.slf4j.Logger ;
public abstract class ValidatorBase extends HttpServlet
{
- protected static Logger serviceLog = Fuseki.serverlog ;
+ protected static Logger serviceLog = Fuseki.requestLog ;
public static final String cssFile = "/fuseki.css" ;
public static final String respService = "X-Service" ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/ServerTest.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/ServerTest.java?rev=1136022&r1=1136021&r2=1136022&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/ServerTest.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/ServerTest.java Wed Jun 15 13:09:42 2011
@@ -54,7 +54,7 @@ public class ServerTest extends BaseTest
protected static void serverStart()
{
Log.logLevel(SPARQLServer.log.getName(), org.apache.log4j.Level.WARN, java.util.logging.Level.WARNING) ;
- Log.logLevel(Fuseki.serverlog.getName(), org.apache.log4j.Level.WARN, java.util.logging.Level.WARNING) ;
+ Log.logLevel(Fuseki.serverLog.getName(), org.apache.log4j.Level.WARN, java.util.logging.Level.WARNING) ;
Log.logLevel("org.eclipse.jetty", org.apache.log4j.Level.WARN, java.util.logging.Level.WARNING) ;
server = new SPARQLServer(DatasetGraphFactory.createMem(), datasetPath, port, true) ;
server.start() ;
@@ -65,7 +65,7 @@ public class ServerTest extends BaseTest
{
server.stop() ;
Log.logLevel(SPARQLServer.log.getName(), org.apache.log4j.Level.INFO, java.util.logging.Level.INFO) ;
- Log.logLevel(Fuseki.serverlog.getName(), org.apache.log4j.Level.INFO, java.util.logging.Level.INFO) ;
+ Log.logLevel(Fuseki.serverLog.getName(), org.apache.log4j.Level.INFO, java.util.logging.Level.INFO) ;
Log.logLevel("org.eclipse.jetty", org.apache.log4j.Level.INFO, java.util.logging.Level.INFO) ;
}