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 10:07:18 UTC
[isis] branch release-2.0.0-M8-RC4 created (now ddde28dbc8)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch release-2.0.0-M8-RC4
in repository https://gitbox.apache.org/repos/asf/isis.git
at ddde28dbc8 ISIS-2965: updates project build timestamp
This branch includes the following new commits:
new eef0a5488f ISIS-2965: improves release docs
new 6b883b50bd ISIS-3230 : fixes for queries
new 99baae682e ISIS-3234: fixes deletion of jdo
new 0c39f88f3a Merge branch 'master' into release-2.0.0-M8-RC3
new ddde28dbc8 ISIS-2965: updates project build timestamp
The 5 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] 02/05: ISIS-3230 : fixes for queries
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-RC4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6b883b50bd456b3df80d16fcb1ca3e86e832450a
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Oct 2 08:48:19 2022 +0100
ISIS-3230 : fixes for queries
---
.../extensions/commandlog/jdo/dom/CommandLogEntry.java | 2 +-
.../executionlog/jdo/dom/ExecutionLogEntry.java | 8 ++++----
.../executionlog/jpa/dom/ExecutionLogEntry.java | 16 ++++++++--------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/dom/CommandLogEntry.java b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/dom/CommandLogEntry.java
index 1fc4167ed6..441054c22b 100644
--- a/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/dom/CommandLogEntry.java
+++ b/extensions/core/commandlog/persistence-jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/dom/CommandLogEntry.java
@@ -129,7 +129,7 @@ import lombok.Setter;
name = Nq.FIND_MOST_RECENT,
value = "SELECT "
+ " FROM " + CommandLogEntry.FQCN + " "
- + " ORDER BY timestamp DESC, interactionId DESC, sequence DESC"
+ + " ORDER BY timestamp DESC, interactionId DESC"
+ " RANGE 0,100"),
@Query(
name = Nq.FIND_RECENT_BY_USERNAME,
diff --git a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntry.java b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntry.java
index ea61bc16b5..13481a5096 100644
--- a/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntry.java
+++ b/extensions/core/executionlog/persistence-jdo/src/main/java/org/apache/isis/extensions/executionlog/jdo/dom/ExecutionLogEntry.java
@@ -99,20 +99,20 @@ import lombok.Setter;
name = Nq.FIND_BY_TIMESTAMP_BETWEEN,
value = "SELECT "
+ " FROM " + ExecutionLogEntry.FQCN + " "
- + " WHERE timestamp >= :timestampFrom "
- + " && timestamp <= :timestampTo "
+ + " WHERE timestamp >= :from "
+ + " && timestamp <= :to "
+ " ORDER BY timestamp DESC, interactionId DESC, sequence DESC"),
@Query(
name = Nq.FIND_BY_TIMESTAMP_AFTER,
value = "SELECT "
+ " FROM " + ExecutionLogEntry.FQCN + " "
- + " WHERE timestamp >= :timestamp "
+ + " WHERE timestamp >= :from "
+ " ORDER BY timestamp DESC, interactionId DESC, sequence DESC"),
@Query(
name = Nq.FIND_BY_TIMESTAMP_BEFORE,
value = "SELECT "
+ " FROM " + ExecutionLogEntry.FQCN + " "
- + " WHERE timestamp <= :timestamp "
+ + " WHERE timestamp <= :to "
+ " ORDER BY timestamp DESC, interactionId DESC, sequence DESC"),
@Query(
name = Nq.FIND,
diff --git a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/dom/ExecutionLogEntry.java b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/dom/ExecutionLogEntry.java
index f8a976882a..85c6d50092 100644
--- a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/dom/ExecutionLogEntry.java
+++ b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/dom/ExecutionLogEntry.java
@@ -108,26 +108,26 @@ import lombok.Setter;
name = Nq.FIND_BY_TIMESTAMP_BETWEEN,
query = "SELECT ele "
+ " FROM ExecutionLogEntry ele "
- + " WHERE ele.timestamp >= :timestampFrom "
- + " AND ele.timestamp <= :timestampTo "
+ + " WHERE ele.timestamp >= :from "
+ + " AND ele.timestamp <= :to "
+ " ORDER BY ele.timestamp DESC, ele.pk.interactionId DESC, ele.pk.sequence DESC"),
@NamedQuery(
name = Nq.FIND_BY_TIMESTAMP_AFTER,
query = "SELECT ele "
+ " FROM ExecutionLogEntry ele "
- + " WHERE ele.timestamp >= :timestamp "
+ + " WHERE ele.timestamp >= :from "
+ " ORDER BY ele.timestamp DESC, ele.pk.interactionId DESC, ele.pk.sequence DESC"),
@NamedQuery(
- name = Nq.FIND,
+ name = Nq.FIND_BY_TIMESTAMP_BEFORE,
query = "SELECT ele "
+ " FROM ExecutionLogEntry ele "
- + " ORDER BY ele.timestamp DESC"),
+ + " WHERE ele.timestamp <= :to "
+ + " ORDER BY ele.timestamp DESC, ele.pk.interactionId, ele.pk.sequence DESC"),
@NamedQuery(
- name = Nq.FIND_BY_TIMESTAMP_BEFORE,
+ name = Nq.FIND,
query = "SELECT ele "
+ " FROM ExecutionLogEntry ele "
- + " WHERE ele.timestamp <= :timestamp "
- + " ORDER BY ele.timestamp DESC, ele.pk.interactionId, ele.pk.sequence DESC"),
+ + " ORDER BY ele.timestamp DESC"),
@NamedQuery(
name = Nq.FIND_MOST_RECENT,
query = "SELECT ele "
[isis] 05/05: ISIS-2965: updates project build timestamp
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-RC4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ddde28dbc85b7940cdba47226e633131fca33781
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Oct 2 10:58:02 2022 +0100
ISIS-2965: updates project build timestamp
---
bom/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 4042466eb0..7c94b0c8e8 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -312,7 +312,7 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<maven.plugin.tools.version>3.6.4</maven.plugin.tools.version>
<!-- for m-plugin-p and maven-plugin-annotations -->
<assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
- <project.build.outputTimestamp>2022-10-01T16:36:00Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2022-10-02T09:56:00Z</project.build.outputTimestamp>
<!-- APACHE ISIS customisation 6/21: start -->
[isis] 03/05: ISIS-3234: fixes deletion of 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-RC4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 99baae682ed2cea7f2b08c4f1e88f69815cf6eaf
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Oct 2 08:46:33 2022 +0100
ISIS-3234: fixes deletion of jdo
---
.../extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java b/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java
index 49c95b7898..76cd83b03d 100644
--- a/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java
+++ b/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java
@@ -82,7 +82,6 @@ import lombok.experimental.UtilityClass;
entityChangePublishing = Publishing.DISABLED
)
@DomainObjectLayout(
- named = "ExecutionLogEntry",
titleUiEvent = ExecutionOutboxEntry.TitleUiEvent.class,
iconUiEvent = ExecutionOutboxEntry.IconUiEvent.class,
cssClassUiEvent = ExecutionOutboxEntry.CssClassUiEvent.class,
@@ -143,7 +142,7 @@ implements Comparable<ExecutionOutboxEntry>, DomainChangeRecord, HasInteractionI
setLogicalMemberIdentifier(memberExecutionDto.getLogicalMemberIdentifier());
- setTarget( bookmarkService.bookmarkFor(execution.getEvent().getSubject()).orElseThrow() );
+ setTarget(Bookmark.forOidDto(memberExecutionDto.getTarget()));
setUsername(memberExecutionDto.getUsername());
if(execution instanceof PropertyEdit) {
@@ -169,7 +168,7 @@ implements Comparable<ExecutionOutboxEntry>, DomainChangeRecord, HasInteractionI
}
- @Type
+ @DomainChangeRecord.Type
@Override
public ChangeType getType() {
return ChangeType.EXECUTION;
[isis] 04/05: Merge branch 'master' into release-2.0.0-M8-RC3
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-RC4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0c39f88f3aae881540883828b255cf536978b30c
Merge: 26ababd142 99baae682e
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Oct 2 08:51:14 2022 +0100
Merge branch 'master' into release-2.0.0-M8-RC3
.../extensions/commandlog/jdo/dom/CommandLogEntry.java | 2 +-
.../executionlog/jdo/dom/ExecutionLogEntry.java | 8 ++++----
.../executionlog/jpa/dom/ExecutionLogEntry.java | 16 ++++++++--------
.../executionoutbox/applib/dom/ExecutionOutboxEntry.java | 5 ++---
4 files changed, 15 insertions(+), 16 deletions(-)
[isis] 01/05: ISIS-2965: improves release docs
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-RC4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit eef0a5488f7dc1c92f1449c5808c523bda286234
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Oct 1 22:20:11 2022 +0100
ISIS-2965: improves release docs
---
antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
index 5d43130992..d4d0197f1f 100644
--- a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
@@ -450,8 +450,8 @@ Finally, tag the release:
[source,bash,subs="attributes+"]
----
-git tag $ISISART-$ISISREL
-git tag $ISISART-$ISISREL-$ISISRC
+git tag $ISISART-$ISISREL --force
+git tag $ISISART-$ISISREL-$ISISRC --force
----