You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/12/25 14:08:27 UTC
[12/50] isis git commit: ISIS-1243: reducing the logging verbosity
when boot up.
ISIS-1243: reducing the logging verbosity when boot up.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4286ef03
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4286ef03
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4286ef03
Branch: refs/heads/ISIS-1223-upgrade-to-wicket-7
Commit: 4286ef0381757d0cd8678893ef395a4bbc36f04b
Parents: 5320c0e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Dec 16 13:16:33 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Dec 16 13:16:33 2015 +0000
----------------------------------------------------------------------
.../opts/OptionHandlerSystemProperties.java | 2 +-
.../persistence/PersistenceSessionFactory.java | 21 +++++++++-----------
.../wicket/viewer/IsisWicketApplication.java | 4 +++-
3 files changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4286ef03/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerSystemProperties.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerSystemProperties.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerSystemProperties.java
index 881bb72..6513a6f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerSystemProperties.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerSystemProperties.java
@@ -61,7 +61,7 @@ public class OptionHandlerSystemProperties extends OptionHandlerAbstract {
@Override
public void primeConfigurationBuilder(final IsisConfigurationBuilder isisConfigurationBuilder) {
- LOG.info("priming configuration builder: " + additionalProperties.size() + " properties to prime");
+ LOG.debug("priming configuration builder: " + additionalProperties.size() + " properties to prime");
addConfigurationProperties(isisConfigurationBuilder, additionalProperties);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/4286ef03/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
index 5416e41..df138b0 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
@@ -19,16 +19,11 @@
package org.apache.isis.core.runtime.system.persistence;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
import java.util.Map;
import java.util.Set;
-import javax.annotation.PostConstruct;
import javax.jdo.PersistenceManagerFactory;
-import com.google.common.collect.Maps;
-
import org.datanucleus.PropertyNames;
import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
import org.slf4j.Logger;
@@ -115,24 +110,26 @@ public class PersistenceSessionFactory
if(connectionFactoryName != null) {
String connectionFactory2Name = props.get(PropertyNames.PROPERTY_CONNECTION_FACTORY2_NAME);
String transactionType = props.get("javax.jdo.option.TransactionType");
+ // extended logging
if(transactionType == null) {
- LOG.info("found non-JTA JNDI datasource (" + connectionFactoryName + ")");
+ LOG.info("found config properties to use non-JTA JNDI datasource (" + connectionFactoryName + ")");
if(connectionFactory2Name != null) {
- LOG.warn("found non-JTA JNDI datasource (" + connectionFactoryName + "); second '-nontx' JNDI datasource configured but will not be used (" + connectionFactory2Name +")");
+ LOG.warn("found config properties to use non-JTA JNDI datasource (" + connectionFactoryName + "); second '-nontx' JNDI datasource also configured but will not be used (" + connectionFactory2Name +")");
}
- } else
- LOG.info("found JTA JNDI datasource (" + connectionFactoryName + ")");
+ } else {
+ LOG.info("found config properties to use JTA JNDI datasource (" + connectionFactoryName + ")");
+ }
if(connectionFactory2Name == null) {
// JDO/DN itself will (probably) throw an exception
- LOG.error("found JTA JNDI datasource (" + connectionFactoryName + ") but second '-nontx' JNDI datasource *not* found");
+ LOG.error("found config properties to use JTA JNDI datasource (" + connectionFactoryName + ") but config properties for second '-nontx' JNDI datasource were *not* found");
} else {
- LOG.info("... and second '-nontx' JNDI datasource found; " + connectionFactory2Name);
+ LOG.info("... and config properties for second '-nontx' JNDI datasource also found; " + connectionFactory2Name);
}
// nothing further to do
return;
} else {
// use JDBC connection properties; put if not present
- LOG.info("did *not* find JNDI datasource; will use JDBC");
+ LOG.info("did *not* find config properties to use JNDI datasource; will use JDBC");
putIfNotPresent(props, "javax.jdo.option.ConnectionDriverName", "org.hsqldb.jdbcDriver");
putIfNotPresent(props, "javax.jdo.option.ConnectionURL", "jdbc:hsqldb:mem:test");
http://git-wip-us.apache.org/repos/asf/isis/blob/4286ef03/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 192851f..d43027b 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -463,7 +463,9 @@ public class IsisWicketApplication
// also support loading from init parameters (specifically, to support simplericity's jetty-console)
isisConfigurationBuilderPrimers.add(new OptionHandlerInitParameters(servletContext));
for (final IsisConfigurationBuilderPrimer isisConfigurationBuilderPrimer : isisConfigurationBuilderPrimers) {
- LOG.info("priming configurations for " + isisConfigurationBuilderPrimer);
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("priming configurations for " + isisConfigurationBuilderPrimer);
+ }
isisConfigurationBuilderPrimer.primeConfigurationBuilder(isisConfigurationBuilder);
}
}