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/09/20 05:18:18 UTC
[isis] 02/03: ISIS-1895: cleanup experimental config keys
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit fd31b74a1f558859d6a898c7b20c63f6569c77fb
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 20 06:45:07 2018 +0200
ISIS-1895: cleanup experimental config keys
Task-Url: https://issues.apache.org/jira/browse/ISIS-1895
---
.../org/apache/isis/core/webapp/modules/WebModule.java | 14 ++++++++++----
.../apache/isis/core/webapp/modules/WebModule_Wicket.java | 11 +++--------
.../isis/viewer/wicket/viewer/IsisWicketApplication.java | 6 +-----
3 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule.java
index 04233c1..eb7dcfd 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule.java
@@ -101,6 +101,12 @@ public interface WebModule {
static final class ContextUtil {
/**
+ * This key was deprecated from config, but we still use it for reference. It is auto-populated
+ * such that it can be looked up, to see what viewers have been discovered by the framework.
+ */
+ private final static String ISIS_VIEWERS = "isis.viewers";
+
+ /**
* Tell other modules that a bootstrapper is present.
* @param ctx
* @param bootstrapper
@@ -123,13 +129,13 @@ public interface WebModule {
* @param viewerName
*/
public static void registerViewer(ServletContext ctx, String viewerName) {
- String viewers = (String) ctx.getAttribute("isis.viewers");
+ String viewers = (String) ctx.getAttribute(ISIS_VIEWERS);
if(isEmpty(viewers)) {
viewers = viewerName;
} else {
viewers = viewers + "," + viewerName;
}
- ctx.setAttribute("isis.viewers", viewers);
+ ctx.setAttribute(ISIS_VIEWERS, viewers);
}
/**
@@ -137,9 +143,9 @@ public interface WebModule {
* @param ctx
*/
public static void commitViewers(ServletContext ctx) {
- String viewers = (String) ctx.getAttribute("isis.viewers");
+ String viewers = (String) ctx.getAttribute(ISIS_VIEWERS);
if(!isEmpty(viewers)) {
- ctx.setInitParameter("isis.viewers", viewers);
+ ctx.setInitParameter(ISIS_VIEWERS, viewers);
}
}
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 1ed1d79..1b286db 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
@@ -45,7 +45,7 @@ final class WebModule_Wicket implements WebModule {
private final static String WICKET_FILTER_NAME = "WicketFilter";
private String pathConfigValue;
- private String modeConfigValue;
+ private String deploymentMode;
private String appConfigValue;
@Override
@@ -60,8 +60,6 @@ final class WebModule_Wicket implements WebModule {
return;
}
-
-
final IsisWebAppConfigProvider configProvider = IsisWebAppConfigProvider.getInstance();
pathConfigValue =
configProvider.peekAtOrDefault(ctx, "isis.viewer.wicket.basePath", "/wicket");
@@ -69,10 +67,8 @@ final class WebModule_Wicket implements WebModule {
{
//TODO[ahuber] once this class is moved to viewer-wicket-impl, we can utilize
// IsisWicketApplication's method of determining the deployment code.
- final String modeFromEnvironment = "true".equalsIgnoreCase(System.getenv("PROTOTYPING"))
+ deploymentMode = "true".equalsIgnoreCase(System.getenv("PROTOTYPING"))
? "development" : "deployment";
- modeConfigValue =
- configProvider.peekAtOrDefault(ctx, "isis.viewer.wicket.mode", modeFromEnvironment);
}
appConfigValue =
@@ -86,7 +82,6 @@ final class WebModule_Wicket implements WebModule {
@Override
public ServletContextListener init(ServletContext ctx) throws ServletException {
- ctx.setInitParameter("isis.viewers", "wicket,restfulobjects");
final Filter filter;
try {
@@ -140,7 +135,7 @@ final class WebModule_Wicket implements WebModule {
}
private String getWicketMode() {
- return requireNonNull(modeConfigValue, "This web-module needs to be prepared first.");
+ return requireNonNull(deploymentMode, "This web-module needs to be prepared first.");
}
private String getApplicationClassName() {
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 81bc9b0..92ba594 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
@@ -549,17 +549,13 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
// in order of highest precedence first
final String deploymentTypeConfigValue = configuration.getString("isis.deploymentType");
- final String wicketModeConfigValue = configuration.getString("isis.viewer.wicket.mode");
final String modeFromEnvironment = "true".equalsIgnoreCase(System.getenv("PROTOTYPING"))
? "PROTOTYPING" : null;
// --
-
final boolean isPrototype;
- if(wicketModeConfigValue!=null) {
- isPrototype = "development".equalsIgnoreCase(wicketModeConfigValue);
- } else if(deploymentTypeConfigValue!=null) {
+ if(deploymentTypeConfigValue!=null) {
final DeploymentType deploymentType = DeploymentType.lookup(deploymentTypeConfigValue);
isPrototype = !deploymentType.getDeploymentCategory().isProduction();
} else if(modeFromEnvironment!=null) {