You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/09/30 07:37:44 UTC
[isis] 02/02: ISIS-2086: renames #getConfiguration() to
#getConfigurationLegacy() in WebModuleContext
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2086
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9ef7e6d58eb52678224771251a1c8499180ffc94
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Sep 30 08:36:17 2019 +0100
ISIS-2086: renames #getConfiguration() to #getConfigurationLegacy() in WebModuleContext
---
.../java/org/apache/isis/webapp/modules/WebModuleContext.java | 8 ++++----
.../isis/viewer/restfulobjects/WebModuleRestfulObjects.java | 2 +-
.../org/apache/isis/viewer/wicket/viewer/WebModuleWicket.java | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
index f518922..76bbb70 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
@@ -57,16 +57,16 @@ public class WebModuleContext {
private final StringBuilder viewers = new StringBuilder();
private final StringBuilder protectedPath = new StringBuilder();
- private final IsisConfigurationLegacy isisConfiguration;
+ private final IsisConfigurationLegacy isisConfigurationLegacy;
private List<WebModule> webModules;
private final List<ServletContextListener> activeListeners = new ArrayList<>();
public WebModuleContext() {
- this.isisConfiguration = _Config.getConfiguration();
+ this.isisConfigurationLegacy = _Config.getConfiguration();
}
- public IsisConfigurationLegacy getConfiguration() {
- return isisConfiguration;
+ public IsisConfigurationLegacy getConfigurationLegacy() {
+ return isisConfigurationLegacy;
}
public ServletContext getServletContext() {
diff --git a/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/WebModuleRestfulObjects.java b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/WebModuleRestfulObjects.java
index 1533bf0..dac19dd 100644
--- a/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/WebModuleRestfulObjects.java
+++ b/core/viewer-restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/WebModuleRestfulObjects.java
@@ -68,7 +68,7 @@ public final class WebModuleRestfulObjects implements WebModule {
}
// try to fetch restfulPath from config else fallback to default
- final String restfulPath = ctx.getConfiguration()
+ final String restfulPath = ctx.getConfigurationLegacy()
.getString(KEY_RESTFUL_BASE_PATH, KEY_RESTFUL_BASE_PATH_DEFAULT);
putRestfulPath(restfulPath);
diff --git a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/WebModuleWicket.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/WebModuleWicket.java
index 2d01fb6..01e5881 100644
--- a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/WebModuleWicket.java
+++ b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/WebModuleWicket.java
@@ -67,14 +67,14 @@ public final class WebModuleWicket implements WebModule {
}
pathConfigValue =
- ctx.getConfiguration().getString("isis.viewer.wicket.basePath", "/wicket");
+ ctx.getConfigurationLegacy().getString("isis.viewer.wicket.basePath", "/wicket");
deploymentMode = _Context.isPrototyping()
? "development"
: "deployment";
appConfigValue =
- ctx.getConfiguration().getString("isis.viewer.wicket.app",
+ ctx.getConfigurationLegacy().getString("isis.viewer.wicket.app",
"org.apache.isis.viewer.wicket.viewer.IsisWicketApplication");
ctx.setHasBootstrapper();