You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2023/01/12 10:17:04 UTC
[isis] branch spring6 updated (d91a40b84e -> be5f03dc0f)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
from d91a40b84e Merge pull request #1352 from apache/dependabot/maven/spring6/org.apache.maven.plugins-maven-project-info-reports-plugin-3.4.2
add 7dbb26bdfc ISIS-3309: fleshing out showcases; also fixing object describedAs tooltip
add 19c0cd268a ISIS-3309: pagesize facet precedence fixes
add 4033e736ba ISIS-3309: pagesize facet precedence fixes (2)
add a16f3b4c64 Bump maven-surefire-report-plugin from 3.0.0-M7 to 3.0.0-M8
add 682311bfc1 Merge pull request #1351 from apache/dependabot/maven/master/org.apache.maven.plugins-maven-surefire-report-plugin-3.0.0-M8
add ffb2715cac Bump maven-dependency-plugin from 3.4.0 to 3.5.0
add 84f8e9b4d2 Merge pull request #1350 from apache/dependabot/maven/master/org.apache.maven.plugins-maven-dependency-plugin-3.5.0
add 128667664f Bump maven-project-info-reports-plugin from 3.4.1 to 3.4.2
add 5aabca7d04 Merge pull request #1349 from apache/dependabot/maven/master/org.apache.maven.plugins-maven-project-info-reports-plugin-3.4.2
add 84bb8172a0 ISIS-3320: it seems datanucleus-maven-plugin requires an explicit enhance goal entry
new be5f03dc0f Merge remote-tracking branch 'origin/master' into spring6
The 1 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.
Summary of changes:
.../core/metamodel/facetapi/FacetUtil.java | 19 +++++++
.../PagedFacetForCollectionLayoutAnnotation.java | 2 +-
...PagedFacetOverriddenByDataTablesDecoration.java | 2 +-
.../fallback/PagedFacetFromConfiguration.java | 4 +-
.../PagedFacetForDomainObjectLayoutAnnotation.java | 4 +-
...PagedFacetOverriddenByDataTablesDecoration.java | 2 +-
.../facets/object/paged/PagedFacetAbstract.java | 5 --
.../managed/nonscalar/DataTableModel.java | 6 +-
.../core/metamodel/layout/LayoutFacetUtil.java | 7 ++-
.../core/metamodel/spec/feature/ObjectMember.java | 66 +++++++++++-----------
...omainObjectLayoutBookmarkingVm-description.adoc | 6 +-
.../DomainObjectLayoutCssClassVm-description.adoc | 8 ++-
.../cssClass/DomainObjectLayoutCssClassVm.java | 14 +----
...DomainObjectLayoutCssClassFaVm-description.adoc | 6 +-
.../cssClassFa/DomainObjectLayoutCssClassFaVm.java | 14 +----
.../DomainObjectLayoutDescribedAsVm.java | 14 +----
.../named/DomainObjectLayoutNamedVm.java | 14 +----
.../paged/DomainObjectLayoutPagedVm.java | 23 +++++++-
starters/pom.xml | 14 ++++-
.../wicket/model/models/EntityCollectionModel.java | 7 +--
.../models/EntityCollectionModelAbstract.java | 6 --
.../model/models/EntityCollectionModelHidden.java | 10 ++++
.../entity/icontitle/EntityIconAndTitlePanel.java | 8 ++-
23 files changed, 143 insertions(+), 118 deletions(-)
[isis] 01/01: Merge remote-tracking branch 'origin/master' into spring6
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
commit be5f03dc0f5319c97a1e593ba8becaa8be72b2e6
Merge: d91a40b84e 84bb8172a0
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jan 12 11:16:57 2023 +0100
Merge remote-tracking branch 'origin/master' into spring6
.../core/metamodel/facetapi/FacetUtil.java | 19 +++++++
.../PagedFacetForCollectionLayoutAnnotation.java | 2 +-
...PagedFacetOverriddenByDataTablesDecoration.java | 2 +-
.../fallback/PagedFacetFromConfiguration.java | 4 +-
.../PagedFacetForDomainObjectLayoutAnnotation.java | 4 +-
...PagedFacetOverriddenByDataTablesDecoration.java | 2 +-
.../facets/object/paged/PagedFacetAbstract.java | 5 --
.../managed/nonscalar/DataTableModel.java | 6 +-
.../core/metamodel/layout/LayoutFacetUtil.java | 7 ++-
.../core/metamodel/spec/feature/ObjectMember.java | 66 +++++++++++-----------
...omainObjectLayoutBookmarkingVm-description.adoc | 6 +-
.../DomainObjectLayoutCssClassVm-description.adoc | 8 ++-
.../cssClass/DomainObjectLayoutCssClassVm.java | 14 +----
...DomainObjectLayoutCssClassFaVm-description.adoc | 6 +-
.../cssClassFa/DomainObjectLayoutCssClassFaVm.java | 14 +----
.../DomainObjectLayoutDescribedAsVm.java | 14 +----
.../named/DomainObjectLayoutNamedVm.java | 14 +----
.../paged/DomainObjectLayoutPagedVm.java | 23 +++++++-
starters/pom.xml | 14 ++++-
.../wicket/model/models/EntityCollectionModel.java | 7 +--
.../models/EntityCollectionModelAbstract.java | 6 --
.../model/models/EntityCollectionModelHidden.java | 10 ++++
.../entity/icontitle/EntityIconAndTitlePanel.java | 8 ++-
23 files changed, 143 insertions(+), 118 deletions(-)
diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassVm.java
index c2d9d29e44,170444ef36..b130f4ef30
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassVm.java
@@@ -18,22 -18,18 +18,18 @@@
*/
package demoapp.dom.domain.objects.DomainObjectLayout.cssClass;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
- import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.causeway.applib.annotation.DomainObject;
+ import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.ObjectSupport;
- import org.apache.causeway.applib.annotation.Optionality;
- import org.apache.causeway.applib.annotation.Property;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- import lombok.Getter;
- import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaVm.java
index 0dc2ebbfd2,93c72143ce..b58d395ed2
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaVm.java
@@@ -18,22 -18,18 +18,18 @@@
*/
package demoapp.dom.domain.objects.DomainObjectLayout.cssClassFa;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
- import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.causeway.applib.annotation.DomainObject;
+ import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.ObjectSupport;
- import org.apache.causeway.applib.annotation.Optionality;
- import org.apache.causeway.applib.annotation.Property;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- import lombok.Getter;
- import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsVm.java
index 69fa9041fe,1c61cffb80..9ea2c19529
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsVm.java
@@@ -18,22 -18,18 +18,18 @@@
*/
package demoapp.dom.domain.objects.DomainObjectLayout.describedAs;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
- import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.causeway.applib.annotation.DomainObject;
+ import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.ObjectSupport;
- import org.apache.causeway.applib.annotation.Optionality;
- import org.apache.causeway.applib.annotation.Property;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- import lombok.Getter;
- import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedVm.java
index c5dea38b5d,b659fe5400..4c160736a8
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedVm.java
@@@ -18,22 -18,18 +18,18 @@@
*/
package demoapp.dom.domain.objects.DomainObjectLayout.named;
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
- import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
import org.apache.causeway.applib.annotation.DomainObject;
+ import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.ObjectSupport;
- import org.apache.causeway.applib.annotation.Optionality;
- import org.apache.causeway.applib.annotation.Property;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
- import lombok.Getter;
- import lombok.Setter;
//tag::class[]
@XmlRootElement(name = "root")
diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedVm.java
index edf2eea1a5,339fbe51c2..99d5c2ff75
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedVm.java
@@@ -18,14 -18,19 +18,19 @@@
*/
package demoapp.dom.domain.objects.DomainObjectLayout.paged;
+ import java.util.List;
+ import java.util.UUID;
+
-import javax.inject.Named;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.inject.Named;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+ import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.DomainObject;
+ import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.Nature;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Optionality;