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 2017/07/20 12:18:15 UTC
[1/3] jena git commit: Include process id in start-up logging
Repository: jena
Updated Branches:
refs/heads/master 2fa4b5cdb -> 68ee61098
Include process id in start-up logging
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a738e9c7
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a738e9c7
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a738e9c7
Branch: refs/heads/master
Commit: a738e9c7bbc9d5122de490968c65d658d9991806
Parents: 2fa4b5c
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jul 18 14:43:56 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jul 18 14:43:56 2017 +0100
----------------------------------------------------------------------
.../org/apache/jena/fuseki/cmds/PlatformInfo.java | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a738e9c7/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/PlatformInfo.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/PlatformInfo.java b/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/PlatformInfo.java
index 86cc5da..6e87e1b 100644
--- a/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/PlatformInfo.java
+++ b/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/PlatformInfo.java
@@ -55,10 +55,14 @@ public class PlatformInfo {
long freeMem = Runtime.getRuntime().freeMemory();
long usedMem = totalMem - freeMem;
Function<Long, String> f = PlatformInfo::strNum2;
+
+ long pid = getProcessId();
FmtLog.info(log, "%sMemory: %s", prefix, f.apply(maxMem));
//FmtLog.info(log, "%sMemory: max=%s total=%s used=%s free=%s", prefix, f.apply(maxMem), f.apply(totalMem), f.apply(usedMem), f.apply(freeMem));
FmtLog.info(log, "%sJava: %s", prefix, System.getProperty("java.version"));
FmtLog.info(log, "%sOS: %s %s %s", prefix, System.getProperty("os.name"), System.getProperty("os.version"), System.getProperty("os.arch"));
+ if ( pid != -1)
+ FmtLog.info(log, "%sPID: %s", prefix, pid);
}
public static void logDetailsVerbose(Logger log) {
@@ -92,7 +96,16 @@ public class PlatformInfo {
return String.format("%.1fG", x/(1024.0*1024*1024));
return String.format("%.1fT", x/(1024.0*1024*1024*1024));
}
-
+
+ private static long getProcessId() {
+ // Java9
+ //long pid = ProcessHandle.current().getPid();
+ try {
+ String x = java.lang.management.ManagementFactory.getRuntimeMXBean().getName().split("@")[0];
+ return Long.parseLong(x);
+ } catch (NumberFormatException ex) { return -1 ; }
+ }
+
/** Create a human-friendly string for a number based on Kilo/Mega/Giga/Tera (powers of 10) */
public static String strNum10(long x) {
if ( x < 1_000 )
[2/3] jena git commit: Flag to add validators.
Posted by an...@apache.org.
Flag to add validators.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/17279bf4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/17279bf4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/17279bf4
Branch: refs/heads/master
Commit: 17279bf4b3840a434d5378618ef25dcb8dca7f5c
Parents: a738e9c
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Jul 20 13:17:12 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Jul 20 13:17:12 2017 +0100
----------------------------------------------------------------------
.../apache/jena/fuseki/cmds/FusekiBasicCmd.java | 25 ++++++++++++++------
.../jena/fuseki/validation/ValidatorBase.java | 4 +---
2 files changed, 19 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/17279bf4/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/FusekiBasicCmd.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/FusekiBasicCmd.java b/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/FusekiBasicCmd.java
index 17fb51e..4c219dd 100644
--- a/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/FusekiBasicCmd.java
+++ b/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/FusekiBasicCmd.java
@@ -96,8 +96,9 @@ public class FusekiBasicCmd {
// Allow there to be no registered datasets without it being an error.
// which is "return dsg==null && serverConfig==null;"
public boolean empty = false ;
- // Setup for SPARQLer - validators and gener query engine, some pages, no datasets,
+ // Setup for SPARQLer - validators and general query engine, some pages.
public boolean sparqler = false ;
+ public boolean validators = false ;
public boolean loopback = false;
public String datasetDescription;
public String contentDirectory = null;
@@ -120,6 +121,7 @@ public class FusekiBasicCmd {
private static ArgDecl argGZip = new ArgDecl(ArgDecl.HasValue, "gzip");
private static ArgDecl argBase = new ArgDecl(ArgDecl.HasValue, "base", "files");
private static ArgDecl argSparqler = new ArgDecl(ArgDecl.HasValue, "sparqler");
+ private static ArgDecl argValidators = new ArgDecl(ArgDecl.NoValue, "validators");
// private static ModLocation modLocation = new ModLocation();
private static ModDatasetAssembler modDataset = new ModDatasetAssembler();
@@ -166,6 +168,7 @@ public class FusekiBasicCmd {
"Directory for static content");
add(argSparqler, "--sparqler=DIR",
"Run with SPARQLer services Directory for static content");
+ add(argValidators, "--validators", "Install validators");
super.modVersion.addClass(TDB.class);
super.modVersion.addClass(Fuseki.class);
@@ -322,12 +325,17 @@ public class FusekiBasicCmd {
ARQ.getContext().set(ARQ.queryTimeout, str);
}
+ if ( contains(argValidators) ) {
+ serverConfig.validators = true;
+ }
+
if ( contains(argSparqler) ) {
String filebase = getValue(argSparqler);
if ( ! FileOps.exists(filebase) )
throw new CmdException("File area not found: "+filebase);
serverConfig.contentDirectory = filebase;
serverConfig.sparqler = true;
+ serverConfig.validators = true;
}
if ( contains(argBase) ) {
@@ -378,7 +386,7 @@ public class FusekiBasicCmd {
builder.setPort(serverConfig.port);
builder.setLoopback(serverConfig.loopback);
- if ( serverConfig.empty ) {
+ if ( serverConfig.validators ) {
if ( serverConfig.sparqler )
builder.addServlet("/sparql", new SPARQL_QueryGeneral());
// Validators.
@@ -386,7 +394,8 @@ public class FusekiBasicCmd {
builder.addServlet("/validate/update", new UpdateValidator());
builder.addServlet("/validate/iri", new IRIValidator());
builder.addServlet("/validate/data", new DataValidator());
- } else {
+ }
+ if ( ! serverConfig.empty ) {
if ( serverConfig.serverConfig != null )
// Config file.
builder.parseConfigFile(serverConfig.serverConfig);
@@ -426,7 +435,7 @@ public class FusekiBasicCmd {
}
// Dataset -> Endpoints
- Map<String, List<String>> z = description(DataAccessPointRegistry.get(server.getServletContext()));
+ Map<String, List<String>> mapDatasetEndpoints = description(DataAccessPointRegistry.get(server.getServletContext()));
if ( serverConfig.empty ) {
FmtLog.info(log, "No SPARQL datasets services");
@@ -436,16 +445,18 @@ public class FusekiBasicCmd {
}
if ( serverConfig.datasetPath != null ) {
- if ( z.size() != 1 )
+ if ( mapDatasetEndpoints.size() != 1 ) {
+ System.err.println(serverConfig.datasetPath);
log.error("Expected only one dataset");
- List<String> endpoints = z.get(serverConfig.datasetPath);
+ }
+ List<String> endpoints = mapDatasetEndpoints.get(serverConfig.datasetPath);
FmtLog.info(log, "Dataset Type = %s", serverConfig.datasetDescription);
FmtLog.info(log, "Path = %s; Services = %s", serverConfig.datasetPath, endpoints);
}
if ( serverConfig.serverConfig != null ) {
// May be many datasets and services.
FmtLog.info(log, "Configuration file %s", serverConfig.serverConfig);
- z.forEach((path, endpoints)->{
+ mapDatasetEndpoints.forEach((path, endpoints)->{
FmtLog.info(log, "Path = %s; Services = %s", path, endpoints);
});
}
http://git-wip-us.apache.org/repos/asf/jena/blob/17279bf4/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/ValidatorBase.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/ValidatorBase.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/ValidatorBase.java
index b07ddf6..7601f69 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/ValidatorBase.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/ValidatorBase.java
@@ -64,9 +64,7 @@ public abstract class ValidatorBase extends ServletBase {
// JSON and framework.
protected abstract void executeJSON(HttpServletRequest request, HttpServletResponse response);
- protected void executeJSON(HttpServletRequest request, HttpServletResponse response,
- JsonAction jsonAction
- ) {
+ protected void executeJSON(HttpServletRequest request, HttpServletResponse response, JsonAction jsonAction) {
long id = allocRequestId(request, response) ;
ValidationAction action = new ValidationAction(id, vLog, request, response, false) ;
printRequest(action) ;
[3/3] jena git commit: Typo
Posted by an...@apache.org.
Typo
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/68ee6109
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/68ee6109
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/68ee6109
Branch: refs/heads/master
Commit: 68ee610984aea876780ce68c07334c0f0bd36e0f
Parents: 17279bf
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Jul 20 13:18:10 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Jul 20 13:18:10 2017 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/68ee6109/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
index c5e1065..ea3c2ba 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFFormat.java
@@ -164,7 +164,7 @@ public class RDFFormat {
public static final RDFFormat RDF_THRIFT = new RDFFormat(THRIFT) ;
/**
* A variant of an an RDFFormat that uses value encoding (e.g. integers,
- * doubles, decimals as binary). This does not preserve exact represenation
+ * doubles, decimals as binary). This does not preserve exact representation
* (+001 is the same value as 1, +1 and 001) which may matter for database
* dumps. It looses datatype for derived types (xsd;long, xsd:int, xsd:short
* and xsd:byte become xsd:integer).