Repository: jena Updated Branches: refs/heads/master feb04a10f -> acbbdd636
Skip potential "log4j.properties" if they look like test resources. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0ad52df4 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0ad52df4 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0ad52df4 Branch: refs/heads/master Commit: 0ad52df463faa574d82d11f5538389766d535a94 Parents: feb04a1 Author: Andy Seaborne <[email protected]> Authored: Thu Mar 5 13:11:25 2015 +0000 Committer: Andy Seaborne <[email protected]> Committed: Thu Mar 5 13:11:25 2015 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/jena/fuseki/FusekiLogging.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/0ad52df4/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 1add2b2..003b38d 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 @@ -43,7 +43,8 @@ public class FusekiLogging // 5/ Use Built in string /** Places for the log4j properties file at (3) */ - private static final String[] resourcesForLog4jProperties = { + private static final String[] resourcesForLog4jProperties = { + // Hmm - "log4j.properties", "org/apache/jena/fuseki/log4j.properties" } ; @@ -88,6 +89,12 @@ public class FusekiLogging logLogging("Fuseki logging - classpath %s", resourceName) ; URL url = Loader.getResource(resourceName) ; if ( url != null ) { + // Problem - test classes can be on the classpath (development mainly). + if ( url.toString().contains("-tests.jar") || url.toString().contains("test-classes") ) + url = null ; + } + + if ( url != null ) { PropertyConfigurator.configure(url) ; logLogging("Fuseki logging - found via classpath %s", url) ; System.setProperty("log4j.configuration", url.toString()) ;
