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/22 06:21:58 UTC
[causeway] branch spring6 updated (15f7c42e62 -> 7d0425e34d)
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 15f7c42e62 Merge pull request #1506 from apache/dependabot/maven/spring6/vaadin.version-24.0.1
add 6bf275f2b8 updates docs in demo app for @DomainObject#entityPropertyChange.
add e87d18ff68 CAUSEWAY-3255: updates to website
add 50c62f32c6 Bump vaadin.version from 23.3.7 to 23.3.8
add 6c1b3bea40 Merge pull request #1505 from apache/dependabot/maven/master/vaadin.version-23.3.8
new 7d0425e34d 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:
.../components/docs/modules/ROOT/pages/about.adoc | 41 +++++++---
.../modules/ROOT/pages/landing-page/catalogs.adoc | 22 ------
.../docs/modules/ROOT/partials/component-nav.adoc | 2 +-
.../modules/ROOT/partials/module-nav/catalogs.adoc | 8 --
.../ROOT/partials/module-nav/components.adoc | 13 ++--
.../ROOT/partials/module-nav/extensions.adoc} | 51 +++++++++----
.../modules/ROOT/partials/module-nav/guides.adoc | 3 +
.../modules/applib-classes/pages/value-types.adoc | 2 +-
.../applib-classes/partials/module-nav.adoc | 1 -
.../modules/ROOT/pages/2020/2.0.0-M3/relnotes.adoc | 2 +-
.../modules/ROOT/partials/extensions.adoc | 2 +-
antora/supplemental-ui/index.html | 3 +-
.../resources/MarkupVariableResolverService.java | 58 ++++++++++++---
.../_changes/ExposeCapturedChanges_clear.java | 11 +--
.../ExposeCapturedChanges_recentChanges.java | 4 +-
.../ExposePersistedCommands_commands.java | 1 +
...utionListenerToCaptureInteractionsInMemory.java | 61 ---------------
.../ExposeCapturedInteractions_clear.java | 50 -------------
...tions.java => ExposePersistedInteractions.java} | 2 +-
... ExposePersistedInteractions_interactions.java} | 16 ++--
.../ExposePropertyChanges.java} | 4 +-
.../ExposePropertyChanges_propertyChanges.java} | 23 +++---
.../ActionCommandPublishingJdo-description.adoc | 48 ++----------
.../ActionCommandPublishingJpa-description.adoc | 48 ++----------
.../ActionExecutionPublishingEntity.java | 4 +-
.../ActionExecutionPublishingJdo-description.adoc | 4 +-
.../ActionExecutionPublishingJpa-description.adoc | 4 +-
.../DomainObjectEntityChangePublishingEntity.java | 1 -
...ObjectEntityChangePublishingVm-description.adoc | 87 ++++++----------------
.../DomainObjectEntityChangePublishingVm.java | 3 +-
...omainObjectEntityChangePublishingVm_delete.java | 46 +++++++-----
...ObjectEntityChangePublishingDisabledEntity.java | 1 +
...hingVm_publishingDisabledAnnotatedEntities.java | 3 +
...ityChangePublishingDisabledJdo-description.adoc | 4 +-
...ityChangePublishingDisabledJpa-description.adoc | 4 +-
...shingVm_publishingEnabledAnnotatedEntities.java | 2 +
...tityChangePublishingEnabledJdo-description.adoc | 4 +-
...tityChangePublishingEnabledJpa-description.adoc | 4 +-
...ChangePublishingEnabledMetaAnnotatedEntity.java | 1 +
...gVm_publishingEnabledMetaAnnotatedEntities.java | 2 +
...lishingEnabledMetaAnnotatedJdo-description.adoc | 7 +-
...ityChangePublishingEnabledMetaAnnotatedJdo.java | 1 +
...lishingEnabledMetaAnnotatedJpa-description.adoc | 7 +-
...blishingEnabledMetaAnnotOverriddenEntities.java | 3 +
...gEnabledMetaAnnotOverriddenJdo-description.adoc | 16 ++--
...gEnabledMetaAnnotOverriddenJpa-description.adoc | 19 +++--
.../DomainObjectMixinMethodVm-description.adoc | 6 +-
.../DomainObjectLifecyleEventsVm-description.adoc | 6 +-
.../PropertyCommandPublishingJdo-description.adoc | 77 ++++++++++---------
.../PropertyCommandPublishingJpa-description.adoc | 22 +++---
.../PropertyExecutionPublishingEntity.java | 4 +-
...PropertyExecutionPublishingJdo-description.adoc | 8 +-
...PropertyExecutionPublishingJpa-description.adoc | 6 +-
.../dom/homepage/DemoHomePage-description.adoc | 2 +-
.../src/main/java/demoapp/dom/menubars.layout.xml | 82 ++++++++++----------
.../src/main/resources/static/css/application.css | 7 +-
.../resources/ResourceReaderService_Test.java | 8 +-
.../src/main/resources/static/index.html | 2 +
.../src}/resources/static/index.html | 2 +
.../jpa/src/{ => main}/resources/log4j2-spring.xml | 0
.../src/main/resources/static/index.html | 2 +
extensions/adoc/antora.yml | 2 +-
extensions/adoc/modules/ROOT/pages/about.adoc | 11 +--
.../shiro-realm-ldap/partials/module-nav.adoc | 2 +-
.../vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc | 11 +--
.../adoc/modules/ROOT/partials/extensions.adoc | 6 +-
.../adoc/modules/unittestsupport/pages/about.adoc | 2 +-
valuetypes/adoc/modules/ROOT/pages/about.adoc | 2 +-
.../pages/extending/replacing-page-elements.adoc | 4 +-
69 files changed, 421 insertions(+), 556 deletions(-)
delete mode 100644 antora/components/docs/modules/ROOT/pages/landing-page/catalogs.adoc
delete mode 100644 antora/components/docs/modules/ROOT/partials/module-nav/catalogs.adoc
copy antora/components/{refguide-index/modules/extensions/pages/index/secman/applib/user/dom/ApplicationUserStatus.adoc => docs/modules/ROOT/partials/module-nav/extensions.adoc} (50%)
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/ExecutionListenerToCaptureInteractionsInMemory.java
delete mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/ExposeCapturedInteractions_clear.java
rename examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/{ExposeCapturedInteractions.java => ExposePersistedInteractions.java} (95%)
rename examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/{ExposeCapturedInteractions_interactions.java => ExposePersistedInteractions_interactions.java} (69%)
copy examples/demo/domain/src/main/java/demoapp/dom/domain/{_changes/ExposeCapturedChanges.java => _propertychanges/ExposePropertyChanges.java} (91%)
copy examples/demo/domain/src/main/java/demoapp/dom/domain/{_changes/ExposeCapturedChanges_recentChanges.java => _propertychanges/ExposePropertyChanges_propertyChanges.java} (66%)
copy examples/demo/wicket/{common => jdo}/src/main/resources/static/index.html (99%)
copy examples/demo/wicket/{common/src/main => jpa-and-graphql/src}/resources/static/index.html (99%)
rename examples/demo/wicket/jpa/src/{ => main}/resources/log4j2-spring.xml (100%)
rename examples/demo/wicket/{common => jpa}/src/main/resources/static/index.html (99%)
[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 7d0425e34d091b0c77d2a8708b776e82a61374df
Merge: 15f7c42e62 6c1b3bea40
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Mar 22 07:21:50 2023 +0100
Merge remote-tracking branch 'origin/master' into spring6
.../components/docs/modules/ROOT/pages/about.adoc | 41 +++++++---
.../modules/ROOT/pages/landing-page/catalogs.adoc | 22 ------
.../docs/modules/ROOT/partials/component-nav.adoc | 2 +-
.../modules/ROOT/partials/module-nav/catalogs.adoc | 8 --
.../ROOT/partials/module-nav/components.adoc | 13 ++--
.../ROOT/partials/module-nav/extensions.adoc | 38 ++++++++++
.../modules/ROOT/partials/module-nav/guides.adoc | 3 +
.../modules/applib-classes/pages/value-types.adoc | 2 +-
.../applib-classes/partials/module-nav.adoc | 1 -
.../modules/ROOT/pages/2020/2.0.0-M3/relnotes.adoc | 2 +-
.../modules/ROOT/partials/extensions.adoc | 2 +-
antora/supplemental-ui/index.html | 3 +-
.../resources/MarkupVariableResolverService.java | 58 ++++++++++++---
.../_changes/ExposeCapturedChanges_clear.java | 11 +--
.../ExposeCapturedChanges_recentChanges.java | 4 +-
.../ExposePersistedCommands_commands.java | 1 +
...utionListenerToCaptureInteractionsInMemory.java | 61 ---------------
...tions.java => ExposePersistedInteractions.java} | 2 +-
... ExposePersistedInteractions_interactions.java} | 16 ++--
.../ExposePropertyChanges.java} | 33 ++------
.../ExposePropertyChanges_propertyChanges.java} | 23 +++---
.../ActionCommandPublishingJdo-description.adoc | 48 ++----------
.../ActionCommandPublishingJpa-description.adoc | 48 ++----------
.../ActionExecutionPublishingEntity.java | 4 +-
.../ActionExecutionPublishingJdo-description.adoc | 4 +-
.../ActionExecutionPublishingJpa-description.adoc | 4 +-
.../DomainObjectEntityChangePublishingEntity.java | 1 -
...ObjectEntityChangePublishingVm-description.adoc | 87 ++++++----------------
.../DomainObjectEntityChangePublishingVm.java | 3 +-
...omainObjectEntityChangePublishingVm_delete.java | 46 +++++++-----
...ObjectEntityChangePublishingDisabledEntity.java | 1 +
...hingVm_publishingDisabledAnnotatedEntities.java | 3 +
...ityChangePublishingDisabledJdo-description.adoc | 4 +-
...ityChangePublishingDisabledJpa-description.adoc | 4 +-
...shingVm_publishingEnabledAnnotatedEntities.java | 2 +
...tityChangePublishingEnabledJdo-description.adoc | 4 +-
...tityChangePublishingEnabledJpa-description.adoc | 4 +-
...ChangePublishingEnabledMetaAnnotatedEntity.java | 1 +
...gVm_publishingEnabledMetaAnnotatedEntities.java | 2 +
...lishingEnabledMetaAnnotatedJdo-description.adoc | 7 +-
...ityChangePublishingEnabledMetaAnnotatedJdo.java | 1 +
...lishingEnabledMetaAnnotatedJpa-description.adoc | 7 +-
...blishingEnabledMetaAnnotOverriddenEntities.java | 3 +
...gEnabledMetaAnnotOverriddenJdo-description.adoc | 16 ++--
...gEnabledMetaAnnotOverriddenJpa-description.adoc | 19 +++--
.../DomainObjectMixinMethodVm-description.adoc | 6 +-
.../DomainObjectLifecyleEventsVm-description.adoc | 6 +-
.../PropertyCommandPublishingJdo-description.adoc | 77 ++++++++++---------
.../PropertyCommandPublishingJpa-description.adoc | 22 +++---
.../PropertyExecutionPublishingEntity.java | 4 +-
...PropertyExecutionPublishingJdo-description.adoc | 8 +-
...PropertyExecutionPublishingJpa-description.adoc | 6 +-
.../dom/homepage/DemoHomePage-description.adoc | 2 +-
.../src/main/java/demoapp/dom/menubars.layout.xml | 82 ++++++++++----------
.../src/main/resources/static/css/application.css | 7 +-
.../resources/ResourceReaderService_Test.java | 8 +-
.../src/main/resources/static/index.html | 2 +
.../src}/resources/static/index.html | 2 +
.../jpa/src/{ => main}/resources/log4j2-spring.xml | 0
.../src/main/resources/static/index.html | 2 +
extensions/adoc/antora.yml | 2 +-
extensions/adoc/modules/ROOT/pages/about.adoc | 11 +--
.../shiro-realm-ldap/partials/module-nav.adoc | 2 +-
.../vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc | 11 +--
.../adoc/modules/ROOT/partials/extensions.adoc | 6 +-
.../adoc/modules/unittestsupport/pages/about.adoc | 2 +-
valuetypes/adoc/modules/ROOT/pages/about.adoc | 2 +-
.../pages/extending/replacing-page-elements.adoc | 4 +-
68 files changed, 427 insertions(+), 516 deletions(-)
diff --cc examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java
index f6ebe73424,82f80a009b..d0469ba5e2
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java
@@@ -18,12 -18,13 +18,13 @@@
*/
package demoapp.dom._infra.resources;
- import java.util.Map;
- import java.util.Optional;
+ import java.util.*;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+ import org.apache.causeway.commons.internal.collections._Maps;
+ import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
import org.apache.causeway.commons.internal.base._Refs;
diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/ExposePersistedInteractions_interactions.java
index 86576e6af6,15ad10754d..a3bab8ebf4
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/ExposePersistedInteractions_interactions.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/ExposePersistedInteractions_interactions.java
@@@ -21,9 -21,11 +21,11 @@@ package demoapp.dom.domain._interaction
import java.util.LinkedList;
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.causeway.applib.annotation.Collection;
+ import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntry;
+ import org.apache.causeway.extensions.executionlog.applib.dom.ExecutionLogEntryRepository;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/_propertychanges/ExposePropertyChanges_propertyChanges.java
index 57b302aef2,bc4fd0a6e3..b64a8794b3
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/_propertychanges/ExposePropertyChanges_propertyChanges.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/_propertychanges/ExposePropertyChanges_propertyChanges.java
@@@ -16,19 -16,20 +16,20 @@@
* specific language governing permissions and limitations
* under the License.
*/
- package demoapp.dom.domain._changes;
+ package demoapp.dom.domain._propertychanges;
- import java.util.LinkedList;
-import lombok.RequiredArgsConstructor;
-
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.MemberSupport;
+ import org.apache.causeway.extensions.audittrail.applib.dom.AuditTrailEntry;
+ import org.apache.causeway.extensions.audittrail.applib.dom.AuditTrailEntryRepository;
+import lombok.RequiredArgsConstructor;
- import lombok.val;
+
+ @SuppressWarnings("CdiManagedBeanInconsistencyInspection")
//tag::class[]
@Collection
@RequiredArgsConstructor
diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/DomainObjectEntityChangePublishingVm_publishingDisabledAnnotatedEntities.java
index a82058155c,f39600f661..16dd8e415b
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/DomainObjectEntityChangePublishingVm_publishingDisabledAnnotatedEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/DomainObjectEntityChangePublishingVm_publishingDisabledAnnotatedEntities.java
@@@ -20,9 -20,10 +20,10 @@@ package demoapp.dom.domain.objects.Doma
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.causeway.applib.annotation.Collection;
+ import org.apache.causeway.applib.annotation.CollectionLayout;
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.DomainObjectEntityChangePublishingVm;
diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledAnnotatedEntities.java
index 5dd24eb240,9a1e904ea1..65e368d457
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledAnnotatedEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledAnnotatedEntities.java
@@@ -20,9 -20,10 +20,10 @@@ package demoapp.dom.domain.objects.Doma
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.causeway.applib.annotation.Collection;
+ import org.apache.causeway.applib.annotation.CollectionLayout;
import org.apache.causeway.applib.annotation.MemberSupport;
import demoapp.dom._infra.values.ValueHolderRepository;
diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledMetaAnnotatedEntities.java
index a2cf51dfb4,d44373f8a7..e6802dd0f2
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledMetaAnnotatedEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledMetaAnnotatedEntities.java
@@@ -20,9 -20,10 +20,10 @@@ package demoapp.dom.domain.objects.Doma
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.causeway.applib.annotation.Collection;
+ import org.apache.causeway.applib.annotation.CollectionLayout;
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.DomainObjectEntityChangePublishingVm;
diff --cc examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledMetaAnnotOverriddenEntities.java
index c1102589ee,6a0f644555..489a8570b4
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledMetaAnnotOverriddenEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/DomainObjectEntityChangePublishingVm_publishingEnabledMetaAnnotOverriddenEntities.java
@@@ -20,9 -20,10 +20,10 @@@ package demoapp.dom.domain.objects.Doma
import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.causeway.applib.annotation.Collection;
+ import org.apache.causeway.applib.annotation.CollectionLayout;
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.DomainObjectEntityChangePublishingVm;