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 2021/05/19 08:23:07 UTC
[isis] branch master updated: ISIS-2620: ConfService,
show spring profiles in environment tab
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
The following commit(s) were added to refs/heads/master by this push:
new d0a4083 ISIS-2620: ConfService, show spring profiles in environment tab
d0a4083 is described below
commit d0a40834bcc8c10955c62442c6c603a1367534e3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed May 19 10:22:54 2021 +0200
ISIS-2620: ConfService, show spring profiles in environment tab
---
.../webapp/confmenu/ConfigurationViewServiceDefault.java | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/confmenu/ConfigurationViewServiceDefault.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/confmenu/ConfigurationViewServiceDefault.java
index f7b9bb0..ef60778 100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/confmenu/ConfigurationViewServiceDefault.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/confmenu/ConfigurationViewServiceDefault.java
@@ -76,7 +76,6 @@ implements
private final IsisConfiguration configuration;
private final DataSourceIntrospectionService datasourceInfoService;
private final List<WebModule> webModules;
- //private final List<DataSource> dataSources;
// @org.springframework.beans.factory.annotation.Value("${spring.profiles.active}")
// private String activeProfiles;
@@ -143,7 +142,7 @@ implements
final Map<String, ConfigurationProperty> map = _Maps.newTreeMap();
add("Isis Version", configuration.getViewer().getWicket().getApplication().getVersion(), map);
add("Deployment Type", systemEnvironment.getDeploymentType().name(), map);
- add("Unit Testing", ""+systemEnvironment.isUnitTesting(), map);
+ //add("Unit Testing", ""+systemEnvironment.isUnitTesting(), map);
addSystemProperty("java.version", map);
addSystemProperty("java.vm.name", map);
@@ -151,6 +150,12 @@ implements
addSystemProperty("java.vm.version", map);
addSystemProperty("java.vm.info", map);
+ add("Active Spring Profiles",
+ Can.ofArray(springEnvironment.getActiveProfiles())
+ .stream()
+ .collect(Collectors.joining(", ")),
+ map);
+
add("Web Modules", Can.ofCollection(webModules)
.stream()
.map(WebModule::getName)
@@ -170,13 +175,6 @@ implements
final Map<String, ConfigurationProperty> map = _Maps.newTreeMap();
if(isShowConfigurationProperties()) {
-
- val activeProfiles = Can.ofArray(springEnvironment.getActiveProfiles())
- .stream()
- .collect(Collectors.joining(", "));
-
- add("Active Spring Profiles", activeProfiles, map);
-
configProps.getIsis().forEach((k, v)->add("isis." + k, v, map));
configProps.getResteasy().forEach((k, v)->add("resteasy." + k, v, map));
configProps.getDatanucleus().forEach((k, v)->add("datanucleus." + k, v, map));