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 2020/01/17 09:57:07 UTC
[isis] branch master updated: ISIS-2158: fixes config:
liveReloadUrl not initialized
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 e683321 ISIS-2158: fixes config: liveReloadUrl not initialized
e683321 is described below
commit e683321ec28a6fe4cd8bf06d20c4aa5dde6739b1
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jan 17 10:56:58 2020 +0100
ISIS-2158: fixes config: liveReloadUrl not initialized
---
.../src/main/java/org/apache/isis/core/config/IsisConfiguration.java | 5 +----
examples/demo/src/main/java/demoapp/webapp/DemoApp.java | 2 ++
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index ebf2835..f80aa27 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -30,7 +30,6 @@ import java.util.regex.Pattern;
import javax.inject.Inject;
import javax.inject.Named;
-import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@@ -39,8 +38,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.validation.annotation.Validated;
-import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.i18n.TranslationService;
@@ -1385,7 +1382,7 @@ public class IsisConfiguration {
private DialogMode dialogModeForMenu = DialogMode.MODAL;
- private Optional<String> liveReloadUrl;
+ private Optional<String> liveReloadUrl = Optional.empty();
private int maxTitleLengthInTables = 12;
diff --git a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
index 64c3a42..6fa288b 100644
--- a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
+++ b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
@@ -41,6 +41,7 @@ import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanE
import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
+import org.apache.isis.extensions.viewer.wicket.exceldownload.ui.IsisModuleExtExcelDownloadUi;
import org.apache.isis.incubator.model.metamodel.IsisModuleIncModelMetaModel;
import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
@@ -109,6 +110,7 @@ public class DemoApp extends SpringBootServletInitializer {
IsisModuleTestingFixturesApplib.class,
IsisModuleIncModelMetaModel.class, // @Model support (incubator)
+ IsisModuleExtExcelDownloadUi.class, // allows for collection download as excel
LibraryPreloadingService.class // just a performance enhancement