Use text block for log4j properties configuration
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 629fe0f..a94cc41 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
@@ -27,7 +27,6 @@
import org.apache.jena.atlas.io.IO;
import org.apache.jena.atlas.lib.Lib;
-import org.apache.jena.atlas.lib.StrUtils;
import org.apache.jena.atlas.logging.LogCtl;
import org.apache.jena.atlas.logging.LogCtlLog4j2;
import org.apache.jena.fuseki.Fuseki;
@@ -229,73 +228,72 @@
private static String log4j2setupFallback() {
// The logging file for Fuseki in Tomcat webapp is in "log4j2.properties" in the webapp root directory.
// This is used by command line Fuseki (full and main)
- // @formatter:off
- return StrUtils.strjoinNL
- ("## Plain output to stdout"
- , "status = error"
- , "name = FusekiLogging"
-// , ""
-// , "filters = threshold"
-// , "filter.threshold.type = ThresholdFilter"
-// , "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{yyyy-MM-dd HH:mm:ss}] %-10c{1} %-5p %m%n"
- , ""
- , "rootLogger.level = WARN"
- , "rootLogger.appenderRef.stdout.ref = OUT"
- , ""
- , "logger.jena.name = org.apache.jena"
- , "logger.jena.level = INFO"
- , ""
- , "logger.arq-exec.name = org.apache.jena.arq.exec"
- , "logger.arq-exec.level = INFO"
- , ""
- , "logger.riot.name = org.apache.jena.riot"
- , "logger.riot.level = INFO"
- , ""
- , "logger.fuseki.name = org.apache.jena.fuseki"
- , "logger.fuseki.level = INFO"
- , ""
- , "logger.fuseki-fuseki.name = org.apache.jena.fuseki.Fuseki"
- , "logger.fuseki-fuseki.level = INFO"
- ,""
- , "logger.fuseki-server.name = org.apache.jena.fuseki.Server"
- , "logger.fuseki-server.level = INFO"
- ,""
- , "logger.fuseki-config.name = org.apache.jena.fuseki.Config"
- , "logger.fuseki-config.level = INFO"
- ,""
- , "logger.fuseki-admin.name = org.apache.jena.fuseki.Admin"
- , "logger.fuseki-admin.level = INFO"
- ,""
- , "logger.jetty.name = org.eclipse.jetty"
- , "logger.jetty.level = WARN"
- , ""
- , "logger.apache-http.name = org.apache.http"
- , "logger.apache-http.level = WARN"
- , "logger.shiro.name = org.apache.shiro"
- , "logger.shiro.level = WARN"
- , ""
- , "# Hide bug in Shiro 1.5.0"
- , "logger.shiro-realm.name = org.apache.shiro.realm.text.IniRealm"
- , "logger.shiro-realm.level = ERROR"
- , ""
- , "# This goes out in NCSA format"
- , "appender.plain.type = Console"
- , "appender.plain.name = PLAIN"
- , "appender.plain.layout.type = PatternLayout"
- , "appender.plain.layout.pattern = %m%n"
- , ""
- , "logger.fuseki-request.name = org.apache.jena.fuseki.Request"
- , "logger.fuseki-request.additivity = false"
- , "logger.fuseki-request.level = OFF"
- , "logger.fuseki-request.appenderRef.plain.ref = PLAIN"
- );
- // @formatter:on
+
+// filters = threshold
+// filter.threshold.type = ThresholdFilter
+// filter.threshold.level = ALL
+
+ return """
+ ## Plain output to stdout
+ status = error
+ name = FusekiLogging
+ appender.console.type = Console
+ appender.console.name = OUT
+ appender.console.target = SYSTEM_OUT
+ appender.console.layout.type = PatternLayout
+ appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-10c{1} %-5p %m%n
+
+ rootLogger.level = WARN
+ rootLogger.appenderRef.stdout.ref = OUT
+
+ logger.jena.name = org.apache.jena
+ logger.jena.level = INFO
+
+ logger.arq-exec.name = org.apache.jena.arq.exec
+ logger.arq-exec.level = INFO
+
+ logger.riot.name = org.apache.jena.riot
+ logger.riot.level = INFO
+
+ logger.fuseki.name = org.apache.jena.fuseki
+ logger.fuseki.level = INFO
+
+ logger.fuseki-fuseki.name = org.apache.jena.fuseki.Fuseki
+ logger.fuseki-fuseki.level = INFO
+
+ logger.fuseki-server.name = org.apache.jena.fuseki.Server
+ logger.fuseki-server.level = INFO
+
+ logger.fuseki-config.name = org.apache.jena.fuseki.Config
+ logger.fuseki-config.level = INFO
+
+ logger.fuseki-admin.name = org.apache.jena.fuseki.Admin
+ logger.fuseki-admin.level = INFO
+
+ logger.jetty.name = org.eclipse.jetty
+ logger.jetty.level = WARN
+
+ logger.apache-http.name = org.apache.http
+ logger.apache-http.level = WARN
+ logger.shiro.name = org.apache.shiro
+ logger.shiro.level = WARN
+
+ # Hide bug in Shiro 1.5.0
+ logger.shiro-realm.name = org.apache.shiro.realm.text.IniRealm
+ logger.shiro-realm.level = ERROR
+
+ # This goes out in NCSA format
+ appender.plain.type = Console
+ appender.plain.name = PLAIN
+ appender.plain.layout.type = PatternLayout
+ appender.plain.layout.pattern = %m%n
+
+ logger.fuseki-request.name = org.apache.jena.fuseki.Request
+ logger.fuseki-request.additivity = false
+ logger.fuseki-request.level = OFF
+ logger.fuseki-request.appenderRef.plain.ref = PLAIN
+ );
+ """;
}
public static void resetLogging(String configString) {
