You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/08/30 12:38:59 UTC
[isis] 03/04: ISIS-1895: aligning log output
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c45b457c035ed80bf86fdc52c9c004695542c65d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Aug 30 07:51:26 2018 +0200
ISIS-1895: aligning log output
Task-Url: https://issues.apache.org/jira/browse/ISIS-1895
---
.../java/org/apache/isis/core/webapp/IsisWebAppContextListener.java | 4 ++--
.../isis/core/webapp/modules/WebModule_LogOnExceptionLogger.java | 2 +-
.../java/org/apache/isis/core/webapp/modules/WebModule_NoWicket.java | 2 +-
.../java/org/apache/isis/core/webapp/modules/WebModule_RestEasy.java | 2 +-
.../java/org/apache/isis/core/webapp/modules/WebModule_Shiro.java | 2 +-
.../java/org/apache/isis/core/webapp/modules/WebModule_Wicket.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppContextListener.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppContextListener.java
index 99a596a..8991c64 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppContextListener.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppContextListener.java
@@ -77,11 +77,11 @@ public class IsisWebAppContextListener implements ServletContextListener {
// -- HELPER
private void addListener(ServletContext context, WebModule module) {
- LOG.info(String.format("ServletContext: adding '%s'", module.getName()));
+ LOG.info(String.format("Setup ServletContext, adding WebModule '%s'", module.getName()));
try {
acceptIfPresent(module.init(context), activeListeners::add);
} catch (ServletException e) {
- LOG.error(String.format("Failed to add '%s' to the ServletContext.", module.getName()), e);
+ LOG.error(String.format("Failed to add WebModule '%s' to the ServletContext.", module.getName()), e);
}
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_LogOnExceptionLogger.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_LogOnExceptionLogger.java
index 379c3e8..3f18e7e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_LogOnExceptionLogger.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_LogOnExceptionLogger.java
@@ -46,7 +46,7 @@ final class WebModule_LogOnExceptionLogger implements WebModule {
@Override
public String getName() {
- return "Wicket WebFilter";
+ return "LogOn Exception Logger";
}
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_NoWicket.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_NoWicket.java
index 463eb74..aea5509 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_NoWicket.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_NoWicket.java
@@ -32,7 +32,7 @@ final class WebModule_NoWicket implements WebModule {
@Override
public String getName() {
- return "No-Wicket WebListener";
+ return "No-Wicket";
}
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_RestEasy.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_RestEasy.java
index 0612f05..3ad268c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_RestEasy.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_RestEasy.java
@@ -44,7 +44,7 @@ final class WebModule_RestEasy implements WebModule {
@Override
public String getName() {
- return "RestEasy WebListener";
+ return "RestEasy";
}
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_Shiro.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_Shiro.java
index 8550f4d..48cdadd 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_Shiro.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_Shiro.java
@@ -44,7 +44,7 @@ final class WebModule_Shiro implements WebModule {
@Override
public String getName() {
- return "Shiro WebListener & WebFilter";
+ return "Shiro";
}
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_Wicket.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_Wicket.java
index e2bb66b..b406a97 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_Wicket.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_Wicket.java
@@ -43,7 +43,7 @@ final class WebModule_Wicket implements WebModule {
@Override
public String getName() {
- return "Wicket WebFilter";
+ return "Wicket";
}
@Override