Merge pull request #767 from afs/logging2
JENA-1928: Logging improvements
diff --git a/apache-jena/log4j2.properties b/apache-jena/log4j2.properties
index 761200c..e480748 100644
--- a/apache-jena/log4j2.properties
+++ b/apache-jena/log4j2.properties
@@ -4,7 +4,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TestJsonLDReader.java b/jena-arq/src/test/java/org/apache/jena/riot/TestJsonLDReader.java
index 3e6c2b3..0ac52ef 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/TestJsonLDReader.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/TestJsonLDReader.java
@@ -23,7 +23,6 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import com.fasterxml.jackson.core.JsonGenerationException;
@@ -33,6 +32,7 @@
import org.apache.jena.query.DatasetFactory;
import org.apache.jena.rdf.model.Model;
import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.riot.system.ErrorHandlerFactory;
import org.apache.jena.sparql.util.Context;
import org.apache.jena.vocabulary.RDF;
import org.junit.Test;
@@ -44,9 +44,11 @@
try {
String jsonld = someSchemaDorOrgJsonld();
Model m = ModelFactory.createDefaultModel();
- try (StringReader reader = new StringReader(jsonld)) {
- m.read(reader, null, "JSON-LD");
- }
+ RDFParser.create()
+ .errorHandler(ErrorHandlerFactory.errorHandlerNoLogging)
+ .fromString(jsonld)
+ .lang(Lang.JSONLD)
+ .parse(m);
assertJohnDoeIsOK(m);
} catch (RiotException e) {
// cf. org.apache.jena.riot.RiotException: loading remote context failed: http://schema.org/
@@ -116,15 +118,10 @@
private Dataset jsonld2dataset(String jsonld, Context jenaCtx) throws IOException {
Dataset ds = DatasetFactory.create();
- // this is works too
- // ReaderRIOT reader = RDFDataMgr.createReader(Lang.JSONLD);
- // try (InputStream in = new ByteArrayInputStream(jsonld.getBytes(StandardCharsets.UTF_8))) {
- // reader.read(in, null, null, StreamRDFLib.dataset(ds.asDatasetGraph()), jenaCtx);
- // }
-
try (InputStream in = new ByteArrayInputStream(jsonld.getBytes(StandardCharsets.UTF_8))) {
RDFParser.create()
.source(in)
+ .errorHandler(ErrorHandlerFactory.errorHandlerNoLogging)
.lang(Lang.JSONLD)
.context(jenaCtx)
.parse(ds.asDatasetGraph());
diff --git a/jena-arq/src/test/resources/log4j2.properties b/jena-arq/src/test/resources/log4j2.properties
index 5eaf100..b4d3896 100644
--- a/jena-arq/src/test/resources/log4j2.properties
+++ b/jena-arq/src/test/resources/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
index 4134065..e0fd406 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
@@ -40,6 +40,7 @@
private static final boolean hasLog4j1 = hasClass("org.slf4j.impl.Log4jLoggerFactory");
private static final boolean hasJUL = hasClass("org.slf4j.impl.JDK14LoggerFactory");
// JUL always present but needs slf4j adapter.
+ // Put per-logging system code in separate classes to avoid needing them on the classpath.
private static boolean hasClass(String className) {
try {
@@ -54,8 +55,8 @@
setLevel(logger.getName(), level);
}
- static public void setLevel(Class<? > logger, String level) {
- setLevel(logger.getName(), level);
+ static public void setLevel(Class<? > cls, String level) {
+ setLevel(cls.getName(), level);
}
static public void setLevel(Logger logger, String level) {
@@ -141,8 +142,6 @@
else if ( levelName.equalsIgnoreCase("OFF") )
level = org.apache.logging.log4j.Level.OFF;
try {
- // "try" : If log4j2 core is not on the path (everything else is
- // log4j-api).
if ( !logger.equals("") )
org.apache.logging.log4j.core.config.Configurator.setLevel(logger, level);
else
@@ -316,7 +315,7 @@
if ( isSetLog4j2property() )
return;
// Nothing found - built-in default.
- LogCmd.resetLogging(LogCmd.log4j2setup);
+ LogCtlLog4j2.resetLogging(LogCtlLog4j2.log4j2setup);
}
}
@@ -347,7 +346,7 @@
public static void setJavaLogging() {
if ( System.getProperty(JUL_PROPERTY) != null )
return;
- LogJUL.resetJavaLogging();
+ LogCtlJUL.resetJavaLogging();
}
/**
@@ -358,7 +357,7 @@
try {
InputStream details = new FileInputStream(filename);
details = new BufferedInputStream(details);
- LogJUL.readJavaLoggingConfiguration(details);
+ LogCtlJUL.readJavaLoggingConfiguration(details);
} catch (Exception ex) {
throw new AtlasException(ex);
}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/logging/LogJUL.java b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtlJUL.java
similarity index 98%
rename from jena-base/src/main/java/org/apache/jena/atlas/logging/LogJUL.java
rename to jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtlJUL.java
index f3448f5..da7c0a2 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/logging/LogJUL.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtlJUL.java
@@ -30,7 +30,7 @@
import org.apache.jena.atlas.lib.StrUtils;
/** java.util.logging specific code. */
-public class LogJUL {
+public class LogCtlJUL {
// File or java resource name default.
public static String JUL_LOGGING = "logging.properties";
@@ -48,7 +48,9 @@
//,"org.apache.jena.atlas.logging.java.TextFormatter.format=%5$tT %3$-5s %2$-20s :: %6$s"
);
// @formatter:off
-
+
+ private LogCtlJUL() {}
+
/**
* Reset java.util.logging - this overrides the previous configuration, if any.
*/
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCmd.java b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtlLog4j2.java
similarity index 95%
rename from jena-base/src/main/java/org/apache/jena/atlas/logging/LogCmd.java
rename to jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtlLog4j2.java
index 6a011a9..239b123 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCmd.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtlLog4j2.java
@@ -37,7 +37,7 @@
* <br/>
* This class is split out from {@link LogCtl} to decouple the class loading dependencies.
*/
-public class LogCmd {
+public class LogCtlLog4j2 {
/**
* Reset logging (log4j2). log4j2.properties format.
*/
@@ -75,14 +75,14 @@
, "filters = threshold"
, ""
, "filter.threshold.type = ThresholdFilter"
- , "filter.threshold.level = INFO"
+ , "filter.threshold.level = ALL"
, "appender.console.type = Console"
, "appender.console.name = OUT"
, "appender.console.target = SYSTEM_OUT"
, "appender.console.layout.type = PatternLayout"
- , "appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n"
- , "#appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n"
+ , "appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-15c{1} :: %m%n"
+ , "#appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-15c{1} :: %m%n"
, "rootLogger.level = INFO"
, "rootLogger.appenderRef.stdout.ref = OUT"
@@ -97,8 +97,7 @@
, "logger.riot.level = INFO"
);
// @formatter:on
-
-
+
// @formatter:off
/** A format for commands using stderr. */
public static String log4j2setupCmd = StrUtils.strjoinNL
@@ -108,14 +107,14 @@
, "filters = threshold"
, ""
, "filter.threshold.type = ThresholdFilter"
- , "filter.threshold.level = INFO"
+ , "filter.threshold.level = ALL"
, "appender.console.type = Console"
, "appender.console.name = OUT"
, "appender.console.target = SYSTEM_ERR"
, "appender.console.layout.type = PatternLayout"
- , "appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n"
- , "#appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} ::: %m%n"
+ , "appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-15c{1} :: %m%n"
+ , "#appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-15c{1} ::: %m%n"
, "rootLogger.level = INFO"
, "rootLogger.appenderRef.stdout.ref = OUT"
@@ -130,6 +129,4 @@
, "logger.riot.level = INFO"
);
// @formatter:on
-
}
-
diff --git a/jena-base/src/test/resources/log4j2.properties b/jena-base/src/test/resources/log4j2.properties
index 4dc512f..a1a1ef3 100644
--- a/jena-base/src/test/resources/log4j2.properties
+++ b/jena-base/src/test/resources/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-cmds/src/test/log4j2.properties b/jena-cmds/src/test/log4j2.properties
index 77fc564..cff81ff 100644
--- a/jena-cmds/src/test/log4j2.properties
+++ b/jena-cmds/src/test/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = STDOUT
diff --git a/jena-core/src/test/resources/log4j2.properties b/jena-core/src/test/resources/log4j2.properties
index 000a9f9..3369f76 100644
--- a/jena-core/src/test/resources/log4j2.properties
+++ b/jena-core/src/test/resources/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-db/jena-dboe-base/src/test/resources/log4j2.properties b/jena-db/jena-dboe-base/src/test/resources/log4j2.properties
index 4dc512f..a1a1ef3 100644
--- a/jena-db/jena-dboe-base/src/test/resources/log4j2.properties
+++ b/jena-db/jena-dboe-base/src/test/resources/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-db/jena-dboe-index-test/src/test/resources/log4j2.properties b/jena-db/jena-dboe-index-test/src/test/resources/log4j2.properties
index 4dc512f..a1a1ef3 100644
--- a/jena-db/jena-dboe-index-test/src/test/resources/log4j2.properties
+++ b/jena-db/jena-dboe-index-test/src/test/resources/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-db/jena-dboe-index/src/test/resources/log4j2.properties b/jena-db/jena-dboe-index/src/test/resources/log4j2.properties
index 4dc512f..a1a1ef3 100644
--- a/jena-db/jena-dboe-index/src/test/resources/log4j2.properties
+++ b/jena-db/jena-dboe-index/src/test/resources/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-db/jena-dboe-storage/src/test/resources/log4j2.properties b/jena-db/jena-dboe-storage/src/test/resources/log4j2.properties
index 4dc512f..a1a1ef3 100644
--- a/jena-db/jena-dboe-storage/src/test/resources/log4j2.properties
+++ b/jena-db/jena-dboe-storage/src/test/resources/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-db/jena-dboe-trans-data/src/test/resources/log4j2.properties b/jena-db/jena-dboe-trans-data/src/test/resources/log4j2.properties
index 4dc512f..a1a1ef3 100644
--- a/jena-db/jena-dboe-trans-data/src/test/resources/log4j2.properties
+++ b/jena-db/jena-dboe-trans-data/src/test/resources/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-db/jena-dboe-transaction/src/test/resources/log4j2.properties b/jena-db/jena-dboe-transaction/src/test/resources/log4j2.properties
index 4dc512f..a1a1ef3 100644
--- a/jena-db/jena-dboe-transaction/src/test/resources/log4j2.properties
+++ b/jena-db/jena-dboe-transaction/src/test/resources/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-db/jena-tdb2/src/test/resources/log4j2.properties b/jena-db/jena-tdb2/src/test/resources/log4j2.properties
index 4dc512f..a1a1ef3 100644
--- a/jena-db/jena-tdb2/src/test/resources/log4j2.properties
+++ b/jena-db/jena-tdb2/src/test/resources/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestJenaSimple.java b/jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestJenaSimple.java
index 584c000..5380f96 100644
--- a/jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestJenaSimple.java
+++ b/jena-extras/jena-commonsrdf/src/test/java/org/apache/jena/commonsrdf/TestJenaSimple.java
@@ -71,7 +71,6 @@
org.apache.jena.sparql.core.DatasetGraph jenaDatasetGraph = JenaCommonsRDF.toJena(crdf_dataset);
String str = org.apache.jena.riot.RDFWriter.create().source(jenaDatasetGraph).lang(Lang.TRIG).asString();
- System.out.println(str);
assertTrue(str.contains("123"));
// No prefixes
assertTrue(str.contains("http://example/g"));
diff --git a/jena-extras/jena-commonsrdf/src/test/resources/log4j2.properties b/jena-extras/jena-commonsrdf/src/test/resources/log4j2.properties
index 4dc512f..a1a1ef3 100644
--- a/jena-extras/jena-commonsrdf/src/test/resources/log4j2.properties
+++ b/jena-extras/jena-commonsrdf/src/test/resources/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-fuseki2/apache-jena-fuseki/log4j2.properties b/jena-fuseki2/apache-jena-fuseki/log4j2.properties
index a95d274..c8187ad 100644
--- a/jena-fuseki2/apache-jena-fuseki/log4j2.properties
+++ b/jena-fuseki2/apache-jena-fuseki/log4j2.properties
@@ -4,7 +4,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-fuseki2/jena-fuseki-access/src/test/resources/log4j2.properties b/jena-fuseki2/jena-fuseki-access/src/test/resources/log4j2.properties
index 02641a0..7c874ed 100644
--- a/jena-fuseki2/jena-fuseki-access/src/test/resources/log4j2.properties
+++ b/jena-fuseki2/jena-fuseki-access/src/test/resources/log4j2.properties
@@ -4,7 +4,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/system/FusekiLogging.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/system/FusekiLogging.java
index bfb10f4..546db42 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/system/FusekiLogging.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/system/FusekiLogging.java
@@ -18,15 +18,21 @@
package org.apache.jena.fuseki.system;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import java.nio.file.Path;
import org.apache.jena.atlas.io.IO;
import org.apache.jena.atlas.lib.StrUtils;
-import org.apache.jena.atlas.logging.LogCmd;
+import org.apache.jena.atlas.logging.LogCtlLog4j2;
import org.apache.jena.fuseki.Fuseki;
-import org.apache.logging.log4j.core.config.*;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.core.config.ConfigurationSource;
+import org.apache.logging.log4j.core.config.Configurator;
import org.apache.logging.log4j.core.config.properties.PropertiesConfigurationFactory;
public class FusekiLogging
@@ -208,7 +214,7 @@
, "filters = threshold"
, ""
, "filter.threshold.type = ThresholdFilter"
- , "filter.threshold.level = INFO"
+ , "filter.threshold.level = ALL"
, ""
, "appender.console.type = Console"
, "appender.console.name = OUT"
@@ -271,7 +277,7 @@
}
public static void resetLogging(String configString) {
- LogCmd.resetLogging(configString);
+ LogCtlLog4j2.resetLogging(configString);
}
}
diff --git a/jena-fuseki2/jena-fuseki-core/src/test/resources/log4j2.properties b/jena-fuseki2/jena-fuseki-core/src/test/resources/log4j2.properties
index 02641a0..7c874ed 100644
--- a/jena-fuseki2/jena-fuseki-core/src/test/resources/log4j2.properties
+++ b/jena-fuseki2/jena-fuseki-core/src/test/resources/log4j2.properties
@@ -4,7 +4,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-fuseki2/jena-fuseki-geosparql/src/test/resources/log4j2.properties b/jena-fuseki2/jena-fuseki-geosparql/src/test/resources/log4j2.properties
index 02641a0..7c874ed 100644
--- a/jena-fuseki2/jena-fuseki-geosparql/src/test/resources/log4j2.properties
+++ b/jena-fuseki2/jena-fuseki-geosparql/src/test/resources/log4j2.properties
@@ -4,7 +4,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-fuseki2/jena-fuseki-main/sparqler/log4j2-console.properties b/jena-fuseki2/jena-fuseki-main/sparqler/log4j2-console.properties
index 77b939e..4c0d028 100644
--- a/jena-fuseki2/jena-fuseki-main/sparqler/log4j2-console.properties
+++ b/jena-fuseki2/jena-fuseki-main/sparqler/log4j2-console.properties
@@ -4,7 +4,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-fuseki2/jena-fuseki-main/sparqler/log4j2-file.properties b/jena-fuseki2/jena-fuseki-main/sparqler/log4j2-file.properties
index 89db576..b16b373 100644
--- a/jena-fuseki2/jena-fuseki-main/sparqler/log4j2-file.properties
+++ b/jena-fuseki2/jena-fuseki-main/sparqler/log4j2-file.properties
@@ -4,7 +4,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
## appender.console.type = Console
## appender.console.name = OUT
diff --git a/jena-fuseki2/jena-fuseki-main/src/test/resources/log4j2.properties b/jena-fuseki2/jena-fuseki-main/src/test/resources/log4j2.properties
index e181b74..277a070 100644
--- a/jena-fuseki2/jena-fuseki-main/src/test/resources/log4j2.properties
+++ b/jena-fuseki2/jena-fuseki-main/src/test/resources/log4j2.properties
@@ -4,7 +4,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-fuseki2/jena-fuseki-server/pom.xml b/jena-fuseki2/jena-fuseki-server/pom.xml
index 05fdf58..88f1ec1 100644
--- a/jena-fuseki2/jena-fuseki-server/pom.xml
+++ b/jena-fuseki2/jena-fuseki-server/pom.xml
@@ -93,7 +93,7 @@
Multiple Log4j2Plugins.dat
jena-fuseki-server only pick up one Log4j2Plugins.dat (from log4j-core-2.13.2)
No need to run the transformer to merge them.
- If it becomes necssary, see: https://github.com/edwgiz/maven-shaded-log4j-transformer
+ If it becomes necessary, see: https://github.com/edwgiz/maven-shaded-log4j-transformer
-->
<transformers>
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdminAPI.java b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdminAPI.java
index d895a65..b453a51 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdminAPI.java
+++ b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdminAPI.java
@@ -34,6 +34,7 @@
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.jena.atlas.web.HttpException;
import org.apache.jena.atlas.web.TypedInputStream;
+import org.apache.jena.base.Sys;
import org.apache.jena.fuseki.webapp.FusekiWebapp;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.rdfconnection.RDFConnection;
@@ -61,7 +62,7 @@
@Test public void add_delete_api_3() throws Exception {
// Deleted mmap files on Windows does not go away until the JVM exits.
- if ( org.apache.jena.tdb2.sys.SystemTDB.isWindows )
+ if ( Sys.isWindows )
return;
testAddDelete("db_tdb2", "tdb2", true);
}
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/test/resources/log4j2.properties b/jena-fuseki2/jena-fuseki-webapp/src/test/resources/log4j2.properties
index f2f5424..b075f29 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/test/resources/log4j2.properties
+++ b/jena-fuseki2/jena-fuseki-webapp/src/test/resources/log4j2.properties
@@ -4,7 +4,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-integration-tests/src/test/resources/log4j2.properties b/jena-integration-tests/src/test/resources/log4j2.properties
index b7e3022..c91d712 100644
--- a/jena-integration-tests/src/test/resources/log4j2.properties
+++ b/jena-integration-tests/src/test/resources/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-permissions/src/test/resources/log4j2.properties b/jena-permissions/src/test/resources/log4j2.properties
index 635d781..1b5fd08 100644
--- a/jena-permissions/src/test/resources/log4j2.properties
+++ b/jena-permissions/src/test/resources/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-rdfconnection/src/test/resources/log4j2.properties b/jena-rdfconnection/src/test/resources/log4j2.properties
index 4dc512f..a1a1ef3 100644
--- a/jena-rdfconnection/src/test/resources/log4j2.properties
+++ b/jena-rdfconnection/src/test/resources/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-shacl/src/test/resources/log4j2.properties b/jena-shacl/src/test/resources/log4j2.properties
index 705dcdd..355cf93 100644
--- a/jena-shacl/src/test/resources/log4j2.properties
+++ b/jena-shacl/src/test/resources/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-spatial/src/test/resources/log4j2.properties b/jena-spatial/src/test/resources/log4j2.properties
index 4dc512f..a1a1ef3 100644
--- a/jena-spatial/src/test/resources/log4j2.properties
+++ b/jena-spatial/src/test/resources/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-tdb/src/test/resources/log4j2.properties b/jena-tdb/src/test/resources/log4j2.properties
index 4dc512f..a1a1ef3 100644
--- a/jena-tdb/src/test/resources/log4j2.properties
+++ b/jena-tdb/src/test/resources/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
diff --git a/jena-text/src/test/resources/log4j2.properties b/jena-text/src/test/resources/log4j2.properties
index 4dc512f..a1a1ef3 100644
--- a/jena-text/src/test/resources/log4j2.properties
+++ b/jena-text/src/test/resources/log4j2.properties
@@ -5,7 +5,7 @@
filters = threshold
filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
+filter.threshold.level = ALL
appender.console.type = Console
appender.console.name = OUT
