This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch maintenance-branch
in repository https://gitbox.apache.org/repos/asf/causeway.git
from eda2d7f67c8 CAUSEWAY-3969: updates changelog
add 3970963b0bc CAUSEWAY-3973: [v2] Backport Layout Switching Fixes (adoc)
add 009be0bcc27 CAUSEWAY-3973: [v2] backports new FacetRanking
add 58bae9faf5a CAUSEWAY-3973: [v2] backports all Qualified Facets
add a145f5fee30 CAUSEWAY-3973: [v2] refactors Grid to store LayoutKeys on
loading
add a7ca3cbf47d CAUSEWAY-3973: [v2] converts remaining Facets to be
qualified
add 1900ca6db45 CAUSEWAY-3973: [v2] support for layout variant export in
Object_downloadLayout
add 9c9b3db6abc CAUSEWAY-3973: [v2] backports layout switching tests
add b9f8590c824 CAUSEWAY-3973: [v2] work on backport of simplified grid
loading (1)
add bd8abfb4556 CAUSEWAY-3973: [v2] work on backport of simplified grid
loading (2)
add f64eb8e8a0f CAUSEWAY-3973: [v2] work on backport of simplified grid
loading (3)
add 16e2a7fa68a CAUSEWAY-3973: [v2] work on backport of simplified grid
loading (4)
add fc277b04ad2 CAUSEWAY-3973: [v2] entity pages honoring layout variants
add 25747587287 CAUSEWAY-3973: [v2] makes FacetRank thread-safe
add fbfe54d234a CAUSEWAY-3973: [v2] removes temp file from prev. commits
new 81352c2f542 Merge pull request #3435 from
apache/3973-backport.layout.switch
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:
adoc/changelog.adoc | 3 +-
api/applib/src/main/java/module-info.java | 3 +-
.../apache/causeway/applib/layout/grid/Grid.java | 108 -
.../causeway/applib/layout/grid/GridAbstract.java | 218 --
.../applib/layout/grid/bootstrap/BSElement.java | 26 +-
.../bootstrap/BSElementOwnerResolvingWalker.java | 116 +
.../applib/layout/grid/bootstrap/BSGrid.java | 306 +--
.../layout/grid/bootstrap/BSGridTransformer.java | 177 ++
.../applib/layout/grid/bootstrap/BSRow.java | 7 +-
.../applib/layout/grid/bootstrap/BSTab.java | 6 +-
.../applib/layout/grid/bootstrap/BSUtil.java | 243 ++
.../applib/layout/grid/bootstrap/BSWalker.java | 141 +
.../applib/layout/resource/LayoutResource.java | 34 +-
.../layout/resource}/LayoutResourceLoader.java | 26 +-
.../mixins/layout/Object_downloadLayout.java | 23 +-
.../applib/services/grid/GridLoaderService.java | 95 -
.../GridMarshaller.java} | 31 +-
.../services/grid/GridMarshallerService.java | 31 -
.../causeway/applib/services/grid/GridService.java | 185 +-
.../applib/services/grid/GridSystemService.java | 135 -
.../applib/services/layout/LayoutExportStyle.java | 1 -
.../applib/services/layout/LayoutService.java | 12 +-
bom/pom.xml | 8 +-
commons/pom.xml | 5 +
commons/src/main/java/module-info.java | 2 +
.../causeway/commons/internal/_Java17Ex.java | 22 +-
.../commons/internal/collections/_Maps.java | 96 +-
.../org/apache/causeway/commons/net/DataUri.java | 191 ++
core/metamodel/src/main/java/module-info.java | 1 -
.../metamodel/CausewayModuleCoreMetamodel.java | 39 +-
.../_testing/MetaModelContext_forTesting.java | 71 +-
.../core/metamodel/consent/InteractionAdvisor.java | 4 +-
.../causeway/core/metamodel/facetapi/Facet.java | 9 +-
.../core/metamodel/facetapi/FacetAbstract.java | 8 +-
.../core/metamodel/facetapi/FacetHolder.java | 42 +-
.../metamodel/facetapi/FacetHolderAbstract.java | 135 -
.../metamodel/facetapi/FacetHolderLayered.java | 100 +-
.../core/metamodel/facetapi/FacetHolderSimple.java | 75 +-
.../core/metamodel/facetapi/FacetRank.java | 145 +
.../core/metamodel/facetapi/FacetRanking.java | 238 +-
.../core/metamodel/facetapi/FacetUtil.java | 63 +-
.../core/metamodel/facetapi/HasFacetHolder.java | 4 +-
.../core/metamodel/facetapi/QualifiedFacet.java | 68 +
.../core/metamodel/facetapi/TypedFacetRanking.java | 266 ++
.../actions/layout/ActionLayoutFacetFactory.java | 58 +-
.../ActionPositionFacetForActionLayoutXml.java | 26 +-
.../layout/CssClassFacetForActionLayoutXml.java | 25 +-
.../actions/layout/FaFacetForActionLayoutXml.java | 25 +-
.../layout/HiddenFacetForActionLayoutXml.java | 30 +-
.../MemberDescribedFacetForActionLayoutXml.java | 26 +-
.../layout/MemberNamedFacetForActionLayoutXml.java | 28 +-
.../PromptStyleFacetForActionLayoutAnnotation.java | 105 -
.../layout/PromptStyleFacetForActionLayoutXml.java | 69 -
.../RedirectFacetFromActionLayoutAnnotation.java | 46 -
.../layout/RedirectFacetFromActionLayoutXml.java | 55 -
.../facets/actions/redirect/RedirectFacet.java | 32 -
.../actions/redirect/RedirectFacetAbstract.java | 64 -
.../actions/redirect/RedirectFacetFallback.java | 30 -
.../facets/all/i8n/noun/HasNounFacetAbstract.java | 10 +-
.../core/metamodel/facets/all/i8n/noun/Noun.java | 38 +-
.../all/named/ObjectNamedFacetSynthesized.java | 2 +-
.../CssClassFacetForCollectionLayoutXml.java | 27 +-
.../DefaultViewFacetForCollectionLayoutXml.java | 28 +-
.../layout/HiddenFacetForCollectionLayoutXml.java | 30 +-
...MemberDescribedFacetForCollectionLayoutXml.java | 27 +-
.../MemberNamedFacetForCollectionLayoutXml.java | 27 +-
.../layout/PagedFacetForCollectionLayoutXml.java | 27 +-
.../SortedByFacetForCollectionLayoutXml.java | 35 +-
.../TableDecoratorFacetForCollectionLayoutXml.java | 25 +-
.../layout/group/LayoutGroupFacetForLayoutXml.java | 32 +-
.../layout/order/LayoutOrderFacetForLayoutXml.java | 22 +-
...ookmarkPolicyFacetForDomainObjectLayoutXml.java | 26 +-
.../CssClassFacetForDomainObjectLayoutXml.java | 25 +-
.../DomainObjectLayoutFacetFactory.java | 6 +-
.../FaFacetForDomainObjectLayoutXml.java | 26 +-
...jectDescribedFacetForDomainObjectLayoutXml.java | 25 +-
...tNamedFacetForDomainObjectLayoutAnnotation.java | 26 +-
.../ObjectNamedFacetForDomainObjectLayoutXml.java | 41 +-
.../PagedFacetForDomainObjectLayoutAnnotation.java | 7 +-
...ableDecoratorFacetForDomainObjectLayoutXml.java | 26 +-
...NamedFacetForDomainServiceLayoutAnnotation.java | 12 +-
.../facets/object/entity/EntityFacet.java | 2 +-
.../object/entity/_EntityFacetForTesting.java | 5 +-
.../metamodel/facets/object/grid/BSGridFacet.java | 144 +
.../metamodel/facets/object/grid/GridFacet.java | 17 +-
.../facets/object/grid/GridFacetDefault.java | 134 -
.../facets/object/grid/GridFacetFactory.java | 55 +-
.../facets/object/layout/LayoutFacetAbstract.java | 42 -
.../facets/object/layout/LayoutFacetFallback.java | 43 -
.../{LayoutFacet.java => LayoutPrefixFacet.java} | 14 +-
.../LayoutPrefixFacetForUiEvent.java} | 86 +-
...Method.java => LayoutPrefixFacetViaMethod.java} | 64 +-
.../object/promptStyle/PromptStyleFacet.java | 78 +-
.../promptStyle/PromptStyleFacetAbstract.java | 41 -
.../promptStyle/PromptStyleFacetAsConfigured.java | 46 -
.../object/support/ObjectSupportFacetFactory.java | 4 +-
...ionOrAnyMatchingValueSemanticsFacetFactory.java | 27 +-
.../CssClassFacetForPropertyLayoutXml.java | 28 +-
.../HiddenFacetForPropertyLayoutXml.java | 32 +-
.../LabelAtFacetForPropertyLayoutXml.java | 27 +-
.../MemberDescribedFacetForPropertyLayoutXml.java | 27 +-
.../MemberNamedFacetForPropertyLayoutXml.java | 29 +-
.../MultiLineFacetForPropertyLayoutXml.java | 30 +-
...romptStyleFacetForPropertyLayoutAnnotation.java | 114 -
.../PromptStyleFacetForPropertyLayoutXml.java | 70 -
.../propertylayout/PropertyLayoutFacetFactory.java | 100 +-
.../RenderedAdjustedFacetForPropertyLayoutXml.java | 27 +-
.../TypicalLengthFacetForPropertyLayoutXml.java | 27 +-
.../UnchangingFacetForPropertyLayoutXml.java | 29 +-
.../interactions/managed/ManagedCollection.java | 2 +-
.../interactions/managed/ManagedProperty.java | 2 +-
.../core/metamodel/layout/LayoutFacetUtil.java | 10 +-
.../i18n/SynthesizeObjectNamingPostProcessor.java | 16 +-
.../services/grid/FallbackGridProvider.java | 127 +
.../core/metamodel/services/grid/GridCache.java | 65 +
.../grid/{bootstrap => }/GridFallbackLayout.xml | 0
.../services/grid/GridInitializationModel.java | 300 ++
.../core/metamodel/services/grid/GridLoader.java | 57 +
.../services/grid/GridLoaderServiceDefault.java | 248 --
.../services/grid/GridLoadingContext.java | 104 +
...erviceBootstrap.java => GridMarshallerXml.java} | 86 +-
.../services/grid/GridServiceDefault.java | 231 +-
.../services/grid/LayoutResourceLookup.java | 169 ++
.../services/grid/ObjectMemberResolverForGrid.java | 503 ++++
...java => XmlLayoutRespectingFacetInstaller.java} | 265 +-
.../grid/XsiSchemaLocationProviderForGrid.java | 55 +
.../{bootstrap => }/_UnreferencedSequenceUtil.java | 2 +-
.../grid/bootstrap/GridSystemServiceBootstrap.java | 630 -----
.../services/grid/bootstrap/_GridModel.java | 231 --
.../services/grid/spi/LayoutResource.java | 31 -
.../grid/spi/LayoutResourceLoaderDefault.java | 19 +-
.../services/layout/LayoutServiceDefault.java | 114 +-
.../metamodel/MetaModelServiceDefault.java | 2 +-
.../core/metamodel/spec/ObjectSpecification.java | 13 +
.../core/metamodel/spec/feature/ObjectAction.java | 4 +-
.../specimpl/dflt/_MembersAsColumns.java | 9 +-
.../causeway/core/metamodel/util/Facets.java | 6 +-
.../Annotations_synthesizeElseOnClass_Test.java | 63 +-
.../Annotations_synthesize_on_Class_Test.java | 25 +-
.../Annotations_synthesize_on_Field_Test.java | 34 +-
.../Annotations_synthesize_on_Method_Test.java | 30 +-
.../Annotations_synthesize_on_Parameter_Test.java | 29 +-
.../ident/layout/LayoutFacetFactoryTest.java | 4 +-
.../object/ident/layout/LayoutFacetMethodTest.java | 17 +-
...romptStyleFacetFromPropertyAnnotation_Test.java | 200 +-
.../objects/ObjectActionLayoutXmlDefaultTest.java | 9 +-
.../objects/OneToManyAssociationDefaultTest.java | 3 +-
.../grid/{Bar.layout.xml => Bar-simple.layout.xml} | 12 +-
.../causeway/core/metamodel/services/grid/Bar.java | 33 +
...meTest.java => GridCache_resourceNameTest.java} | 37 +-
.../metamodel/services/grid/GridLoadingTest.java | 55 +-
.../services/grid/GridXmlRoundtripTest.java | 23 +-
.../services/grid/LayoutSwitchingTest.java | 180 ++
.../specimpl/ObjectAssociationAbstractTest.java | 2 +-
.../specimpl/OneToOneAssociationAbstractTest.java | 2 +-
.../menubars/MenuBarsLoaderServiceDefault.java | 2 -
.../bootstrap/BSMenuBarsAttributesAppender.java | 57 +
.../MenuBarsMarshallerServiceBootstrap.java | 15 +-
.../bootstrap/MenuBarsServiceBootstrap.java | 135 +-
.../sitemap/SitemapServiceDefault.java | 9 +-
.../help/topics/welcome/WelcomeHelpPage.java | 127 +-
.../spiimpl/LayoutResourceLoaderFromGithub.java | 19 +-
...hPdfJsViewer_IntegTest.dump_facets.approved.xml | 104 +-
..._MixinDomain_IntegTest.dump_facets.approved.xml | 104 +-
...hPdfjsViewer_IntegTest.dump_facets.approved.xml | 70 +-
...r_PropDomain_IntegTest.dump_facets.approved.xml | 70 +-
.../interaction/DomainObjectTesterFactory.java | 6 +-
.../MetaModelRegressionTest.verify.approved.xml | 2895 ++++++--------------
.../viewer/commons/model/layout/UiGridLayout.java | 76 +-
.../common/query/meta/CommonMetaFetcher.java | 6 +-
.../viewer/controller/ResourceController.java | 25 +-
.../resources/DomainObjectResourceServerside.java | 12 +-
.../components/entity/fieldset/PropertyGroup.java | 2 +-
.../viewer/wicket/ui/pages/entity/EntityPage.java | 46 +-
174 files changed, 6588 insertions(+), 7281 deletions(-)
delete mode 100644
api/applib/src/main/java/org/apache/causeway/applib/layout/grid/Grid.java
delete mode 100644
api/applib/src/main/java/org/apache/causeway/applib/layout/grid/GridAbstract.java
create mode 100644
api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSElementOwnerResolvingWalker.java
create mode 100644
api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSGridTransformer.java
create mode 100644
api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSUtil.java
create mode 100644
api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/BSWalker.java
copy
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ServiceActionsModel.java
=>
api/applib/src/main/java/org/apache/causeway/applib/layout/resource/LayoutResource.java
(56%)
rename
{core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/spi
=>
api/applib/src/main/java/org/apache/causeway/applib/layout/resource}/LayoutResourceLoader.java
(72%)
delete mode 100644
api/applib/src/main/java/org/apache/causeway/applib/services/grid/GridLoaderService.java
copy
api/applib/src/main/java/org/apache/causeway/applib/services/{marshal/MarshallerService.java
=> grid/GridMarshaller.java} (60%)
delete mode 100644
api/applib/src/main/java/org/apache/causeway/applib/services/grid/GridMarshallerService.java
delete mode 100644
api/applib/src/main/java/org/apache/causeway/applib/services/grid/GridSystemService.java
copy
api/applib/src/main/java/org/apache/causeway/applib/services/commanddto/conmap/UserDataKeys.java
=> commons/src/main/java/org/apache/causeway/commons/internal/_Java17Ex.java
(67%)
create mode 100644
commons/src/main/java/org/apache/causeway/commons/net/DataUri.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FacetHolderAbstract.java
create mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/FacetRank.java
create mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/QualifiedFacet.java
create mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facetapi/TypedFacetRanking.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutAnnotation.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutXml.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/RedirectFacetFromActionLayoutAnnotation.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/layout/RedirectFacetFromActionLayoutXml.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/redirect/RedirectFacet.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/redirect/RedirectFacetAbstract.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/redirect/RedirectFacetFallback.java
create mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/grid/BSGridFacet.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/grid/GridFacetDefault.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/layout/LayoutFacetAbstract.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/layout/LayoutFacetFallback.java
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/layout/{LayoutFacet.java
=> LayoutPrefixFacet.java} (70%)
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/{domainobjectlayout/LayoutFacetViaDomainObjectLayoutAnnotationUsingLayoutUiEvent.java
=> layout/LayoutPrefixFacetForUiEvent.java} (60%)
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/layout/{LayoutFacetViaLayoutMethod.java
=> LayoutPrefixFacetViaMethod.java} (54%)
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/promptStyle/PromptStyleFacetAbstract.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/promptStyle/PromptStyleFacetAsConfigured.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutAnnotation.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutXml.java
create mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/FallbackGridProvider.java
create mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridCache.java
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/{bootstrap
=> }/GridFallbackLayout.xml (100%)
create mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridInitializationModel.java
create mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridLoader.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridLoaderServiceDefault.java
create mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridLoadingContext.java
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/{bootstrap/GridMarshallerServiceBootstrap.java
=> GridMarshallerXml.java} (50%)
create mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/LayoutResourceLookup.java
create mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/ObjectMemberResolverForGrid.java
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/{GridSystemServiceAbstract.java
=> XmlLayoutRespectingFacetInstaller.java} (64%)
create mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/XsiSchemaLocationProviderForGrid.java
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/{bootstrap
=> }/_UnreferencedSequenceUtil.java (97%)
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/bootstrap/_GridModel.java
delete mode 100644
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/spi/LayoutResource.java
copy
core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/{Bar.layout.xml
=> Bar-simple.layout.xml} (84%)
rename
core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/{GridLoaderServiceDefault_resourceNameTest.java
=> GridCache_resourceNameTest.java} (58%)
create mode 100644
core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/LayoutSwitchingTest.java
create mode 100644
core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/BSMenuBarsAttributesAppender.java
