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 2022/08/21 16:24:35 UTC
[isis-app-simpleapp] branch jpa-with-extensions created (now 4ba48da)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch jpa-with-extensions
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
at 4ba48da adds extensions (but not fully tested)
This branch includes the following new commits:
new 721a33d doc fix
new d8594f5 changes h2 config, ignore case; add p6spy logging.
new 4ba48da adds extensions (but not fully tested)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[isis-app-simpleapp] 03/03: adds extensions (but not fully tested)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa-with-extensions
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 4ba48da7b973735985460d25c782031712702fc0
Author: Dan Haywood <da...@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>
[isis-app-simpleapp] 02/03: changes h2 config, ignore case; add p6spy logging.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa-with-extensions
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit d8594f5dfab848d7042795c5fd612d655dbe5f27
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 21 17:23:55 2022 +0100
changes h2 config, ignore case; add p6spy logging.
---
.../java/domainapp/modules/simple/dom/so/SimpleObject.java | 4 ++--
webapp/pom.xml | 6 ++++++
webapp/src/main/resources/config/application.properties | 10 +++++++++-
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
index 7c61b9e..6d5bd43 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
@@ -53,7 +53,7 @@ import domainapp.modules.simple.types.Notes;
@Table(
schema= SimpleModule.SCHEMA,
uniqueConstraints = {
- @UniqueConstraint(name = "SimpleObject__name__UNQ", columnNames = {"NAME"})
+ @UniqueConstraint(name = "SimpleObject__name__UNQ", columnNames = {"name"})
}
)
@NamedQueries({
@@ -101,7 +101,7 @@ public class SimpleObject implements Comparable<SimpleObject> {
@Title
@Name
- @Column(length = Name.MAX_LEN, nullable = false)
+ @Column(length = Name.MAX_LEN, nullable = false, name = "name")
@Getter @Setter @ToString.Include
@PropertyLayout(fieldSetId = LayoutConstants.FieldSetId.IDENTITY, sequence = "1")
private String name;
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 7bf3d96..c75235d 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -113,6 +113,12 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>com.github.gavlyukovskiy</groupId>
+ <artifactId>p6spy-spring-boot-starter</artifactId>
+ <version>1.8.0</version>
+ </dependency>
</dependencies>
<profiles>
diff --git a/webapp/src/main/resources/config/application.properties b/webapp/src/main/resources/config/application.properties
index 8a7dcce..d516a75 100644
--- a/webapp/src/main/resources/config/application.properties
+++ b/webapp/src/main/resources/config/application.properties
@@ -11,7 +11,7 @@
spring.flyway.enabled=false
spring.sql.init.platform=h2
-spring.datasource.url=jdbc:h2:mem:simple;DATABASE_TO_UPPER=false
+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
@@ -29,3 +29,11 @@ eclipselink.jpa.upper-case-column-names=false
#isis.testing.fixtures.initial-script = domainapp.webapp.application.fixture.scenarios.DomainAppDemo
+# Register P6LogFactory to log JDBC events
+decorator.datasource.p6spy.enable-logging=true
+
+# Use com.p6spy.engine.spy.appender.MultiLineFormat instead of com.p6spy.engine.spy.appender.SingleLineFormat
+decorator.datasource.p6spy.multiline=true
+
+# Use logging for default listeners [slf4j, sysout, file, custom]
+decorator.datasource.p6spy.logging=sysout
[isis-app-simpleapp] 01/03: doc fix
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa-with-extensions
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 721a33d85fafa944a9ba9ede4cbc20b37a198cbb
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 21 17:20:55 2022 +0100
doc fix
---
README.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.adoc b/README.adoc
index dd032fe..5e8d9b5 100644
--- a/README.adoc
+++ b/README.adoc
@@ -65,7 +65,7 @@ export REVISION=... #<.>
export DOCKER_REGISTRY_USERNAME #<.>
export DOCKER_REGISTRY_PASSWORD #<.>
-mvn -pl webapp jib:build
+mvn -pl webapp -Ddocker jib:build
----
<.> used as the image tag
<.> Docker Hub registry username