This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch ISIS-3110 in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9a41bd9c20bd0968b1c7032b609680c20a601184 Author: Dan Haywood <[email protected]> AuthorDate: Thu Aug 4 12:33:58 2022 +0100 ISIS-3110: extends demo to reference new modules --- examples/demo/domain/pom.xml | 25 +++++++++++- examples/demo/pom.xml | 44 ++++++++++++++++++---- examples/demo/web/pom.xml | 4 +- .../main/java/demoapp/web/DemoAppManifestJdo.java | 14 +++++-- .../main/java/demoapp/web/DemoAppManifestJpa.java | 9 ++++- examples/demo/wicket/jdo/pom.xml | 23 ----------- examples/demo/wicket/jpa/pom.xml | 24 ------------ 7 files changed, 81 insertions(+), 62 deletions(-) diff --git a/examples/demo/domain/pom.xml b/examples/demo/domain/pom.xml index 1efa11e03c..ee64899dd7 100644 --- a/examples/demo/domain/pom.xml +++ b/examples/demo/domain/pom.xml @@ -18,7 +18,6 @@ <groupId>org.apache.isis.examples.apps</groupId> <artifactId>demo-parent</artifactId> <version>2.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <artifactId>demo-domain</artifactId> @@ -104,6 +103,18 @@ <groupId>org.apache.isis.extensions</groupId> <artifactId>isis-extensions-sessionlog-persistence-jdo</artifactId> </dependency> + <dependency> + <groupId>org.apache.isis.extensions</groupId> + <artifactId>isis-extensions-executionlog-persistence-jdo</artifactId> + </dependency> + <dependency> + <groupId>org.apache.isis.extensions</groupId> + <artifactId>isis-extensions-executionoutbox-persistence-jdo</artifactId> + </dependency> + <dependency> + <groupId>org.apache.isis.extensions</groupId> + <artifactId>isis-extensions-audittrail-persistence-jdo</artifactId> + </dependency> <dependency> <groupId>org.apache.isis.valuetypes</groupId> @@ -128,6 +139,18 @@ <groupId>org.apache.isis.extensions</groupId> <artifactId>isis-extensions-sessionlog-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.apache.isis.extensions</groupId> + <artifactId>isis-extensions-audittrail-persistence-jpa</artifactId> + </dependency> <dependency> <groupId>org.apache.isis.valuetypes</groupId> diff --git a/examples/demo/pom.xml b/examples/demo/pom.xml index 7f4daf0bfa..cc04132d55 100644 --- a/examples/demo/pom.xml +++ b/examples/demo/pom.xml @@ -175,6 +175,36 @@ <scope>import</scope> </dependency> + <dependency> + <groupId>org.apache.isis.examples.apps</groupId> + <artifactId>demo-domain</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.isis.examples.apps</groupId> + <artifactId>demo-web</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.isis.examples.apps</groupId> + <artifactId>demo-wicket-common</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.isis.examples.apps</groupId> + <artifactId>demo-wicket-jpa</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.isis.examples.apps</groupId> + <artifactId>demo-wicket-jdo</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </dependencyManagement> @@ -186,10 +216,6 @@ </dependency> </dependencies> - <modules> - <module>domain</module> - </modules> - <profiles> <profile> <id>module-examples-demo-wicket</id> @@ -199,6 +225,7 @@ </property> </activation> <modules> + <module>domain</module> <module>web</module> <module>wicket/common</module> <module>wicket/jdo</module> @@ -213,19 +240,21 @@ </property> </activation> <modules> + <module>domain</module> <module>web</module> <module>wicket/common</module> <module>wicket/jpa-and-graphql</module> </modules> </profile> <profile> - <id>demo-vaadin</id> + <id>modules-example-demo-vaadin</id> <activation> <property> - <name>demo-vaadin</name> + <name>modules-example-demo-vaadin</name> </property> </activation> <modules> + <module>domain</module> <module>web</module> <module>wicket/common</module> <module>wicket/jdo</module> @@ -233,13 +262,14 @@ </modules> </profile> <profile> - <id>demo-javafx</id> + <id>modules-example-demo-javafx</id> <activation> <property> <name>demo-javafx</name> </property> </activation> <modules> + <module>domain</module> <module>javafx</module> </modules> </profile> diff --git a/examples/demo/web/pom.xml b/examples/demo/web/pom.xml index 7cf4a91170..e95d66f26b 100644 --- a/examples/demo/web/pom.xml +++ b/examples/demo/web/pom.xml @@ -46,10 +46,10 @@ <dependency> <groupId>org.apache.isis.examples.apps</groupId> <artifactId>demo-domain</artifactId> - <version>${project.version}</version> - <type>jar</type> </dependency> + + <!-- CORS --> <dependency> diff --git a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestJdo.java b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestJdo.java index 9969d86e27..0b4c8c6713 100644 --- a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestJdo.java +++ b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestJdo.java @@ -18,12 +18,16 @@ */ package demoapp.web; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; +import org.apache.isis.extensions.audittrail.jdo.IsisModuleExtAuditTrailPersistenceJdo; import org.apache.isis.extensions.commandlog.jdo.IsisModuleExtCommandLogPersistenceJdo; +import org.apache.isis.extensions.executionlog.jdo.IsisModuleExtExecutionLogPersistenceJdo; +import org.apache.isis.extensions.executionoutbox.jdo.IsisModuleExtExecutionOutboxPersistenceJdo; import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + import demoapp.dom.DemoModuleJdo; /** @@ -36,7 +40,11 @@ import demoapp.dom.DemoModuleJdo; // Security Manager Extension (secman) IsisModuleExtSecmanPersistenceJdo.class, - IsisModuleExtCommandLogPersistenceJdo.class + IsisModuleExtCommandLogPersistenceJdo.class, + IsisModuleExtExecutionLogPersistenceJdo.class, + IsisModuleExtExecutionOutboxPersistenceJdo.class, + IsisModuleExtAuditTrailPersistenceJdo.class, + }) public class DemoAppManifestJdo { diff --git a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestJpa.java b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestJpa.java index 930ce4aa26..ecd4188761 100644 --- a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestJpa.java +++ b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifestJpa.java @@ -18,8 +18,10 @@ */ package demoapp.web; -import org.apache.isis.extensions.commandlog.jdo.IsisModuleExtCommandLogPersistenceJdo; +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.secman.jpa.IsisModuleExtSecmanPersistenceJpa; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -36,7 +38,10 @@ import demoapp.dom.DemoModuleJpa; // Security Manager Extension (secman) IsisModuleExtSecmanPersistenceJpa.class, - IsisModuleExtCommandLogPersistenceJpa.class + IsisModuleExtCommandLogPersistenceJpa.class, + IsisModuleExtExecutionLogPersistenceJpa.class, + IsisModuleExtExecutionOutboxPersistenceJpa.class, + IsisModuleExtAuditTrailPersistenceJpa.class, }) public class DemoAppManifestJpa { diff --git a/examples/demo/wicket/jdo/pom.xml b/examples/demo/wicket/jdo/pom.xml index 550d91ba87..f9080d2f95 100644 --- a/examples/demo/wicket/jdo/pom.xml +++ b/examples/demo/wicket/jdo/pom.xml @@ -50,29 +50,6 @@ <artifactId>isis-persistence-jdo-datanucleus</artifactId> </dependency> - <!-- Extensions --> - <dependency> - <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-secman-persistence-jdo</artifactId> - </dependency> - <dependency> - <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-commandlog-persistence-jdo</artifactId> - </dependency> - <dependency> - <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-sessionlog-persistence-jdo</artifactId> - </dependency> - - <!-- Value types --> - <dependency> - <groupId>org.apache.isis.valuetypes</groupId> - <artifactId>isis-valuetypes-asciidoc-persistence-jdo</artifactId> - </dependency> - <dependency> - <groupId>org.apache.isis.valuetypes</groupId> - <artifactId>isis-valuetypes-markdown-persistence-jdo</artifactId> - </dependency> </dependencies> diff --git a/examples/demo/wicket/jpa/pom.xml b/examples/demo/wicket/jpa/pom.xml index d7e7c26ea5..a988a8b457 100644 --- a/examples/demo/wicket/jpa/pom.xml +++ b/examples/demo/wicket/jpa/pom.xml @@ -50,30 +50,6 @@ <artifactId>isis-persistence-jpa-eclipselink</artifactId> </dependency> - <!-- Extensions --> - <dependency> - <groupId>org.apache.isis.extensions</groupId> - <artifactId>isis-extensions-secman-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-sessionlog-persistence-jpa</artifactId> - </dependency> - - <!-- Value types --> - <dependency> - <groupId>org.apache.isis.valuetypes</groupId> - <artifactId>isis-valuetypes-asciidoc-persistence-jpa</artifactId> - </dependency> - <dependency> - <groupId>org.apache.isis.valuetypes</groupId> - <artifactId>isis-valuetypes-markdown-persistence-jpa</artifactId> - </dependency> - </dependencies> <profiles>
