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 2016/08/05 16:33:59 UTC
[1/6] jena git commit: Use log message names that correspond to slf4j
names.
Repository: jena
Updated Branches:
refs/heads/master e9c26ab08 -> ae299cf67
Use log message names that correspond to slf4j names.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/045353d8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/045353d8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/045353d8
Branch: refs/heads/master
Commit: 045353d892791d4a72d79d34edd81d83a70be63b
Parents: e9c26ab
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 4 20:54:11 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 4 20:54:11 2016 +0100
----------------------------------------------------------------------
.../jena/atlas/logging/java/TextFormatter.java | 39 +++++++++++++++++++-
1 file changed, 37 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/045353d8/jena-base/src/main/java/org/apache/jena/atlas/logging/java/TextFormatter.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/logging/java/TextFormatter.java b/jena-base/src/main/java/org/apache/jena/atlas/logging/java/TextFormatter.java
index e9287aa..4ec26b0 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/logging/java/TextFormatter.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/logging/java/TextFormatter.java
@@ -21,6 +21,7 @@ package org.apache.jena.atlas.logging.java;
import java.text.MessageFormat ;
import java.util.Date ;
import java.util.logging.Formatter ;
+import java.util.logging.Level ;
import java.util.logging.LogManager ;
import java.util.logging.LogRecord ;
@@ -29,6 +30,8 @@ import java.util.logging.LogRecord ;
* Set a different output pattern with {@code .format}.
* <p>
* The default format is {@code "%5$tT %3$-5s %2$-20s :: %6$s\n"}.
+ * <p>
+ * Examples:
* <ul>
* <li>"%5$tT.%5$tL %3$-5s %2$-20s :: %6$s\n" for milliseconds.
* <li>"%tF %5$tT.%5$tL %3$-5s %2$-20s :: %6$s\n" for date
@@ -39,7 +42,7 @@ import java.util.logging.LogRecord ;
* String.format(format,
* loggerName, // 1
* loggerNameShort, // 2
- * record.getLevel(), // 3
+ * levelOutputName, // 3
* Thread.currentThread().getName(), // 4
* new Date(record.getMillis()), // 5
* formatted$) ; // 6
@@ -78,12 +81,44 @@ public class TextFormatter extends Formatter
if ( record.getParameters() != null )
formatted$ = MessageFormat.format(formatted$, record.getParameters()) ;
+ Level level = record.getLevel() ;
+ String levelOutputName = levelOutputName(level) ;
+
return String.format(format,
loggerName, // 1
loggerNameShort, // 2
- record.getLevel(), // 3
+ levelOutputName, // 3
Thread.currentThread().getName(), // 4
new Date(record.getMillis()), // 5
formatted$) ; // 6
}
+
+ /** By default use slf4j name.
+ * When used with slf4j, this reconstructs the slf4j name.
+ */
+
+ protected String levelOutputName(Level level) {
+ // FINEST -> TRACE
+ // FINER -> DEBUG
+ // FINE -> DEBUG
+ // CONFIG -> INFO
+ // INFO -> INFO
+ // WARNING -> WARN
+ // SEVERE -> ERROR
+ if ( Level.WARNING.equals(level) )
+ return "WARN" ;
+ if ( Level.SEVERE.equals(level) )
+ return "ERROR" ;
+ if ( Level.INFO.equals(level) )
+ return "INFO" ;
+ if ( Level.CONFIG.equals(level) ) // Keep name.
+ return "CONFIG" ;
+ if ( Level.FINE.equals(level) )
+ return "DEBUG" ;
+ if ( Level.FINER.equals(level) )
+ return "DEBUG" ;
+ if ( Level.FINEST.equals(level) )
+ return "TRACE" ;
+ return level.getName() ;
+ }
}
[5/6] jena git commit: Quads endpoints.
Posted by an...@apache.org.
Quads endpoints.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/13ab1119
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/13ab1119
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/13ab1119
Branch: refs/heads/master
Commit: 13ab111957a85c61d2cac4a89f7c5d3022299cf9
Parents: e7df210
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 5 17:31:42 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 5 17:31:42 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/fuseki/build/Builder.java | 43 ++++++++++++--------
1 file changed, 26 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/13ab1119/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/Builder.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/Builder.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/Builder.java
index d7fefed..875601e 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/Builder.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/Builder.java
@@ -18,6 +18,7 @@
package org.apache.jena.fuseki.build;
+import static org.apache.jena.fuseki.server.FusekiVocab.* ;
import static java.lang.String.format ;
import static org.apache.jena.fuseki.FusekiLib.nodeLabel ;
import static org.apache.jena.fuseki.FusekiLib.query ;
@@ -34,6 +35,7 @@ import org.apache.jena.query.Dataset ;
import org.apache.jena.query.QuerySolution ;
import org.apache.jena.query.ResultSet ;
import org.apache.jena.rdf.model.Literal ;
+import org.apache.jena.rdf.model.Property ;
import org.apache.jena.rdf.model.RDFNode ;
import org.apache.jena.rdf.model.Resource ;
import org.apache.jena.sparql.core.DatasetGraph ;
@@ -69,16 +71,23 @@ public class Builder
// In case the assembler included ja:contents
DataService dataService = new DataService(ds.asDatasetGraph()) ;
- addServiceEP(dataService, OperationName.Query, svc, "fu:serviceQuery") ;
- addServiceEP(dataService, OperationName.Update, svc, "fu:serviceUpdate") ;
- addServiceEP(dataService, OperationName.Upload, svc, "fu:serviceUpload") ;
- addServiceEP(dataService, OperationName.GSP_R, svc, "fu:serviceReadGraphStore") ;
- addServiceEP(dataService, OperationName.GSP_RW, svc, "fu:serviceReadWriteGraphStore") ;
+
+ addServiceEP(dataService, OperationName.Query, svc, pServiceQueryEP) ;
+ addServiceEP(dataService, OperationName.Update, svc, pServiceUpdateEP) ;
+ addServiceEP(dataService, OperationName.Upload, svc, pServiceUpdateEP) ;
+ addServiceEP(dataService, OperationName.GSP_R, svc, pServiceReadGraphStoreEP) ;
+ addServiceEP(dataService, OperationName.GSP_RW, svc, pServiceReadWriteGraphStoreEP) ;
+
+ addServiceEP(dataService, OperationName.Quads_R, svc, pServiceReadQuadsEP) ;
+ addServiceEP(dataService, OperationName.Quads_RW, svc, pServiceReadWriteQuadsEP) ;
- if ( ! dataService.getOperation(OperationName.GSP_RW).isEmpty() )
+ // Quads - actions directly on the dataset URL are different.
+ // In the config file they are also implicit when using GSP.
+ if ( ! dataService.getOperation(OperationName.GSP_RW).isEmpty() || ! dataService.getOperation(OperationName.Quads_RW).isEmpty() ) {
dataService.addEndpoint(OperationName.Quads_RW, "") ;
- else if ( ! dataService.getOperation(OperationName.GSP_R).isEmpty() )
+ } else if ( ! dataService.getOperation(OperationName.GSP_R).isEmpty() || ! dataService.getOperation(OperationName.Quads_R).isEmpty() ) {
dataService.addEndpoint(OperationName.Quads_R, "") ;
+ }
// XXX
// // Extract timeout overriding configuration if present.
@@ -113,15 +122,15 @@ public class Builder
addServiceEP(dataService, OperationName.Query, "query") ;
addServiceEP(dataService, OperationName.Query, "sparql") ;
if ( ! allowUpdate ) {
- addServiceEP(dataService, OperationName.GSP_R, "data") ;
- addServiceEP(dataService, OperationName.Quads_R, "") ;
+ addServiceEP(dataService, OperationName.GSP_R, "data") ;
+ addServiceEP(dataService, OperationName.Quads_R, "") ;
return dataService ;
}
- addServiceEP(dataService, OperationName.GSP_RW, "data") ;
- addServiceEP(dataService, OperationName.GSP_R, "get") ;
- addServiceEP(dataService, OperationName.Update, "update") ;
- addServiceEP(dataService, OperationName.Upload, "upload") ;
- addServiceEP(dataService, OperationName.Quads_RW, "") ;
+ addServiceEP(dataService, OperationName.GSP_RW, "data") ;
+ addServiceEP(dataService, OperationName.GSP_R, "get") ;
+ addServiceEP(dataService, OperationName.Update, "update") ;
+ addServiceEP(dataService, OperationName.Upload, "upload") ;
+ addServiceEP(dataService, OperationName.Quads_RW, "") ;
return dataService ;
}
@@ -139,10 +148,10 @@ public class Builder
throw new FusekiConfigException("Multiple " + ln + " for service " + FusekiLib.nodeLabel(svc)) ;
return x ;
}
-
- private static void addServiceEP(DataService dataService, OperationName opName, Resource svc, String property) {
- ResultSet rs = query("SELECT * { ?svc " + property + " ?ep}", svc.getModel(), "svc", svc) ;
+ private static void addServiceEP(DataService dataService, OperationName opName, Resource svc, Property property) {
+ String p = "<"+property.getURI()+">" ;
+ ResultSet rs = query("SELECT * { ?svc " + p + " ?ep}", svc.getModel(), "svc", svc) ;
for ( ; rs.hasNext() ; ) {
QuerySolution soln = rs.next() ;
String epName = soln.getLiteral("ep").getLexicalForm() ;
[2/6] jena git commit: Don't suppress QueryExceptionHttp
Posted by an...@apache.org.
Don't suppress QueryExceptionHttp
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9f1ea9c6
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9f1ea9c6
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9f1ea9c6
Branch: refs/heads/master
Commit: 9f1ea9c668448d3c9ef101b5130aba8665aeef0a
Parents: 045353d
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 5 13:34:46 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 5 13:34:46 2016 +0100
----------------------------------------------------------------------
.../apache/jena/sparql/engine/http/QueryEngineHTTP.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1ea9c6/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
index f6c807d..b196f83 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
@@ -35,7 +35,10 @@ import org.apache.jena.atlas.web.auth.SimpleAuthenticator ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.query.* ;
import org.apache.jena.rdf.model.Model ;
-import org.apache.jena.riot.* ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.WebContent ;
import org.apache.jena.riot.web.HttpOp ;
import org.apache.jena.sparql.ARQException ;
import org.apache.jena.sparql.core.Quad;
@@ -523,7 +526,10 @@ public class QueryEngineHTTP implements QueryExecution {
return CSVInput.booleanFromCSV(in);
throw new QueryException("Endpoint returned Content-Type: " + actualContentType
+ " which is not currently supported for ASK queries");
- } catch (java.io.IOException e) {
+ } catch (QueryExceptionHTTP e) {
+ throw e ;
+ }
+ catch (java.io.IOException e) {
log.warn("Failed to close connection", e);
return false ;
}
@@ -692,6 +698,7 @@ public class QueryEngineHTTP implements QueryExecution {
}
}
+ @SuppressWarnings("deprecation")
@Override
public void close() {
closed = true ;
[6/6] jena git commit: Temporary fix. Do not reset OutputStream.
Posted by an...@apache.org.
Temporary fix. Do not reset OutputStream.
Java standard console closes the output but that is System.err
initially. The effect is that stderr is closed for the whole
application.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ae299cf6
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ae299cf6
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ae299cf6
Branch: refs/heads/master
Commit: ae299cf6787aa513a998efede13b375cc00f995a
Parents: 13ab111
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 5 17:33:18 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 5 17:33:18 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/atlas/logging/java/ConsoleHandlerStream.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ae299cf6/jena-base/src/main/java/org/apache/jena/atlas/logging/java/ConsoleHandlerStream.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/logging/java/ConsoleHandlerStream.java b/jena-base/src/main/java/org/apache/jena/atlas/logging/java/ConsoleHandlerStream.java
index 1dd5521..fd4dbac 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/logging/java/ConsoleHandlerStream.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/logging/java/ConsoleHandlerStream.java
@@ -57,6 +57,7 @@ public class ConsoleHandlerStream extends ConsoleHandler {
// Ignore and try to carry on.
}
}
- setOutputStream(outputStream);
+ // Temporary fix : setOutputStream closes the old setting which is backed by System.err.
+ //setOutputStream(outputStream);
}
}
[4/6] jena git commit: Add quads endpoint properties.
Posted by an...@apache.org.
Add quads endpoint properties.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e7df210a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e7df210a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e7df210a
Branch: refs/heads/master
Commit: e7df210a04c57bbb9c0d64853e062237ef8bfe6b
Parents: f643025
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 5 17:31:12 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 5 17:31:12 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/fuseki/server/FusekiVocab.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e7df210a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java
index ce9c610..ad4a700 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java
@@ -35,11 +35,13 @@ public class FusekiVocab
public static final Property pServices = property("services") ;
public static final Property pServiceName = property("name") ;
- public static final Property pServiceQueryEP = property("serviceQuery") ;
- public static final Property pServiceUpdateEP = property("serviceUpdate") ;
- public static final Property pServiceUploadEP = property("serviceUpload") ;
+ public static final Property pServiceQueryEP = property("serviceQuery") ;
+ public static final Property pServiceUpdateEP = property("serviceUpdate") ;
+ public static final Property pServiceUploadEP = property("serviceUpload") ;
public static final Property pServiceReadWriteGraphStoreEP = property("serviceReadWriteGraphStore") ;
- public static final Property pServiceReadgraphStoreEP = property("serviceReadGraphStore") ;
+ public static final Property pServiceReadGraphStoreEP = property("serviceReadGraphStore") ;
+ public static final Property pServiceReadWriteQuadsEP = property("serviceReadWriteQuads") ;
+ public static final Property pServiceReadQuadsEP = property("serviceReadQuads") ;
public static final Property pAllowTimeoutOverride = property("allowTimeoutOverride");
public static final Property pMaximumTimeoutOverride = property("maximumTimeoutOverride");
[3/6] jena git commit: Gate quads requests by whether quads
operations are enabled.
Posted by an...@apache.org.
Gate quads requests by whether quads operations are enabled.
It used to be by whether GSP oprations were but the builder now contains
that relationship.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f643025b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f643025b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f643025b
Branch: refs/heads/master
Commit: f643025b58c2f30415a650babe84a74275b30131
Parents: 9f1ea9c
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 5 17:30:48 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 5 17:30:48 2016 +0100
----------------------------------------------------------------------
.../apache/jena/fuseki/servlets/SPARQL_UberServlet.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f643025b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
index 7388b46..d04a3a3 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
@@ -219,7 +219,7 @@ public abstract class SPARQL_UberServlet extends ActionSPARQL
// SPARQL Update
if ( !allowUpdate(action) )
ServletOps.errorMethodNotAllowed("SPARQL update : "+method) ;
- // This wil dela with using GET.
+ // This will deal with using GET.
executeRequest(action, updateServlet) ;
return ;
}
@@ -241,16 +241,14 @@ public abstract class SPARQL_UberServlet extends ActionSPARQL
// Check enabled.
if ( isGET || isHEAD ) {
- if ( allowREST_R(action) || allowQuadsR(action) )
+ if ( allowQuadsR(action) )
restQuads_R.executeLifecycle(action) ;
else
- ServletOps.errorMethodNotAllowed("Read-only dataset : "+method) ;
+ ServletOps.errorMethodNotAllowed(method) ;
return ;
}
- // If the read-only server has the same name as the writable server,
- // and the default for a read-only server is "/data", like a writable dataset,
- // this test is insufficient.
- if ( allowREST_W(action) )
+
+ if ( allowQuadsW(action) )
restQuads_RW.executeLifecycle(action) ;
else
ServletOps.errorMethodNotAllowed("Read-only dataset : "+method) ;