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/12/04 15:17:40 UTC

[isis-app-helloworld] 02/04: uses H2Console (now an extension)

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git

commit 5e6c2484968480bf64a90a02f7511bfd7c2e18cb
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 15:14:46 2019 +0000

    uses H2Console (now an extension)
---
 pom.xml                                                        | 4 ++--
 src/main/java/domainapp/webapp/HelloWorldApp.java              | 3 +++
 src/main/java/domainapp/webapp/application/menubars.layout.xml | 5 +----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6c74f27..7110e91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,8 +63,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
+			<groupId>org.apache.isis.extensions</groupId>
+			<artifactId>isis-extensions-h2console</artifactId>
 		</dependency>
 
 
diff --git a/src/main/java/domainapp/webapp/HelloWorldApp.java b/src/main/java/domainapp/webapp/HelloWorldApp.java
index 15b71c5..6028945 100644
--- a/src/main/java/domainapp/webapp/HelloWorldApp.java
+++ b/src/main/java/domainapp/webapp/HelloWorldApp.java
@@ -3,6 +3,7 @@ package domainapp.webapp;
 import domainapp.modules.hello.HelloWorldModule;
 
 import org.apache.isis.config.IsisPresets;
+import org.apache.isis.extensions.h2console.IsisExtH2ConsoleModule;
 import org.apache.isis.jdo.IsisBootDataNucleus;
 import org.apache.isis.runtime.spring.IsisBoot;
 import org.apache.isis.security.shiro.IsisBootSecurityShiro;
@@ -30,6 +31,8 @@ public class HelloWorldApp extends SpringBootServletInitializer {
             IsisBootDataNucleus.class,
             IsisBootViewerRestfulObjects.class,
             IsisBootViewerWicket.class,
+
+            IsisExtH2ConsoleModule.class,
             HelloWorldModule.class
     })
     public static class AppManifest {
diff --git a/src/main/java/domainapp/webapp/application/menubars.layout.xml b/src/main/java/domainapp/webapp/application/menubars.layout.xml
index 8409833..0c02509 100644
--- a/src/main/java/domainapp/webapp/application/menubars.layout.xml
+++ b/src/main/java/domainapp/webapp/application/menubars.layout.xml
@@ -75,12 +75,9 @@
                 </mb3:serviceAction>
             </mb3:section>
             <mb3:section>
-                <mb3:serviceAction objectType="isisApplib.H2ManagerMenu" id="openH2Console">
+                <mb3:serviceAction objectType="isisExtH2Console.H2ManagerMenu" id="openH2Console">
                     <cpt:named>H2 Console</cpt:named>
                 </mb3:serviceAction>
-                <mb3:serviceAction objectType="isisApplib.HsqlDbManagerMenu" id="hsqlDbManager">
-                    <cpt:named>HSQL DB Manager</cpt:named>
-                </mb3:serviceAction>
             </mb3:section>
         </mb3:menu>
     </mb3:secondary>