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 2019/12/12 20:45:35 UTC

[isis] branch master updated: ISIS-2177: fixes demo-app (failed to launch)

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 583aa6e  ISIS-2177: fixes demo-app (failed to launch)
583aa6e is described below

commit 583aa6e0c95604ac64bcc94c04e79f754cd02270
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 12 21:45:26 2019 +0100

    ISIS-2177: fixes demo-app (failed to launch)
---
 examples/demo/src/main/java/demoapp/webapp/DemoApp.java                | 1 +
 .../src/main/java/demoapp/webapp/{application => }/menubars.layout.xml | 0
 examples/demo/src/main/resources/application.yml                       | 3 +--
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
index 61fe273..a3e135d 100644
--- a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
+++ b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
@@ -76,6 +76,7 @@ public class DemoApp extends SpringBootServletInitializer {
         @PropertySource(IsisPresets.HsqlDbInMemory),
         @PropertySource(IsisPresets.NoTranslations),
         @PropertySource(IsisPresets.SilenceWicket),
+        @PropertySource(IsisPresets.DataNucleusAutoCreate),
     })
     @Import({
         IsisModuleSpringBoot.class,
diff --git a/examples/demo/src/main/java/demoapp/webapp/application/menubars.layout.xml b/examples/demo/src/main/java/demoapp/webapp/menubars.layout.xml
similarity index 100%
rename from examples/demo/src/main/java/demoapp/webapp/application/menubars.layout.xml
rename to examples/demo/src/main/java/demoapp/webapp/menubars.layout.xml
diff --git a/examples/demo/src/main/resources/application.yml b/examples/demo/src/main/resources/application.yml
index 813467a..9a4761b 100644
--- a/examples/demo/src/main/resources/application.yml
+++ b/examples/demo/src/main/resources/application.yml
@@ -49,7 +49,7 @@ isis:
   viewer:
     wicket:
       application:
-        menubars-layout-xml: domainapp/webapp/application/menubars.layout.xml
+        menubars-layout-xml: demoapp/webapp/menubars.layout.xml
         favicon-url: /images/favicon.png
         brand-logo-header: /images/gift_48.png
         brand-logo-signin: /images/gift_256.png
@@ -87,7 +87,6 @@ isis:
         # to DataNucleus, and must use camelCase rather than kebab-case
         datanucleus:
           schema:
-            autoCreateTables: true
             validateTables: true
             validateConstraints: true