This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 956f58ee582650742329b09eaa0006ca1f8cdce3
Author: Dan Haywood <d...@haywood-associates.co.uk>
AuthorDate: Sun Aug 21 17:24:19 2022 +0100
adds extensions (but not fully tested)
---
webapp/pom.xml | 34 ++++++++++++
.../main/java/domainapp/webapp/AppManifest.java | 17 ++++++
webapp/src/main/resources/application.yml | 4 ++
.../main/resources/config/application.properties | 2 +-
webapp/src/main/resources/menubars.layout.xml | 60 ++++++++++++++++++++++
5 files changed, 116 insertions(+), 1 deletion(-)
diff --git a/webapp/pom.xml b/webapp/pom.xml
index c75235d..d1cff69 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -93,6 +93,40 @@
<artifactId>isis-extensions-flyway-impl</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-asciidoc-metamodel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-asciidoc-ui-wkt</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-sessionlog-persistence-jpa</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-audittrail-persistence-jpa</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-commandlog-persistence-jpa</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+
<artifactId>isis-extensions-executionlog-persistence-jpa</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+
<artifactId>isis-extensions-executionoutbox-persistence-jpa</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-quartz</artifactId>
diff --git a/webapp/src/main/java/domainapp/webapp/AppManifest.java
b/webapp/src/main/java/domainapp/webapp/AppManifest.java
index cfbfcda..60e0a00 100644
--- a/webapp/src/main/java/domainapp/webapp/AppManifest.java
+++ b/webapp/src/main/java/domainapp/webapp/AppManifest.java
@@ -9,11 +9,18 @@ import
org.apache.isis.applib.IsisModuleApplibChangeAndExecutionLoggers;
import org.apache.isis.applib.IsisModuleApplibMixins;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
+import
org.apache.isis.extensions.audittrail.jpa.IsisModuleExtAuditTrailPersistenceJpa;
+import
org.apache.isis.extensions.commandlog.jpa.IsisModuleExtCommandLogPersistenceJpa;
+import
org.apache.isis.extensions.executionlog.jpa.IsisModuleExtExecutionLogPersistenceJpa;
+import
org.apache.isis.extensions.executionoutbox.jpa.IsisModuleExtExecutionOutboxPersistenceJpa;
import org.apache.isis.extensions.flyway.impl.IsisModuleExtFlywayImpl;
+import
org.apache.isis.extensions.sessionlog.jpa.IsisModuleExtSessionLogPersistenceJpa;
import
org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclipselink;
import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
import org.apache.isis.testing.h2console.ui.IsisModuleTestingH2ConsoleUi;
+import
org.apache.isis.valuetypes.asciidoc.metamodel.IsisModuleValAsciidocMetaModel;
+import org.apache.isis.valuetypes.asciidoc.ui.wkt.IsisModuleValAsciidocUiWkt;
import
org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRestfulObjectsJaxrsResteasy4;
import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
@@ -38,6 +45,16 @@ import domainapp.webapp.quartz.QuartzModule;
IsisModuleExtFlywayImpl.class,
+ IsisModuleExtSessionLogPersistenceJpa.class,
+ IsisModuleExtAuditTrailPersistenceJpa.class,
+ IsisModuleExtCommandLogPersistenceJpa.class,
+ IsisModuleExtExecutionLogPersistenceJpa.class,
+ IsisModuleExtExecutionOutboxPersistenceJpa.class,
+
+ IsisModuleValAsciidocMetaModel.class, // for pretty rendering of DTO
objects such as CommandDto, InteractionDto
+ IsisModuleValAsciidocUiWkt.class,
+
+
ApplicationModule.class,
CustomModule.class,
QuartzModule.class,
diff --git a/webapp/src/main/resources/application.yml
b/webapp/src/main/resources/application.yml
index 01efdda..47bd995 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -38,6 +38,10 @@ isis:
po:
mode: disabled
+ extensions:
+ command-log:
+ publish-policy: only_if_system_changed
+
viewer:
wicket:
application:
diff --git a/webapp/src/main/resources/config/application.properties
b/webapp/src/main/resources/config/application.properties
index d516a75..7ea0a15 100644
--- a/webapp/src/main/resources/config/application.properties
+++ b/webapp/src/main/resources/config/application.properties
@@ -15,7 +15,7 @@
spring.datasource.url=jdbc:h2:mem:simple;DATABASE_TO_UPPER=false;IGNORECASE=TRUE
spring.datasource.driver-class-name=org.h2.Driver
isis.persistence.schema.create-schema-sql-template=CREATE SCHEMA IF NOT EXISTS
%s
-isis.persistence.schema.auto-create-schemas=simple
+isis.persistence.schema.auto-create-schemas=simple,isisExtAuditTrail,isisExtCommandLog,isisExtExecutionLog,isisExtExecutionOutbox,isisExtSessionLog
#eclipselink.weaving=true
eclipselink.deploy-on-startup=true
diff --git a/webapp/src/main/resources/menubars.layout.xml
b/webapp/src/main/resources/menubars.layout.xml
index 07d94b6..c4e823f 100644
--- a/webapp/src/main/resources/menubars.layout.xml
+++ b/webapp/src/main/resources/menubars.layout.xml
@@ -65,6 +65,66 @@
</mb3:serviceAction>
</mb3:section>
</mb3:menu>
+ <mb3:menu>
+ <mb3:named>Activity</mb3:named>
+ <mb3:section>
+ <mb3:named>Sessions</mb3:named>
+ <mb3:serviceAction id="activeSessions"
objectType="isis.ext.sessionlog.SessionLogMenu">
+
<cpt:logicalTypeName>isis.ext.sessionlog.SessionLogMenu</cpt:logicalTypeName>
+ </mb3:serviceAction>
+ <mb3:serviceAction id="findSessions"
objectType="isis.ext.sessionlog.SessionLogMenu">
+
<cpt:logicalTypeName>isis.ext.sessionlog.SessionLogMenu</cpt:logicalTypeName>
+ </mb3:serviceAction>
+ </mb3:section>
+ <mb3:section>
+ <mb3:named>Commands</mb3:named>
+ <mb3:serviceAction id="findCommandById"
objectType="isis.ext.commandLog.CommandLogMenu">
+
<cpt:logicalTypeName>isis.ext.commandLog.CommandLogMenu</cpt:logicalTypeName>
+ <cpt:named>Find Command By Id</cpt:named>
+ </mb3:serviceAction>
+ <mb3:serviceAction id="activeCommands"
objectType="isis.ext.commandLog.CommandLogMenu">
+
<cpt:logicalTypeName>isis.ext.commandLog.CommandLogMenu</cpt:logicalTypeName>
+ <cpt:named>Active Commands</cpt:named>
+ </mb3:serviceAction>
+ <mb3:serviceAction id="findCommands"
objectType="isis.ext.commandLog.CommandLogMenu">
+
<cpt:logicalTypeName>isis.ext.commandLog.CommandLogMenu</cpt:logicalTypeName>
+ <cpt:named>Find Commands</cpt:named>
+ </mb3:serviceAction>
+ <mb3:serviceAction id="truncateLog"
objectType="isis.ext.commandLog.CommandLogMenu">
+
<cpt:logicalTypeName>isis.ext.commandLog.CommandLogMenu</cpt:logicalTypeName>
+ <cpt:named>Truncate Log</cpt:named>
+ </mb3:serviceAction>
+ </mb3:section>
+ <mb3:section>
+ <mb3:named>Execution Log</mb3:named>
+ <mb3:serviceAction id="findMostRecent"
objectType="isis.ext.executionLog.ExecutionLogMenu">
+
<cpt:logicalTypeName>isis.ext.executionLog.ExecutionLogMenu</cpt:logicalTypeName>
+ <cpt:named>Find Most Recent</cpt:named>
+ </mb3:serviceAction>
+ <mb3:serviceAction id="findAll"
objectType="isis.ext.executionLog.ExecutionLogMenu">
+
<cpt:logicalTypeName>isis.ext.executionLog.ExecutionLogMenu</cpt:logicalTypeName>
+ <cpt:named>Find All</cpt:named>
+ </mb3:serviceAction>
+ </mb3:section>
+ <mb3:section>
+ <mb3:named>Audit Trail</mb3:named>
+ <mb3:serviceAction id="findAuditEntries"
objectType="isis.ext.audittrail.AuditTrailMenu">
+
<cpt:logicalTypeName>isis.ext.audittrail.AuditTrailMenu</cpt:logicalTypeName>
+ <cpt:named>Find Audit Entries</cpt:named>
+ </mb3:serviceAction>
+ </mb3:section>
+ <mb3:section>
+ <mb3:named>Execution Outbox</mb3:named>
+ <mb3:serviceAction id="findOldest"
objectType="isis.ext.executionOutbox.ExecutionOutboxMenu">
+
<cpt:logicalTypeName>isis.ext.executionOutbox.ExecutionOutboxMenu</cpt:logicalTypeName>
+ <cpt:named>Find Oldest</cpt:named>
+ </mb3:serviceAction>
+ <mb3:serviceAction id="findAll"
objectType="isis.ext.executionOutbox.ExecutionOutboxMenu">
+
<cpt:logicalTypeName>isis.ext.executionOutbox.ExecutionOutboxMenu</cpt:logicalTypeName>
+ <cpt:named>Find All</cpt:named>
+ </mb3:serviceAction>
+ </mb3:section>
+ </mb3:menu>
</mb3:secondary>
<mb3:tertiary>
<mb3:menu>
