You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jc...@apache.org on 2013/12/05 14:55:54 UTC
git commit: ISIS-623: lower default logging level of jdo;
IsisSytemForTest uses loggin.properties to override
Updated Branches:
refs/heads/master 48c9e60b0 -> ce5671b1b
ISIS-623: lower default logging level of jdo; IsisSytemForTest uses loggin.properties to override
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ce5671b1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ce5671b1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ce5671b1
Branch: refs/heads/master
Commit: ce5671b1bf882192e206a26cb2f4e2d4766fc304
Parents: 48c9e60
Author: Jeroen van der Wal <je...@stromboli.it>
Authored: Thu Dec 5 14:54:53 2013 +0100
Committer: Jeroen van der Wal <je...@stromboli.it>
Committed: Thu Dec 5 14:54:53 2013 +0100
----------------------------------------------------------------------
.../DataNucleusPersistenceMechanismInstaller.java | 2 +-
.../core/integtestsupport/IsisSystemForTest.java | 11 +++++++++--
.../runtime/logging/IsisLoggingConfigurer.java | 18 +++++++++++++++---
3 files changed, 25 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ce5671b1/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
index bf4eb15..1fb0a88 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
@@ -174,7 +174,7 @@ public class DataNucleusPersistenceMechanismInstaller extends PersistenceMechani
LOG.info("did *not* find JNDI datasource; will use JDBC");
putIfNotPresent(props, "javax.jdo.option.ConnectionDriverName", "org.hsqldb.jdbcDriver");
- putIfNotPresent(props, "javax.jdo.option.ConnectionURL", "jdbc:hsqldb:mem:test;hsqldb.sqllog=3");
+ putIfNotPresent(props, "javax.jdo.option.ConnectionURL", "jdbc:hsqldb:mem:test");
putIfNotPresent(props, "javax.jdo.option.ConnectionUserName", "sa");
putIfNotPresent(props, "javax.jdo.option.ConnectionPassword", "");
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ce5671b1/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
index 4e51163..8122490 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
@@ -50,6 +50,7 @@ import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.fixtures.FixturesInstallerDelegate;
import org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstaller;
+import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
import org.apache.isis.core.runtime.persistence.objectstore.ObjectStoreSpi;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.context.IsisContext;
@@ -254,9 +255,12 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
}
////////////////////////////////////////////////////////////
- // logging
+ // level
////////////////////////////////////////////////////////////
+ /**
+ * The level to use for the root logger if fallback (ie a <tt>logging.properties</tt> file cannot be found).
+ */
public org.apache.log4j.Level getLevel() {
return level;
}
@@ -283,7 +287,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
}
private void setUpSystem(FireListeners fireListeners) throws Exception {
- org.apache.log4j.Logger.getRootLogger().setLevel(getLevel());
+
boolean firstTime = isisSystem == null;
if(fireListeners.shouldFire()) {
@@ -291,6 +295,9 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
}
if(firstTime) {
+ IsisLoggingConfigurer isisLoggingConfigurer = new IsisLoggingConfigurer(getLevel());
+ isisLoggingConfigurer.configureLogging(".", new String[]{});
+
isisSystem = createIsisSystem(services);
isisSystem.init();
IsisContext.closeSession();
http://git-wip-us.apache.org/repos/asf/isis/blob/ce5671b1/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java
----------------------------------------------------------------------
diff --git a/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java
index 9235ab2..b5b3c71 100644
--- a/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java
+++ b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java
@@ -26,12 +26,24 @@ import java.io.InputStream;
import java.util.Properties;
import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
import org.apache.log4j.PatternLayout;
public class IsisLoggingConfigurer {
+ private final Level rootLoggerLevelIfFallback;
+
private boolean loggingSetup;
+ public IsisLoggingConfigurer() {
+ this(org.apache.log4j.Level.WARN);
+ }
+
+ public IsisLoggingConfigurer(Level rootLoggerLevelIfFallback) {
+ this.rootLoggerLevelIfFallback = rootLoggerLevelIfFallback;
+ }
+
+
/**
* As per {@link #configureLogging(String)}.
*
@@ -65,7 +77,7 @@ public class IsisLoggingConfigurer {
* {@link Level#WARN warning}, a typical {@link PatternLayout} and logging
* to the {@link ConsoleAppender console}.
*/
- private static void configureLogging(final String configDirectory) {
+ private void configureLogging(final String configDirectory) {
final Properties properties = new Properties();
final String path = configDirectory + "/" + LoggingConstants.LOGGING_CONFIG_FILE;
FileInputStream inStream = null;
@@ -109,11 +121,11 @@ public class IsisLoggingConfigurer {
}
}
- private static void configureFallbackLogging() {
+ private void configureFallbackLogging() {
final org.apache.log4j.Layout layout = new org.apache.log4j.PatternLayout("%-5r [%-25.25c{1} %-10.10t %-5.5p] %m%n");
final org.apache.log4j.Appender appender = new org.apache.log4j.ConsoleAppender(layout);
org.apache.log4j.BasicConfigurator.configure(appender);
- org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.WARN);
+ org.apache.log4j.Logger.getRootLogger().setLevel(rootLoggerLevelIfFallback);
org.apache.log4j.Logger.getLogger("ui").setLevel(org.apache.log4j.Level.OFF);
}