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:46 UTC
[isis-app-simpleapp] 02/07: 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-simpleapp.git
commit 06c7823283dfa1084ec94cca5072235f95be202f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 15:14:25 2019 +0000
uses H2Console (now an extension)
---
webapp/pom.xml | 4 ++--
webapp/src/main/java/domainapp/webapp/SimpleApp.java | 2 ++
.../java/domainapp/webapp/application/layout/menubars.layout.xml | 5 +----
webapp/src/main/webapp/WEB-INF/translations-es.po | 6 ------
webapp/src/main/webapp/WEB-INF/translations.po | 6 ------
5 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 01e57c5..b1bfa04 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -112,8 +112,8 @@
</dependency>
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-h2console</artifactId>
</dependency>
<!-- test -->
diff --git a/webapp/src/main/java/domainapp/webapp/SimpleApp.java b/webapp/src/main/java/domainapp/webapp/SimpleApp.java
index cfbf890..42080dc 100644
--- a/webapp/src/main/java/domainapp/webapp/SimpleApp.java
+++ b/webapp/src/main/java/domainapp/webapp/SimpleApp.java
@@ -4,6 +4,7 @@ import domainapp.webapp.application.ApplicationModule;
import domainapp.webapp.application.fixture.scenarios.DomainAppDemo;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
+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;
@@ -38,6 +39,7 @@ public class SimpleApp extends SpringBootServletInitializer {
IsisBootViewerWicket.class,
IsisExtFixturesModule.class,
+ IsisExtH2ConsoleModule.class,
ApplicationModule.class,
DomainAppDemo.class // register this fixture
diff --git a/webapp/src/main/java/domainapp/webapp/application/layout/menubars.layout.xml b/webapp/src/main/java/domainapp/webapp/application/layout/menubars.layout.xml
index fdb68ab..97f9aa5 100644
--- a/webapp/src/main/java/domainapp/webapp/application/layout/menubars.layout.xml
+++ b/webapp/src/main/java/domainapp/webapp/application/layout/menubars.layout.xml
@@ -72,12 +72,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>
diff --git a/webapp/src/main/webapp/WEB-INF/translations-es.po b/webapp/src/main/webapp/WEB-INF/translations-es.po
index d34ea00..a28ab1c 100644
--- a/webapp/src/main/webapp/WEB-INF/translations-es.po
+++ b/webapp/src/main/webapp/WEB-INF/translations-es.po
@@ -253,11 +253,6 @@ msgid "Format"
msgstr ""
-#: org.apache.isis.runtime.services.hsqldb.HsqlDbManagerMenu#hsqlDbManager()
-msgid "HSQL DB Manager"
-msgstr ""
-
-
#: domainapp.modules.simple.dom.impl.SimpleObject#datanucleusIdLong()
#: org.apache.isis.commons.internal.ioc.spring.BeanAdapterSpring#id
#: org.apache.isis.jdo.jdosupport.mixins.Persistable_datanucleusIdLong#prop()
@@ -431,7 +426,6 @@ msgstr ""
#: org.apache.isis.applib.services.metamodel.MetaModelServicesMenu
#: org.apache.isis.applib.services.swagger.SwaggerServiceMenu
#: org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts
-#: org.apache.isis.runtime.services.hsqldb.HsqlDbManagerMenu
#: org.apache.isis.runtime.services.i18n.po.TranslationServicePoMenu
msgid "Prototyping"
msgstr "Prototipo"
diff --git a/webapp/src/main/webapp/WEB-INF/translations.po b/webapp/src/main/webapp/WEB-INF/translations.po
index 54a8b43..bb7ca93 100644
--- a/webapp/src/main/webapp/WEB-INF/translations.po
+++ b/webapp/src/main/webapp/WEB-INF/translations.po
@@ -253,11 +253,6 @@ msgid "Format"
msgstr ""
-#: org.apache.isis.runtime.services.hsqldb.HsqlDbManagerMenu#hsqlDbManager()
-msgid "HSQL DB Manager"
-msgstr ""
-
-
#: domainapp.modules.simple.dom.impl.SimpleObject#datanucleusIdLong()
#: org.apache.isis.commons.internal.ioc.spring.BeanAdapterSpring#id
#: org.apache.isis.jdo.jdosupport.mixins.Persistable_datanucleusIdLong#prop()
@@ -431,7 +426,6 @@ msgstr ""
#: org.apache.isis.applib.services.metamodel.MetaModelServicesMenu
#: org.apache.isis.applib.services.swagger.SwaggerServiceMenu
#: org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts
-#: org.apache.isis.runtime.services.hsqldb.HsqlDbManagerMenu
#: org.apache.isis.runtime.services.i18n.po.TranslationServicePoMenu
msgid "Prototyping"
msgstr ""