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/10/02 07:21:59 UTC
[isis-app-simpleapp] branch release-2.0.0-M8-RC3-jdo created (now a6754fa)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch release-2.0.0-M8-RC3-jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
at a6754fa Merge branch 'release-2.0.0-M8-RC3-jpa' into release-2.0.0-M8-RC3-jdo
This branch includes the following new commits:
new 76e8e2f Revert "ISIS-2965 - updates to 2.0.0-M8 (jdo)"
new 8de7773 Merge branch 'release-2.0.0-M8-RC2-jdo' into jdo-SNAPSHOT
new 2fc6678 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
new 1ace424 - updates to 2.0.0-M8 (jdo)
new cd84276 ISIS-2965: updates layout.xml for new actions of command log, execution log, audit trail
new a6754fa Merge branch 'release-2.0.0-M8-RC3-jpa' into release-2.0.0-M8-RC3-jdo
The 6 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] 06/06: Merge branch 'release-2.0.0-M8-RC3-jpa' into release-2.0.0-M8-RC3-jdo
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M8-RC3-jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit a6754fad919f4d0fa064d999fa5c51450a8065a2
Merge: cd84276 b0bc607
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Oct 2 08:21:19 2022 +0100
Merge branch 'release-2.0.0-M8-RC3-jpa' into release-2.0.0-M8-RC3-jdo
[isis-app-simpleapp] 04/06: - updates to 2.0.0-M8 (jdo)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M8-RC3-jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 1ace4246875f8d4cb0baadbbf479f93ac866c805
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Oct 2 08:10:42 2022 +0100
- updates to 2.0.0-M8 (jdo)
---
module-simple-tests/pom.xml | 2 +-
module-simple/pom.xml | 2 +-
pom.xml | 4 ++--
webapp-tests/pom.xml | 2 +-
webapp/pom.xml | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/module-simple-tests/pom.xml b/module-simple-tests/pom.xml
index a7a48a4..3bff9b1 100644
--- a/module-simple-tests/pom.xml
+++ b/module-simple-tests/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M8</version>
</parent>
<artifactId>simpleapp-jdo-module-simple-tests</artifactId>
diff --git a/module-simple/pom.xml b/module-simple/pom.xml
index 972a257..1a13b64 100644
--- a/module-simple/pom.xml
+++ b/module-simple/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M8</version>
</parent>
<artifactId>simpleapp-jdo-module-simple</artifactId>
diff --git a/pom.xml b/pom.xml
index f4f6378..19b48b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.apache.isis.app</groupId>
<artifactId>isis-app-starter-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M8</version>
<relativePath/>
</parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M8</version>
<name>SimpleApp (JDO) - Parent</name>
diff --git a/webapp-tests/pom.xml b/webapp-tests/pom.xml
index 6642f56..1290bcc 100644
--- a/webapp-tests/pom.xml
+++ b/webapp-tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M8</version>
</parent>
<artifactId>simpleapp-jdo-webapp-tests</artifactId>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index a74f573..834cdee 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-M8</version>
</parent>
<artifactId>simpleapp-jdo-webapp</artifactId>
[isis-app-simpleapp] 05/06: ISIS-2965: updates layout.xml for new actions of command log, execution log, audit trail
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M8-RC3-jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit cd84276076fa62a0c91dbaf3d7d9db4b29703ed4
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Oct 2 08:05:15 2022 +0100
ISIS-2965: updates layout.xml for new actions of command log, execution log, audit trail
(cherry picked from commit b0bc607422cae7408768f82cc7995554ba42e924)
---
webapp/src/main/resources/menubars.layout.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/webapp/src/main/resources/menubars.layout.xml b/webapp/src/main/resources/menubars.layout.xml
index ee66e5a..6ffb468 100644
--- a/webapp/src/main/resources/menubars.layout.xml
+++ b/webapp/src/main/resources/menubars.layout.xml
@@ -80,13 +80,14 @@
<mb3:section>
<mb3:named>Execution Log</mb3:named>
<mb3:serviceAction id="findMostRecent" objectType="isis.ext.executionLog.ExecutionLogMenu"/>
+ <mb3:serviceAction id="findExecutions" objectType="isis.ext.executionLog.ExecutionLogMenu"/>
<mb3:serviceAction id="findAll" objectType="isis.ext.executionLog.ExecutionLogMenu"/>
</mb3:section>
<mb3:section>
<mb3:named>Audit Trail</mb3:named>
- <mb3:serviceAction id="findMostRecent" objectType="isis.ext.audittrail.AuditTrailMenu"/>
- <mb3:serviceAction id="findAuditEntries" objectType="isis.ext.audittrail.AuditTrailMenu"/>
- <mb3:serviceAction id="findAll" objectType="isis.ext.audittrail.AuditTrailMenu"/>
+ <mb3:serviceAction id="findMostRecent" objectType="isis.ext.auditTrail.AuditTrailMenu"/>
+ <mb3:serviceAction id="findAuditEntries" objectType="isis.ext.auditTrail.AuditTrailMenu"/>
+ <mb3:serviceAction id="findAll" objectType="isis.ext.auditTrail.AuditTrailMenu"/>
</mb3:section>
<mb3:section>
<mb3:named>Execution Outbox</mb3:named>
[isis-app-simpleapp] 03/06: Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M8-RC3-jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 2fc66785c7b3ddf381dc4279140b6da0a4e19ee0
Merge: 8de7773 48a8aea
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Oct 2 07:53:41 2022 +0100
Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
[isis-app-simpleapp] 01/06: Revert "ISIS-2965 - updates to 2.0.0-M8 (jdo)"
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M8-RC3-jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 76e8e2f7fce08a8b3bbe4f4f09969c040a413803
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Oct 2 07:50:55 2022 +0100
Revert "ISIS-2965 - updates to 2.0.0-M8 (jdo)"
This reverts commit 2afbe9d54a2c8134c870c29e0c253d788465dfee.
---
module-simple-tests/pom.xml | 2 +-
module-simple/pom.xml | 2 +-
pom.xml | 4 ++--
webapp-tests/pom.xml | 2 +-
webapp/pom.xml | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/module-simple-tests/pom.xml b/module-simple-tests/pom.xml
index 3bff9b1..a7a48a4 100644
--- a/module-simple-tests/pom.xml
+++ b/module-simple-tests/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-M8</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-jdo-module-simple-tests</artifactId>
diff --git a/module-simple/pom.xml b/module-simple/pom.xml
index 1a13b64..972a257 100644
--- a/module-simple/pom.xml
+++ b/module-simple/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-M8</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-jdo-module-simple</artifactId>
diff --git a/pom.xml b/pom.xml
index 19b48b8..f4f6378 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.apache.isis.app</groupId>
<artifactId>isis-app-starter-parent</artifactId>
- <version>2.0.0-M8</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-M8</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>SimpleApp (JDO) - Parent</name>
diff --git a/webapp-tests/pom.xml b/webapp-tests/pom.xml
index 1290bcc..6642f56 100644
--- a/webapp-tests/pom.xml
+++ b/webapp-tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-M8</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-jdo-webapp-tests</artifactId>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 834cdee..a74f573 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jdo</artifactId>
- <version>2.0.0-M8</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-jdo-webapp</artifactId>
[isis-app-simpleapp] 02/06: Merge branch 'release-2.0.0-M8-RC2-jdo' into jdo-SNAPSHOT
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-2.0.0-M8-RC3-jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 8de7773d795502afc6f8468f371c3ce8e7d4d175
Merge: 33a41f3 76e8e2f
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Oct 2 07:52:15 2022 +0100
Merge branch 'release-2.0.0-M8-RC2-jdo' into jdo-SNAPSHOT