[isis] branch master updated: ISIS-2925: resurrect DemoAppVaadin

[ahuber]

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 b8a87b4ad7 ISIS-2925: resurrect DemoAppVaadin
b8a87b4ad7 is described below

commit b8a87b4ad7b6b0e482bc7f9a70257bebbfecbea3
Author: andi-huber <ahu...@apache.org>
AuthorDate: Mon Oct 31 09:15:27 2022 +0100

    ISIS-2925: resurrect DemoAppVaadin
---
 .../java/demoapp/webapp/vaadin/DemoAppVaadin.java  | 36 +++++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git 
a/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java 
b/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
index 2a9fb5359d..dad306bc56 100644
--- 
a/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
+++ 
b/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
@@ -23,10 +23,20 @@ import 
org.springframework.boot.autoconfigure.SpringBootApplication;
 import 
org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Import;
 
+import org.apache.causeway.commons.internal.os._OsUtil;
+import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.config.util.SpringProfileUtil;
+import 
org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;
 import org.apache.causeway.extensions.sse.wicket.CausewayModuleExtSseWicket;
 import 
org.apache.causeway.incubator.viewer.vaadin.viewer.CausewayModuleIncViewerVaadinViewer;
+import 
org.apache.causeway.valuetypes.asciidoc.metamodel.CausewayModuleValAsciidocMetaModel;
+import 
org.apache.causeway.valuetypes.asciidoc.persistence.jdo.dn.CausewayModuleValAsciidocPersistenceJdoDn;
 import 
org.apache.causeway.valuetypes.asciidoc.ui.vaa.CausewayModuleValAsciidocUiVaa;
 import 
org.apache.causeway.valuetypes.asciidoc.ui.wkt.CausewayModuleValAsciidocUiWkt;
+import 
org.apache.causeway.valuetypes.markdown.metamodel.CausewayModuleValMarkdownMetaModel;
+import 
org.apache.causeway.valuetypes.markdown.persistence.jdo.dn.CausewayModuleValMarkdownPersistenceJdoDn;
+import 
org.apache.causeway.valuetypes.vega.metamodel.CausewayModuleValVegaMetaModel;
+import 
org.apache.causeway.valuetypes.vega.persistence.jdo.dn.CausewayModuleValVegaPersistenceJdoDn;
 import 
org.apache.causeway.viewer.wicket.viewer.CausewayModuleViewerWicketViewer;
 
 import demoapp.dom.DemoModuleCommon;
@@ -40,10 +50,22 @@ import demoapp.web.DemoAppManifestJdo;
     DemoModuleCommon.class,
     DemoAppManifestJdo.class,
 
+    // Metamodel
+    CausewayModuleValAsciidocMetaModel.class,
+    CausewayModuleValMarkdownMetaModel.class,
+    CausewayModuleValVegaMetaModel.class,
+    //TODO CausewayModuleExtFullCalendarVaadin.class,
+
     // INCUBATING
     CausewayModuleIncViewerVaadinViewer.class, // vaadin viewer
     CausewayModuleValAsciidocUiVaa.class, // ascii-doc rendering support (for 
Vaadin)
 
+    // Persistence (JDO/DN5)
+    CausewayModuleValAsciidocPersistenceJdoDn.class,
+    CausewayModuleValMarkdownPersistenceJdoDn.class,
+    CausewayModuleValVegaPersistenceJdoDn.class,
+
+
     // WICKET INTEGRATION ... to allow side by side comparison
     CausewayModuleViewerWicketViewer.class, // wicket viewer
     CausewayModuleExtSseWicket.class, // server sent events
@@ -60,12 +82,16 @@ public class DemoAppVaadin extends 
SpringBootServletInitializer {
      */
     public static void main(final String[] args) {
 
-//        CausewayPresets.logging(InteractionServiceDefault.class, "debug");
-//        CausewayPresets.logging(VaadinAuthenticationHandler.class, "debug");
-//        CausewayPresets.logging(CausewayServletForVaadin.class, "debug");
-//        CausewayPresets.logging(_Probe.class, "debug"); // enable debug 
entry logging
+        // activates when sys-env THERE_CAN_BE_ONLY_ONE=true
+        _OsUtil.thereCanBeOnlyOne();
+
+        CausewayPresets.prototyping();
+        //CausewayPresets.logging(WebRequestCycleForCauseway.class, "debug");
+
+        SpringProfileUtil.removeActiveProfile("demo-jpa"); // just in case
+        SpringProfileUtil.addActiveProfile("demo-jdo");
 
-        System.setProperty("spring.profiles.active", "demo-jdo");
+        CausewayModuleExtCommandLogApplib.honorSystemEnvironment();
 
         SpringApplication.run(new Class[] { DemoAppVaadin.class }, args);
     }