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 2016/08/04 10:31:45 UTC
[8/8] jena git commit: JENA-1220: Related tidying up.
JENA-1220: Related tidying up.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/52efaadb
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/52efaadb
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/52efaadb
Branch: refs/heads/master
Commit: 52efaadb4689444470ebf6ab3f63cb526cac7212
Parents: e2a1bd5
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 4 10:53:42 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 4 10:57:01 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/fuseki/FusekiLogging.java | 19 +++++++++++++++++--
.../org/apache/jena/fuseki/server/FusekiEnv.java | 2 +-
.../java/org/apache/jena/fuseki/TS_Fuseki.java | 4 ++--
3 files changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/52efaadb/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
index 744e236..a315f69 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
@@ -30,9 +30,9 @@ import org.apache.log4j.helpers.Loader ;
public class FusekiLogging
{
- // This class must not have static constants, or otherwise not use "Fuseki.*"
+ // This class must not have static constants, or otherwise not "Fuseki.*"
// or any class else where that might kick off logging. Otherwise, the
- // setLogging is poiintless (it's already set).
+ // setLogging is pointless (it's already set).
// PlanB - reinitialize logging regardless on first call.
// Set logging.
@@ -51,8 +51,23 @@ public class FusekiLogging
private static final boolean LogLogging = false ;
private static boolean loggingInitialized = false ;
+ private static boolean allowLoggingReset = true ;
+ /**
+ * Switch off logging setting.
+ * Used by the embedded server so that the application's
+ * logging setup is not overwritten.
+ */
+ public static synchronized void allowLoggingReset(boolean value) {
+ allowLoggingReset = value ;
+ }
+
+ /** Set up logging.
+ * This is mainly for the standalone server.
+ */
public static synchronized void setLogging() {
+ if ( ! allowLoggingReset )
+ return ;
if ( loggingInitialized )
return ;
loggingInitialized = true ;
http://git-wip-us.apache.org/repos/asf/jena/blob/52efaadb/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiEnv.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiEnv.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiEnv.java
index 603fbe7..cb91ede 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiEnv.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiEnv.java
@@ -69,7 +69,7 @@ public class FusekiEnv {
public enum INIT {
// Default values of FUSEKI_HOME, and FUSEKI_BASE.
WAR (null, "/etc/fuseki") ,
- EMBEDDED (".", "run") ,
+ EMBEDDED (null, null) ,
STANDALONE (".", "run") ,
TEST ("src/main/webapp", "target/run") ,
UNSET (null, null) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/52efaadb/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
index cdbb629..26de2a1 100644
--- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
+++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
@@ -56,14 +56,14 @@ public class TS_Fuseki extends ServerTest
FileOps.ensureDir(FusekiTestHome);
FileOps.clearDirectory(FusekiTestHome);
System.setProperty("FUSEKI_HOME", FusekiTestHome) ;
- FusekiEnv.setEnvironment() ;
FusekiLogging.setLogging();
+ FusekiEnv.setEnvironment() ;
org.apache.log4j.Level WARN1 = org.apache.log4j.Level.WARN ;
java.util.logging.Level WARN2 = java.util.logging.Level.WARNING ;
// Occasionally log4j.properties gets out of step.
- LogCtl.logLevel("org.apache.shiro", WARN1, WARN2);
+ LogCtl.logLevel("org.apache.shiro", WARN1, WARN2);
LogCtl.logLevel("org.eclipse.jetty", WARN1, WARN2);
LogCtl.logLevel(Fuseki.serverLogName, WARN1, WARN2);