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 2018/09/27 17:00:39 UTC
[1/2] jena git commit: Clarify reading a JUL configuation
Repository: jena
Updated Branches:
refs/heads/master 20220c951 -> 87e70b051
Clarify reading a JUL configuation
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/30feb28b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/30feb28b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/30feb28b
Branch: refs/heads/master
Commit: 30feb28b3649ef73cecdc5caaefe7a5b8914820c
Parents: 20220c9
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Sep 27 17:46:37 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Sep 27 17:46:37 2018 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/atlas/logging/LogCtl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/30feb28b/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 3c327fa..442af7f 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
@@ -316,7 +316,7 @@ public class LogCtl {
setJavaLoggingDft();
}
- private static void readConfiguration(InputStream details) throws Exception {
+ private static void readJavaLoggingConfiguration(InputStream details) throws Exception {
System.setProperty(JUL_PROPERTY, "set");
java.util.logging.LogManager.getLogManager().readConfiguration(details) ;
}
@@ -326,7 +326,7 @@ public class LogCtl {
InputStream in = LogCtl.class.getClassLoader().getResourceAsStream(resourceName);
if ( in != null ) {
try {
- readConfiguration(in) ;
+ readJavaLoggingConfiguration(in) ;
return true;
} catch (Exception ex) {
throw new AtlasException(ex) ;
@@ -339,7 +339,7 @@ public class LogCtl {
try {
InputStream details = new FileInputStream(file) ;
details = new BufferedInputStream(details) ;
- readConfiguration(details) ;
+ readJavaLoggingConfiguration(details) ;
} catch (Exception ex) {
throw new AtlasException(ex) ;
}
@@ -348,7 +348,7 @@ public class LogCtl {
public static void setJavaLoggingDft() {
try {
InputStream details = new ByteArrayInputStream(defaultProperties.getBytes("UTF-8")) ;
- readConfiguration(details) ;
+ readJavaLoggingConfiguration(details) ;
} catch (Exception ex) {
throw new AtlasException(ex) ;
}
[2/2] jena git commit: JENA-1595: Require log4j for cmds and
distribution
Posted by an...@apache.org.
JENA-1595: Require log4j for cmds and distribution
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/87e70b05
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/87e70b05
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/87e70b05
Branch: refs/heads/master
Commit: 87e70b05144d2863b2de116e72f8c1607d02c6b2
Parents: 30feb28
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Sep 27 18:00:33 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Sep 27 18:00:33 2018 +0100
----------------------------------------------------------------------
apache-jena/pom.xml | 14 ++++++++++++++
jena-cmds/pom.xml | 8 ++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/87e70b05/apache-jena/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena/pom.xml b/apache-jena/pom.xml
index 1e12df3..d2de116 100644
--- a/apache-jena/pom.xml
+++ b/apache-jena/pom.xml
@@ -151,6 +151,20 @@
<version>3.9.0-SNAPSHOT</version>
</dependency>
+ <!-- Require a logging implementation -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <!-- Logging -->
+
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-cmds</artifactId>
http://git-wip-us.apache.org/repos/asf/jena/blob/87e70b05/jena-cmds/pom.xml
----------------------------------------------------------------------
diff --git a/jena-cmds/pom.xml b/jena-cmds/pom.xml
index 4b36bae..73ad144 100644
--- a/jena-cmds/pom.xml
+++ b/jena-cmds/pom.xml
@@ -67,16 +67,20 @@
<artifactId>slf4j-api</artifactId>
</dependency>
- <!-- Require a logging implementation -->
+ <!-- Require a logging implementation
+ It is <scope>test</scope> from the parent otherwise.
+ -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- </dependency>
+ <scope>runtime</scope>
+ </dependency>
<!-- Testing -->
<dependency>