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 2015/07/23 11:12:17 UTC
[1/2] jena git commit: Minor tidyup
Repository: jena
Updated Branches:
refs/heads/master d38ba281b -> 9d2b415ff
Minor tidyup
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/edc9d88b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/edc9d88b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/edc9d88b
Branch: refs/heads/master
Commit: edc9d88b1779ca819eabf270d2fb099283168c14
Parents: d38ba28
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Jul 23 10:09:49 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Jul 23 10:09:49 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/atlas/logging/LogCtl.java | 45 ++++++++++----------
1 file changed, 23 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/edc9d88b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
----------------------------------------------------------------------
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 218e0a8..f8e4b61 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
@@ -165,34 +165,35 @@ public class LogCtl {
}
private static String log4Jsetup = StrUtils.strjoinNL
- ( "## Plain output to stdout"
- ,"log4j.appender.jena.plain=org.apache.log4j.ConsoleAppender"
- ,"log4j.appender.jena.plain.target=System.out"
- ,"log4j.appender.jena.plain.layout=org.apache.log4j.PatternLayout"
- ,"log4j.appender.jena.plain.layout.ConversionPattern=%m%n"
+ ( "## Command default log4j setup"
- ,"## Plain output with level, to stderr"
- ,"log4j.appender.jena.plainlevel=org.apache.log4j.ConsoleAppender"
- ,"log4j.appender.jena.plainlevel.target=System.err"
- ,"log4j.appender.jena.plainlevel.layout=org.apache.log4j.PatternLayout"
- ,"log4j.appender.jena.plainlevel.layout.ConversionPattern=%-5p %m%n"
-
- ,"## Everything"
- ,"log4j.rootLogger=INFO, jena.plainlevel"
- ,"log4j.logger.com.hp.hpl.jena=WARN"
- ,"log4j.logger.org.apache.jena=WARN"
- ,"log4j.logger.org.apache.jena.tdb.loader=INFO"
-
- , "## Parser output"
- , "log4j.additivity.org.apache.jena.riot=false"
- , "log4j.logger.org.apache.jena.riot=INFO, jena.plainlevel"
+ ,"## Plain output with level, to stderr"
+ ,"log4j.appender.jena.plainlevel=org.apache.log4j.ConsoleAppender"
+ ,"log4j.appender.jena.plainlevel.target=System.err"
+ ,"log4j.appender.jena.plainlevel.layout=org.apache.log4j.PatternLayout"
+ ,"log4j.appender.jena.plainlevel.layout.ConversionPattern=%-5p %m%n"
+
+// , "## Plain output to stdout"
+// ,"log4j.appender.jena.plain=org.apache.log4j.ConsoleAppender"
+// ,"log4j.appender.jena.plain.target=System.out"
+// ,"log4j.appender.jena.plain.layout=org.apache.log4j.PatternLayout"
+// ,"log4j.appender.jena.plain.layout.ConversionPattern=%m%n"
+
+ ,"## Everything"
+ ,"log4j.rootLogger=INFO, jena.plainlevel"
+ ,"log4j.logger.com.hp.hpl.jena=WARN"
+ ,"log4j.logger.org.apache.jena=WARN"
+ ,"log4j.logger.org.apache.jena.tdb.loader=INFO"
+
+ , "## Parser output"
+ , "log4j.additivity.org.apache.jena.riot=false"
+ , "log4j.logger.org.apache.jena.riot=INFO, jena.plainlevel"
) ;
// ---- java.util.logging - because that's always present.
static String defaultProperties = StrUtils.strjoinNL
(
// Handlers - output
- // All (comma
- // separated)
+ // All (comma separated)
// "handlers=java.util.logging.ConsoleHandler,org.apache.jena.atlas.logging.java.ConsoleHandlerStdout",
// Atlas.
[2/2] jena git commit: JENA-996: Errors and warnings from commands to
stderr
Posted by an...@apache.org.
JENA-996: Errors and warnings from commands to stderr
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9d2b415f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9d2b415f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9d2b415f
Branch: refs/heads/master
Commit: 9d2b415ff1aab3936610d187e254e35f2a6b48a4
Parents: edc9d88
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Jul 23 10:10:23 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Jul 23 10:10:23 2015 +0100
----------------------------------------------------------------------
apache-jena/jena-log4j.properties | 29 +++++------------------------
1 file changed, 5 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9d2b415f/apache-jena/jena-log4j.properties
----------------------------------------------------------------------
diff --git a/apache-jena/jena-log4j.properties b/apache-jena/jena-log4j.properties
index 2040adf..bc2ecf4 100644
--- a/apache-jena/jena-log4j.properties
+++ b/apache-jena/jena-log4j.properties
@@ -15,41 +15,22 @@
# limitations under the License.
log4j.rootLogger=INFO, stdlog
-## log4j.rootLogger=INFO, FusekiFileLog
log4j.appender.stdlog=org.apache.log4j.ConsoleAppender
-## log4j.appender.stdlog.target=System.err
+log4j.appender.stdlog.target=System.err
log4j.appender.stdlog.layout=org.apache.log4j.PatternLayout
log4j.appender.stdlog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %-20c{1} :: %m%n
-## # Example for file logging.
-## log4j.appender.FusekiFileLog=org.apache.log4j.DailyRollingFileAppender
-## log4j.appender.FusekiFileLog.DatePattern='.'yyyy-MM-dd
-## log4j.appender.FusekiFileLog.File=fuseki-log
-## log4j.appender.FusekiFileLog.layout=org.apache.log4j.PatternLayout
-## log4j.appender.FusekiFileLog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %-20c{1} :: %m%n
-
-# Jetty - Fuseki catches Jetty errors and reports them.
-log4j.logger.org.eclipse.jetty=FATAL
-
-# Execution logging
+## Execution logging
log4j.logger.org.apache.jena.arq.info=INFO
log4j.logger.org.apache.jena.arq.exec=INFO
-# TDB loader
+## TDB loader
log4j.logger.org.apache.jena.tdb.loader=INFO
-# TDB syslog.
+## TDB syslog.
log4j.logger.TDB=INFO
-# Everything else in Jena
+## Everything else in Jena
log4j.logger.org.apache.jena=WARN
log4j.logger.org.openjena=WARN
log4j.logger.org.openjena.riot=INFO
-
-# Fuseki
-# Server log.
-log4j.logger.org.openjena.fuseki.Server=INFO
-# Request log.
-log4j.logger.org.openjena.fuseki.Fuseki=INFO
-# Internal logs
-log4j.logger.org.openjena.fuseki=INFO