You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/03/31 20:52:12 UTC
[causeway] branch spring6 updated (fd6d443b1a -> a50d2f8380)
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/causeway.git
from fd6d443b1a Merge remote-tracking branch 'origin/master' into spring6
add b3a3023ce7 CAUSEWAY-2485: wip - @Action#domainEvent, @DomainObject#xxxDomainEvent (currently NPE in metamodel :-( )
add a662db00a8 CAUSEWAY-2485: reworks @Action#domainEvent
add 2739215463 CAUSEWAY-3401: demo: adds @Property(editingDisabledReason=...) showcase
add e4ec724b52 CAUSEWAY-3372: purge debug code from earlier today
add c0a6492bff CAUSEWAY-3401: demo: editingDisabledReason=... correction
add 888df0dde7 CAUSEWAY-3401: adds 'ban' icon with tooltip holding disabled-reason info
add 4aeb2f1add CAUSEWAY-3401: refactor disabledReason string type into new VetoReason type
add 252e985e65 CAUSEWAY-3401: NPE fixes for prev. commit
add 516be995e1 CAUSEWAY-3401: test approvals
add 640fe28c9a CAUSEWAY-3401: refactor Consent to use VetoReason instead of just String
new a50d2f8380 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:
.../causeway/core/metamodel/consent/Consent.java | 50 +++++++--
.../core/metamodel/consent/ConsentAbstract.java | 29 +++--
.../core/metamodel/consent/InteractionResult.java | 42 ++++---
.../causeway/core/metamodel/consent/Veto.java | 2 +-
.../invocation/ActionDomainEventFacetAbstract.java | 16 ++-
.../facets/members/disabled/DisabledFacet.java | 24 ++--
.../members/disabled/DisabledFacetAbstract.java | 33 +++---
.../disabled/DisabledFacetForContributee.java | 3 +-
.../method/DisableForContextFacetNone.java | 9 +-
.../method/DisableForContextFacetViaMethod.java | 22 ++--
.../choices/ChoicesFacetFromBoundedAbstract.java | 9 +-
.../disabled/DisabledObjectFacetAbstract.java | 9 +-
.../method/DisabledObjectFacetViaMethod.java | 20 ++--
.../ImmutableFacetForDomainObjectAnnotation.java | 6 +-
...FacetForDomainObjectAnnotationAsConfigured.java | 3 +-
.../editing/ImmutableFacetFromConfiguration.java | 6 +-
.../facets/object/immutable/ImmutableFacet.java | 5 +-
.../object/immutable/ImmutableFacetAbstract.java | 38 ++++---
.../value/ImmutableFacetViaValueSemantics.java | 3 +-
.../disable/ActionParameterDisabledFacet.java | 7 +-
.../ActionParameterDisabledFacetAbstract.java | 7 +-
.../ActionParameterDisabledFacetViaMethod.java | 19 ++--
.../DisabledFacetOnPropertyFromImmutable.java | 15 +--
.../DisabledFacetForPropertyAnnotation.java | 9 +-
...acetForPropertyAnnotationInvertedSemantics.java | 5 +-
.../modify/PropertyDomainEventFacetAbstract.java | 20 ++--
.../interactions/DisablingInteractionAdvisor.java | 5 +-
.../metamodel/interactions/InteractionUtils.java | 30 +++--
.../interactions/managed/InteractionVeto.java | 9 +-
.../managed/ParameterNegotiationModel.java | 10 +-
.../managed/PropertyNegotiationModel.java | 10 +-
.../authorization/AuthorizationFacetAbstract.java | 9 +-
.../specloader/specimpl/ObjectActionDefault.java | 4 +-
.../specimpl/OneToManyAssociationMixedIn.java | 3 +-
.../specimpl/OneToOneAssociationMixedIn.java | 3 +-
.../metamodel/consent/InteractionResultTest.java | 28 +++--
.../PropertyAnnotationFacetFactoryTest.java | 3 +-
.../src/main/java/demoapp/dom/DemoModuleJpa.java | 2 +
.../dom/domain/actions/Action/ActionMenu.java | 6 +-
.../ActionDomainEventControlStrategy.java | 62 ++---------
...ava => ActionDomainEventControlSubscriber.java} | 20 +---
.../ActionDomainEventPage-description.adoc | 102 +++++++++++++++++
...mainEventVm.java => ActionDomainEventPage.java} | 38 +------
...layout.xml => ActionDomainEventPage.layout.xml} | 33 ++++--
...tionDomainEventPage_changeControlStrategy.java} | 28 ++---
... => ActionDomainEventPage_controlStrategy.java} | 9 +-
....java => ActionDomainEventPage_updateText.java} | 26 ++---
...ionDomainEventPage_updateTextNotAnnotated.java} | 29 ++---
.../ActionDomainEventVm-description.adoc | 123 ---------------------
.../CollectionDomainEventVm-description.adoc | 4 -
.../objects/DomainObject/DomainObjectMenu.java | 12 +-
.../jpa/DomainObjectMixinMethodJpa.java | 2 +-
...omainObjectXxxDomainEventPage-description.adoc} | 1 -
...Vm.java => DomainObjectXxxDomainEventPage.java} | 6 +-
...l => DomainObjectXxxDomainEventPage.layout.xml} | 13 ++-
...sVm.java => DomainObjectXxxLifecycleEvent.java} | 36 +++---
.../DomainObjectXxxLifecycleEvent.layout.xml} | 0
...ainObjectXxxLifecyleEventPage-description.adoc} | 1 +
....java => DomainObjectXxxLifecyleEventPage.java} | 6 +-
...=> DomainObjectXxxLifecyleEventPage.layout.xml} | 13 ++-
...mainObjectXxxLifecycleEventJpa-description.adoc | 11 ++
.../jpa/DomainObjectXxxLifecycleEventJpa.java} | 14 +--
.../DomainObjectXxxLifecycleEventJpaEntities.java | 28 +++--
.../domain/properties/Property/PropertyMenu.java | 30 +++--
...oc => PropertyDomainEventPage-description.adoc} | 7 +-
...inEventVm.java => PropertyDomainEventPage.java} | 8 +-
...yout.xml => PropertyDomainEventPage.layout.xml} | 0
.../PropertyDomainEventControlService.java | 6 +-
.../PropertyDomainEventControlStrategy.java | 16 +--
.../PropertyDomainEventVm_controlText.java | 4 +-
.../PropertyDomainEventVm_controlTextEditing.java | 6 +-
...n.adoc => PropertyEditingPage-description.adoc} | 12 +-
...ertyEditingVm.java => PropertyEditingPage.java} | 6 +-
...m.layout.xml => PropertyEditingPage.layout.xml} | 0
.../EditingReasonDisabledMetaAnnotation.java} | 36 +++---
...pertyEditingReasonDisabledPage-description.adoc | 4 +
.../PropertyEditingReasonDisabledPage.java} | 28 ++---
.../PropertyEditingReasonDisabledPage.layout.xml} | 0
...doc => PropertyFileAcceptPage-description.adoc} | 24 ++--
...leAcceptVm.java => PropertyFileAcceptPage.java} | 4 +-
.../PropertyFileAcceptPage.layout.xml} | 0
...eAcceptPage_updateClobWithParameterLayout.java} | 6 +-
...tyFileAcceptPage_updateWithMetaAnnotation.java} | 6 +-
...ptPage_updateWithMetaAnnotationOverridden.java} | 6 +-
...yFileAcceptPage_updateWithParameterLayout.java} | 6 +-
.../src/main/java/demoapp/dom/menubars.layout.xml | 1 +
.../facets/TenantedAuthorizationFacetDefault.java | 30 ++---
...hPdfJsViewer_IntegTest.dump_facets.approved.xml | 1 +
..._MixinDomain_IntegTest.dump_facets.approved.xml | 1 +
.../DisabledFacetFromJdoPrimaryKeyAnnotation.java | 3 +-
.../DomainModelTest_usingGoodDomain.java | 2 +-
...InteractionTest_notUsingAllowSafeSemantics.java | 4 +-
...ionInteractionTest_usingAllowSafeSemantics.java | 2 +-
.../interaction/DomainObjectTesterFactory.java | 10 +-
.../model/decorators/DisablingDecorator.java | 2 +-
.../commons/model/scalar/HasUiParameter.java | 5 +-
.../viewer/commons/model/scalar/HasUiProperty.java | 7 +-
.../viewer/commons/model/scalar/UiParameter.java | 9 +-
.../viewer/commons/model/scalar/UiProperty.java | 7 +-
.../viewer/commons/model/scalar/UiScalar.java | 8 +-
.../AbstractObjectMemberReprRenderer.java | 2 +-
.../resources/DomainObjectResourceServerside.java | 4 +-
.../resources/InteractionFailureHandler.java | 12 +-
.../resources/ObjectAdapterUpdateHelper.java | 4 +-
.../viewer/wicket/model/models/ScalarModel.java | 2 +-
.../wicket/model/models/ScalarPropertyModel.java | 2 +-
.../actionresponse/ActionResultResponseType.java | 3 -
.../components/scalars/ScalarFragmentFactory.java | 49 ++++++--
.../ui/components/scalars/ScalarPanelAbstract.java | 7 +-
.../components/scalars/ScalarPanelAbstract2.java | 98 +++++++++++-----
.../scalars/ScalarPanelAdditionalButton.java | 91 +++++++++++++++
.../scalars/ScalarPanelFormFieldAbstract.html | 8 ++
.../scalars/ScalarPanelFormFieldAbstract.java | 5 +-
.../widgets/linkandlabel/ActionLink.java | 4 +-
.../wicket/ui/panels/FormExecutorDefault.java | 2 +-
115 files changed, 994 insertions(+), 756 deletions(-)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/{subscribers => }/ActionDomainEventControlStrategy.java (61%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/{subscribers/ActionDomainEventControlService.java => ActionDomainEventControlSubscriber.java} (63%)
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage-description.adoc
rename examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/{ActionDomainEventVm.java => ActionDomainEventPage.java} (66%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/{ActionDomainEventVm.layout.xml => ActionDomainEventPage.layout.xml} (70%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/{subscribers/ActionDomainEventVm_controlUpdateTextInvocation.java => ActionDomainEventPage_changeControlStrategy.java} (56%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/{subscribers/ActionDomainEventVm_controlUpdateText.java => ActionDomainEventPage_controlStrategy.java} (79%)
copy examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/{ActionDomainEventVm_mixinUpdateText.java => ActionDomainEventPage_updateText.java} (70%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/{ActionDomainEventVm_mixinUpdateText.java => ActionDomainEventPage_updateTextNotAnnotated.java} (66%)
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventVm-description.adoc
rename examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/{xxxLifecycleEvent/DomainObjectLifecyleEventsVm-description.adoc => xxxDomainEvent/DomainObjectXxxDomainEventPage-description.adoc} (99%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/{DomainObjectDomainEventsVm.java => DomainObjectXxxDomainEventPage.java} (90%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/{DomainObjectDomainEventsVm.layout.xml => DomainObjectXxxDomainEventPage.layout.xml} (82%)
copy examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/{DomainObjectLifecyleEventsVm.java => DomainObjectXxxLifecycleEvent.java} (59%)
copy examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/{editing/DomainObjectEditing.layout.xml => xxxLifecycleEvent/DomainObjectXxxLifecycleEvent.layout.xml} (100%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/{xxxDomainEvent/DomainObjectDomainEventsVm-description.adoc => xxxLifecycleEvent/DomainObjectXxxLifecyleEventPage-description.adoc} (99%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/{DomainObjectLifecyleEventsVm.java => DomainObjectXxxLifecyleEventPage.java} (89%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/{DomainObjectLifecyleEventsVm.layout.xml => DomainObjectXxxLifecyleEventPage.layout.xml} (82%)
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jpa/DomainObjectXxxLifecycleEventJpa-description.adoc
copy examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/{mixinMethod/jpa/DomainObjectMixinMethodJpa.java => xxxLifecycleEvent/jpa/DomainObjectXxxLifecycleEventJpa.java} (78%)
copy core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java => examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxLifecycleEvent/jpa/DomainObjectXxxLifecycleEventJpaEntities.java (57%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/{PropertyDomainEventVm-description.adoc => PropertyDomainEventPage-description.adoc} (94%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/{PropertyDomainEventVm.java => PropertyDomainEventPage.java} (91%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/{PropertyDomainEventVm.layout.xml => PropertyDomainEventPage.layout.xml} (100%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/{PropertyEditingVm-description.adoc => PropertyEditingPage-description.adoc} (89%)
copy examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/{PropertyEditingVm.java => PropertyEditingPage.java} (95%)
copy examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/{PropertyEditingVm.layout.xml => PropertyEditingPage.layout.xml} (100%)
copy examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/{domainEvent/subscribers/PropertyDomainEventVm_controlText.java => editingReasonDisabled/EditingReasonDisabledMetaAnnotation.java} (57%)
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editingReasonDisabled/PropertyEditingReasonDisabledPage-description.adoc
rename examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/{editing/PropertyEditingVm.java => editingReasonDisabled/PropertyEditingReasonDisabledPage.java} (74%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/{fileAccept/PropertyFileAcceptVm.layout.xml => editingReasonDisabled/PropertyEditingReasonDisabledPage.layout.xml} (100%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/{PropertyFileAcceptVm-description.adoc => PropertyFileAcceptPage-description.adoc} (76%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/{PropertyFileAcceptVm.java => PropertyFileAcceptPage.java} (97%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/{editing/PropertyEditingVm.layout.xml => fileAccept/PropertyFileAcceptPage.layout.xml} (100%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/{PropertyFileAcceptVm_updateClobWithParameterLayout.java => PropertyFileAcceptPage_updateClobWithParameterLayout.java} (92%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/{PropertyFileAcceptVm_updateWithMetaAnnotation.java => PropertyFileAcceptPage_updateWithMetaAnnotation.java} (92%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/{PropertyFileAcceptVm_updateWithMetaAnnotationOverridden.java => PropertyFileAcceptPage_updateWithMetaAnnotationOverridden.java} (92%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/{PropertyFileAcceptVm_updateWithParameterLayout.java => PropertyFileAcceptPage_updateWithParameterLayout.java} (92%)
create mode 100644 viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/ScalarPanelAdditionalButton.java
[causeway] 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/causeway.git
commit a50d2f8380008767d784eacd976420e3b07532db
Merge: fd6d443b1a 640fe28c9a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Mar 31 22:52:05 2023 +0200
Merge remote-tracking branch 'origin/master' into spring6
.../causeway/core/metamodel/consent/Consent.java | 50 +++++++--
.../core/metamodel/consent/ConsentAbstract.java | 29 +++--
.../core/metamodel/consent/InteractionResult.java | 42 ++++---
.../causeway/core/metamodel/consent/Veto.java | 2 +-
.../invocation/ActionDomainEventFacetAbstract.java | 16 ++-
.../facets/members/disabled/DisabledFacet.java | 24 ++--
.../members/disabled/DisabledFacetAbstract.java | 33 +++---
.../disabled/DisabledFacetForContributee.java | 3 +-
.../method/DisableForContextFacetNone.java | 9 +-
.../method/DisableForContextFacetViaMethod.java | 22 ++--
.../choices/ChoicesFacetFromBoundedAbstract.java | 9 +-
.../disabled/DisabledObjectFacetAbstract.java | 9 +-
.../method/DisabledObjectFacetViaMethod.java | 20 ++--
.../ImmutableFacetForDomainObjectAnnotation.java | 6 +-
...FacetForDomainObjectAnnotationAsConfigured.java | 3 +-
.../editing/ImmutableFacetFromConfiguration.java | 6 +-
.../facets/object/immutable/ImmutableFacet.java | 5 +-
.../object/immutable/ImmutableFacetAbstract.java | 38 ++++---
.../value/ImmutableFacetViaValueSemantics.java | 3 +-
.../disable/ActionParameterDisabledFacet.java | 7 +-
.../ActionParameterDisabledFacetAbstract.java | 7 +-
.../ActionParameterDisabledFacetViaMethod.java | 19 ++--
.../DisabledFacetOnPropertyFromImmutable.java | 15 +--
.../DisabledFacetForPropertyAnnotation.java | 9 +-
...acetForPropertyAnnotationInvertedSemantics.java | 5 +-
.../modify/PropertyDomainEventFacetAbstract.java | 20 ++--
.../interactions/DisablingInteractionAdvisor.java | 5 +-
.../metamodel/interactions/InteractionUtils.java | 30 +++--
.../interactions/managed/InteractionVeto.java | 9 +-
.../managed/ParameterNegotiationModel.java | 10 +-
.../managed/PropertyNegotiationModel.java | 10 +-
.../authorization/AuthorizationFacetAbstract.java | 9 +-
.../specloader/specimpl/ObjectActionDefault.java | 4 +-
.../specimpl/OneToManyAssociationMixedIn.java | 3 +-
.../specimpl/OneToOneAssociationMixedIn.java | 3 +-
.../metamodel/consent/InteractionResultTest.java | 28 +++--
.../PropertyAnnotationFacetFactoryTest.java | 3 +-
.../src/main/java/demoapp/dom/DemoModuleJpa.java | 2 +
.../dom/domain/actions/Action/ActionMenu.java | 6 +-
.../ActionDomainEventControlStrategy.java | 62 ++---------
...ava => ActionDomainEventControlSubscriber.java} | 20 +---
.../ActionDomainEventPage-description.adoc | 102 +++++++++++++++++
...mainEventVm.java => ActionDomainEventPage.java} | 38 +------
...layout.xml => ActionDomainEventPage.layout.xml} | 33 ++++--
...tionDomainEventPage_changeControlStrategy.java} | 28 ++---
... => ActionDomainEventPage_controlStrategy.java} | 9 +-
....java => ActionDomainEventPage_updateText.java} | 26 ++---
...ionDomainEventPage_updateTextNotAnnotated.java} | 29 ++---
.../ActionDomainEventVm-description.adoc | 123 ---------------------
.../CollectionDomainEventVm-description.adoc | 4 -
.../objects/DomainObject/DomainObjectMenu.java | 12 +-
.../jpa/DomainObjectMixinMethodJpa.java | 2 +-
...omainObjectXxxDomainEventPage-description.adoc} | 1 -
...Vm.java => DomainObjectXxxDomainEventPage.java} | 6 +-
...l => DomainObjectXxxDomainEventPage.layout.xml} | 13 ++-
...sVm.java => DomainObjectXxxLifecycleEvent.java} | 36 +++---
...ml => DomainObjectXxxLifecycleEvent.layout.xml} | 46 ++++++--
...ainObjectXxxLifecyleEventPage-description.adoc} | 1 +
....java => DomainObjectXxxLifecyleEventPage.java} | 6 +-
...=> DomainObjectXxxLifecyleEventPage.layout.xml} | 13 ++-
...mainObjectXxxLifecycleEventJpa-description.adoc | 11 ++
.../jpa/DomainObjectXxxLifecycleEventJpa.java} | 14 +--
.../DomainObjectXxxLifecycleEventJpaEntities.java | 28 +++--
.../domain/properties/Property/PropertyMenu.java | 30 +++--
...oc => PropertyDomainEventPage-description.adoc} | 7 +-
...inEventVm.java => PropertyDomainEventPage.java} | 8 +-
...yout.xml => PropertyDomainEventPage.layout.xml} | 0
.../PropertyDomainEventControlService.java | 6 +-
.../PropertyDomainEventControlStrategy.java | 16 +--
.../PropertyDomainEventVm_controlText.java | 4 +-
.../PropertyDomainEventVm_controlTextEditing.java | 6 +-
...n.adoc => PropertyEditingPage-description.adoc} | 12 +-
...ertyEditingVm.java => PropertyEditingPage.java} | 6 +-
...m.layout.xml => PropertyEditingPage.layout.xml} | 0
.../EditingReasonDisabledMetaAnnotation.java} | 36 +++---
...pertyEditingReasonDisabledPage-description.adoc | 4 +
.../PropertyEditingReasonDisabledPage.java} | 28 ++---
.../PropertyEditingReasonDisabledPage.layout.xml} | 0
...doc => PropertyFileAcceptPage-description.adoc} | 24 ++--
...leAcceptVm.java => PropertyFileAcceptPage.java} | 4 +-
.../PropertyFileAcceptPage.layout.xml} | 0
...eAcceptPage_updateClobWithParameterLayout.java} | 6 +-
...tyFileAcceptPage_updateWithMetaAnnotation.java} | 6 +-
...ptPage_updateWithMetaAnnotationOverridden.java} | 6 +-
...yFileAcceptPage_updateWithParameterLayout.java} | 6 +-
.../src/main/java/demoapp/dom/menubars.layout.xml | 1 +
.../facets/TenantedAuthorizationFacetDefault.java | 30 ++---
...hPdfJsViewer_IntegTest.dump_facets.approved.xml | 1 +
..._MixinDomain_IntegTest.dump_facets.approved.xml | 1 +
.../DisabledFacetFromJdoPrimaryKeyAnnotation.java | 3 +-
.../DomainModelTest_usingGoodDomain.java | 2 +-
...InteractionTest_notUsingAllowSafeSemantics.java | 4 +-
...ionInteractionTest_usingAllowSafeSemantics.java | 2 +-
.../interaction/DomainObjectTesterFactory.java | 10 +-
.../model/decorators/DisablingDecorator.java | 2 +-
.../commons/model/scalar/HasUiParameter.java | 5 +-
.../viewer/commons/model/scalar/HasUiProperty.java | 7 +-
.../viewer/commons/model/scalar/UiParameter.java | 9 +-
.../viewer/commons/model/scalar/UiProperty.java | 7 +-
.../viewer/commons/model/scalar/UiScalar.java | 8 +-
.../AbstractObjectMemberReprRenderer.java | 2 +-
.../resources/DomainObjectResourceServerside.java | 4 +-
.../resources/InteractionFailureHandler.java | 12 +-
.../resources/ObjectAdapterUpdateHelper.java | 4 +-
.../viewer/wicket/model/models/ScalarModel.java | 2 +-
.../wicket/model/models/ScalarPropertyModel.java | 2 +-
.../actionresponse/ActionResultResponseType.java | 3 -
.../components/scalars/ScalarFragmentFactory.java | 49 ++++++--
.../ui/components/scalars/ScalarPanelAbstract.java | 7 +-
.../components/scalars/ScalarPanelAbstract2.java | 98 +++++++++++-----
.../scalars/ScalarPanelAdditionalButton.java | 91 +++++++++++++++
.../scalars/ScalarPanelFormFieldAbstract.html | 8 ++
.../scalars/ScalarPanelFormFieldAbstract.java | 5 +-
.../widgets/linkandlabel/ActionLink.java | 4 +-
.../wicket/ui/panels/FormExecutorDefault.java | 2 +-
115 files changed, 1033 insertions(+), 763 deletions(-)
diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventControlSubscriber.java
index 20714d7276,caf4dce9de..19904852a0
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventControlSubscriber.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventControlSubscriber.java
@@@ -16,9 -16,9 +16,9 @@@
* specific language governing permissions and limitations
* under the License.
*/
- package demoapp.dom.domain.actions.Action.domainEvent.subscribers;
+ package demoapp.dom.domain.actions.Action.domainEvent;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage_changeControlStrategy.java
index 8bb278e1d4,f3836ba2b4..4d2d115a9f
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage_changeControlStrategy.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage_changeControlStrategy.java
@@@ -16,17 -16,14 +16,14 @@@
* specific language governing permissions and limitations
* under the License.
*/
- package demoapp.dom.domain.actions.Action.domainEvent.subscribers;
+ package demoapp.dom.domain.actions.Action.domainEvent;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.causeway.applib.annotation.Action;
- import org.apache.causeway.applib.annotation.ActionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
- import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.SemanticsOf;
- import demoapp.dom.domain.actions.Action.domainEvent.ActionDomainEventVm;
import lombok.RequiredArgsConstructor;
diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage_controlStrategy.java
index cb1fa45bfd,3c6514b17e..3cc16f9f59
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage_controlStrategy.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage_controlStrategy.java
@@@ -16,9 -16,9 +16,9 @@@
* specific language governing permissions and limitations
* under the License.
*/
- package demoapp.dom.domain.actions.Action.domainEvent.subscribers;
+ package demoapp.dom.domain.actions.Action.domainEvent;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java
index bb3839649e,29aa7593b0..6e0db8d6dc
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java
@@@ -36,10 -26,15 +36,10 @@@ import demoapp.dom.domain.objects.Domai
import demoapp.dom.domain.objects.DomainObject.introspection.DomainObjectIntrospectionPage;
import demoapp.dom.domain.objects.DomainObject.mixinMethod.DomainObjectMixinMethodPage;
import demoapp.dom.domain.objects.DomainObject.nature.DomainObjectNaturePage;
- import demoapp.dom.domain.objects.DomainObject.xxxDomainEvent.DomainObjectDomainEventsVm;
- import demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent.DomainObjectLifecyleEventsVm;
+ import demoapp.dom.domain.objects.DomainObject.xxxDomainEvent.DomainObjectXxxDomainEventPage;
+ import demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent.DomainObjectXxxLifecyleEventPage;
import lombok.RequiredArgsConstructor;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.apache.causeway.applib.annotation.*;
-
@Named("demo.DomainObjectMenu")
@DomainService(
nature=NatureOfService.VIEW
diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editingReasonDisabled/PropertyEditingReasonDisabledPage.java
index 4345818b79,6f922f754f..f4d86ad5e0
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editingReasonDisabled/PropertyEditingReasonDisabledPage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editingReasonDisabled/PropertyEditingReasonDisabledPage.java
@@@ -16,14 -16,14 +16,14 @@@
* specific language governing permissions and limitations
* under the License.
*/
- package demoapp.dom.domain.properties.Property.editing;
+ package demoapp.dom.domain.properties.Property.editingReasonDisabled;
-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.DomainObject;
import org.apache.causeway.applib.annotation.Editing;
diff --cc extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/facets/TenantedAuthorizationFacetDefault.java
index e857315335,784fee3b05..2c50dbf99c
--- a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/facets/TenantedAuthorizationFacetDefault.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/facets/TenantedAuthorizationFacetDefault.java
@@@ -18,11 -18,10 +18,10 @@@
*/
package org.apache.causeway.extensions.secman.integration.facets;
- import lombok.val;
-
import java.util.List;
+ import java.util.Optional;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
import org.apache.causeway.applib.services.queryresultscache.QueryResultsCache;
import org.apache.causeway.applib.services.user.UserService;