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 5cf0adfe8de2305fc9136975c5eb922dc0bb45e2 Merge: 45f8b915cc c88472eb60 Author: andi-huber <[email protected]> AuthorDate: Fri Jan 6 09:41:31 2023 +0100 ISIS-3275: [Incubating] Migrate from Spring Framework 5.x to 6.x .../causeway/applib/annotation/BookmarkPolicy.java | 7 +- .../causeway/applib/layout/LayoutConstants.java | 6 +- .../apache/causeway/applib/layout/grid/Grid.java | 11 + .../causeway/applib/layout/grid/GridAbstract.java | 14 +- .../core/metamodel/facetapi/FacetAbstract.java | 1 - .../core/metamodel/facetapi/FacetUtil.java | 38 +- .../metamodel/facets/SingleValueFacetAbstract.java | 14 +- .../ActionPositionFacetForActionLayoutXml.java | 12 +- .../BookmarkPolicyFacetForActionLayoutXml.java | 12 +- .../layout/CssClassFaFacetForActionLayoutXml.java | 12 +- .../layout/CssClassFacetForActionLayoutXml.java | 12 +- .../layout/HiddenFacetForActionLayoutXml.java | 10 +- .../MemberDescribedFacetForActionLayoutXml.java | 12 +- .../layout/MemberNamedFacetForActionLayoutXml.java | 9 +- .../layout/PromptStyleFacetForActionLayoutXml.java | 9 +- .../layout/RedirectFacetFromActionLayoutXml.java | 9 +- .../described/ObjectDescribedFacetAbstract.java | 12 + .../CssClassFacetForCollectionLayoutXml.java | 10 +- .../DefaultViewFacetForCollectionLayoutXml.java | 10 +- .../layout/HiddenFacetForCollectionLayoutXml.java | 10 +- ...MemberDescribedFacetForCollectionLayoutXml.java | 10 +- .../MemberNamedFacetForCollectionLayoutXml.java | 11 +- .../layout/PagedFacetForCollectionLayoutXml.java | 10 +- .../SortedByFacetForCollectionLayoutXml.java | 10 +- ...llectionLayoutTableDecorationFacetAbstract.java | 6 + ...TableDecorationFacetForCollectionLayoutXml.java | 10 +- .../sortedby/SortedByFacetAbstract.java | 8 +- .../layout/group/LayoutGroupFacetForLayoutXml.java | 17 +- .../layout/order/LayoutOrderFacetAbstract.java | 7 +- .../layout/order/LayoutOrderFacetForLayoutXml.java | 10 +- ...ookmarkPolicyFacetForDomainObjectLayoutXml.java | 12 +- .../CssClassFaFacetForDomainObjectLayoutXml.java | 12 +- .../CssClassFacetForDomainObjectLayoutXml.java | 13 +- ...jectDescribedFacetForDomainObjectLayoutXml.java | 11 +- .../ObjectNamedFacetForDomainObjectLayoutXml.java | 12 +- ...inObjectLayoutTableDecorationFacetAbstract.java | 10 +- ...bleDecorationFacetForDomainObjectLayoutXml.java | 12 +- .../facets/object/paged/PagedFacetAbstract.java | 7 +- .../DateRenderAdjustFacetAbstract.java | 5 + .../CssClassFacetForPropertyLayoutXml.java | 9 +- .../HiddenFacetForPropertyLayoutXml.java | 10 +- .../LabelAtFacetForPropertyLayoutXml.java | 10 +- .../MemberDescribedFacetForPropertyLayoutXml.java | 11 +- .../MemberNamedFacetForPropertyLayoutXml.java | 11 +- .../MultiLineFacetForPropertyLayoutXml.java | 10 +- .../PromptStyleFacetForPropertyLayoutXml.java | 10 +- .../RenderedAdjustedFacetForPropertyLayoutXml.java | 10 +- .../TypicalLengthFacetForPropertyLayoutXml.java | 10 +- .../UnchangingFacetForPropertyLayoutXml.java | 10 +- .../renderunchanged/UnchangingFacetAbstract.java | 6 +- .../services/grid/GridSystemServiceAbstract.java | 387 +++++++++------------ .../grid/bootstrap/GridSystemServiceBootstrap.java | 8 +- .../causeway/core/metamodel/util/Facets.java | 6 +- .../bootstrap/MenuBarsServiceBootstrap.java | 37 +- .../DomainObjectLayout/DomainObjectLayoutMenu.java | 2 +- ... => DomainObjectLayoutBookmarkingNestedVm.java} | 22 +- ...omainObjectLayoutBookmarkingVm-description.adoc | 7 + .../DomainObjectLayoutBookmarkingVm.java | 20 +- .../DomainObjectLayoutBookmarkingVm.layout.xml | 49 +++ .../DomainObjectLayoutCssClassVm-description.adoc | 6 + .../cssClass/DomainObjectLayoutCssClassVm.java | 2 +- .../DomainObjectLayoutCssClassVm.layout.xml | 49 +++ ...DomainObjectLayoutCssClassFaVm-description.adoc | 6 + .../cssClassFa/DomainObjectLayoutCssClassFaVm.java | 2 +- .../DomainObjectLayoutCssClassFaVm.layout.xml | 49 +++ ...omainObjectLayoutDescribedAsVm-description.adoc | 6 + .../DomainObjectLayoutDescribedAsVm.java | 2 +- .../DomainObjectLayoutDescribedAsVm.layout.xml | 49 +++ .../DomainObjectLayoutNamedVm-description.adoc | 6 + .../named/DomainObjectLayoutNamedVm.java | 2 +- .../named/DomainObjectLayoutNamedVm.layout.xml | 49 +++ .../DomainObjectLayoutPagedVm-description.adoc | 7 + .../paged/DomainObjectLayoutPagedVm.java | 2 +- .../paged/DomainObjectLayoutPagedVm.layout.xml | 49 +++ .../DomainObjectLayoutPluralVm-description.adoc | 7 + .../plural/DomainObjectLayoutPluralVm.java | 2 +- .../plural/DomainObjectLayoutPluralVm.layout.xml | 49 +++ ...DomainObjectLayoutXxxUiEventVm-description.adoc | 6 + .../xxxUiEvent/DomainObjectLayoutXxxUiEventVm.java | 2 +- .../DomainObjectLayoutXxxUiEventVm.layout.xml | 49 +++ .../commons/model/action/HasManagedAction.java | 8 +- .../wicket/model/models/ActionModelImpl.java | 5 +- .../wicket/model/models/BookmarkTreeNode.java | 255 ++++++-------- .../model/models/BookmarkTreeNodeComparator.java | 60 ---- .../wicket/model/models/BookmarkableModel.java | 23 +- .../wicket/model/models/BookmarkedPagesModel.java | 84 ++--- .../wicket/model/models/ManagedObjectModel.java | 13 - .../viewer/wicket/model/models/UiObjectWkt.java | 18 + .../interaction/HasBookmarkedOwnerAbstract.java | 13 +- .../bookmarkedpages/BookmarkedPagesPanel.java | 2 +- 90 files changed, 1199 insertions(+), 751 deletions(-) diff --cc api/applib/src/main/java/org/apache/causeway/applib/annotation/BookmarkPolicy.java index c212e4ae93,cc3e058bdb..eef44b7c5b --- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/BookmarkPolicy.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/BookmarkPolicy.java @@@ -19,10 -19,10 +19,10 @@@ package org.apache.causeway.applib.annotation; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; /** - * + * * @since 1.x {@index} */ @XmlType( diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingNestedVm.java index 5e8c2e54ce,dc80dc1029..60dd215672 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingNestedVm.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingNestedVm.java @@@ -18,14 -18,16 +18,16 @@@ */ package demoapp.dom.domain.objects.DomainObjectLayout.bookmarking; -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.BookmarkPolicy; 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; diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingVm.java index 5e8c2e54ce,c3e8ad4442..ad37ee8dd1 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingVm.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingVm.java @@@ -18,22 -18,20 +18,20 @@@ */ package demoapp.dom.domain.objects.DomainObjectLayout.bookmarking; -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.Action; + import org.apache.causeway.applib.annotation.BookmarkPolicy; 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")
