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/17 17:37:14 UTC

[causeway] branch spring6 updated (1627b87778 -> 8a74fdfa67)

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 1627b87778 Merge remote-tracking branch 'origin/master' into spring6
     add d6af817fb9 CAUSEWAY-3345: updates release procedures; maintain BASELINE
     add b4aa6eb88f updates links to nightly etc
     add 866d39af8c Merge pull request #1488 from apache/CAUSEWAY-3345
     add d9d6cd81eb CAUSEWAY-3382: extends rename script
     add 38e2439c58 CAUSEWAY-3382: a further iteration
     add 4c4e17005c CAUSEWAY-3381 : spikes changing @Scope for @DomainObject
     add bc586311cb CAUSEWAY-3381 : updates javadoc, is all
     add 3ad20fbb0e CAUSEWAY-3381 implements a custom Scope
     add 4e9e2cd263 CAUSEWAY-3381: fixes test for domain objects with nature of BEAN
     add 274b05694d CAUSEWAY-3381: small simplification
     add 42cfba05f3 Merge pull request #1489 from apache/CAUSEWAY-3381
     add 6100167b5f updates docs for h2 console
     add d8f7cf86c3 adds missing import
     add f1f66ba7e8 CAUSEWAY-3383 : reverts change made a couple of commits ago...
     add af2f0ca960 CAUSEWAY-3381: updates javadoc for Nature.BEAN
     add c47de0c3ac CAUSEWAY-3375: combines MetaModelServiceMenu#downloadMetaModel and ...
     add 429a72dec2 CAUSEWAY-3255 : updates docs
     add 8d3f56cba3 CAUSEWAY-3373: fixes potential NPE
     new 8a74fdfa67 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:
 README.adoc                                        |  46 ---
 antora/components/comguide/modules/ROOT/nav.adoc   |   1 +
 .../modules/ROOT/pages/nightly-builds.adoc         |  13 +-
 .../ROOT/pages/post-release-successful.adoc        |  47 +++
 .../comguide/modules/ROOT/pages/starter-apps.adoc  |  18 +-
 .../comguide/modules/ROOT/pages/weekly-builds.adoc |  69 +++++
 .../components/docs/modules/ROOT/pages/about.adoc  |  13 +-
 .../docs/modules/ROOT/pages/downloads/how-to.adoc  |   8 +-
 .../modules/ROOT/pages/landing-page/releases.adoc  |  17 +-
 .../ROOT/partials/module-nav/framework.adoc        |   6 +
 .../docs/modules/support/partials/module-nav.adoc  |   5 -
 .../applib/pages/index/CausewayModuleApplib.adoc   |   1 +
 .../applib/pages/index/annotation/Nature.adoc      |  15 +
 .../pages/index/value/LocalResourcePath.adoc       |   1 +
 .../runtimeservices/xml/XmlServiceDefault.adoc     |   1 +
 .../manager/AuthorizationManager.adoc              |   1 +
 .../sse/wicket/CausewayModuleExtSseWicket.adoc     |   1 +
 .../sse/wicket/services/SseServiceDefault.adoc     |   1 +
 .../webmodule/WebModuleServerSentEvents.adoc       |   1 +
 .../schema/pages/index/CausewayModuleSchema.adoc   |   1 +
 .../index/bypass/CausewayModuleSecurityBypass.adoc |   1 +
 .../bypass/authentication/AuthenticatorBypass.adoc |   1 +
 .../bypass/authorization/AuthorizorBypass.adoc     |   1 +
 .../index/spring/CausewayModuleSecuritySpring.adoc |   1 +
 .../spring/authentication/AuthenticatorSpring.adoc |   1 +
 .../spring/webmodule/WebModuleSpringSecurity.adoc  |   1 +
 .../applib/fixturescripts/FixtureScripts.adoc      |   2 +
 .../index/h2console/ui/services/H2ManagerMenu.adoc |   1 -
 .../CausewayModuleValJodatimeIntegration.adoc      |   1 +
 antora/supplemental-ui/index.html                  |  10 +-
 .../causeway/applib/annotation/DomainObject.java   |   5 +-
 .../apache/causeway/applib/annotation/Nature.java  |  33 ++
 .../services/metamodel/MetaModelServiceMenu.java   |  73 ++---
 core/adoc/modules/_overview/pages/about.adoc       | 341 +--------------------
 .../CausewayBeanFactoryPostProcessorForSpring.java |   3 +-
 .../config/beans/CausewayDomainObjectScope.java    |  90 ++++++
 .../EventSubscriberDemoImplementation.java         |   3 +-
 .../model/valuetypes/ValueTypeExample.java         |  91 +++---
 scripts/ci/rename-all-published-sources.jsh        |  50 ++-
 starters/adoc/modules/starters/pages/about.adoc    |  16 +-
 .../applib/fixturescripts/FixtureScripts.java      |  11 +-
 .../adoc/modules/h2console/pages/about.adoc        |  37 ++-
 .../h2console/ui/services/H2ManagerMenu.java       |  13 +-
 .../viewer/wicket/ui/pages/PageAbstract.java       |   5 +-
 44 files changed, 496 insertions(+), 561 deletions(-)
 create mode 100644 antora/components/comguide/modules/ROOT/pages/weekly-builds.adoc
 create mode 100644 core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayDomainObjectScope.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 8a74fdfa6792a5a307275dd98d10f69a745a5f18
Merge: 1627b87778 8d3f56cba3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Mar 17 18:37:08 2023 +0100

    Merge remote-tracking branch 'origin/master' into spring6

 README.adoc                                        |  46 ---
 antora/components/comguide/modules/ROOT/nav.adoc   |   1 +
 .../modules/ROOT/pages/nightly-builds.adoc         |  13 +-
 .../ROOT/pages/post-release-successful.adoc        |  47 +++
 .../comguide/modules/ROOT/pages/starter-apps.adoc  |  18 +-
 .../comguide/modules/ROOT/pages/weekly-builds.adoc |  69 +++++
 .../components/docs/modules/ROOT/pages/about.adoc  |  13 +-
 .../docs/modules/ROOT/pages/downloads/how-to.adoc  |   8 +-
 .../modules/ROOT/pages/landing-page/releases.adoc  |  17 +-
 .../ROOT/partials/module-nav/framework.adoc        |   6 +
 .../docs/modules/support/partials/module-nav.adoc  |   5 -
 .../applib/pages/index/CausewayModuleApplib.adoc   |   1 +
 .../applib/pages/index/annotation/Nature.adoc      |  15 +
 .../pages/index/value/LocalResourcePath.adoc       |   1 +
 .../runtimeservices/xml/XmlServiceDefault.adoc     |   1 +
 .../manager/AuthorizationManager.adoc              |   1 +
 .../sse/wicket/CausewayModuleExtSseWicket.adoc     |   1 +
 .../sse/wicket/services/SseServiceDefault.adoc     |   1 +
 .../webmodule/WebModuleServerSentEvents.adoc       |   1 +
 .../schema/pages/index/CausewayModuleSchema.adoc   |   1 +
 .../index/bypass/CausewayModuleSecurityBypass.adoc |   1 +
 .../bypass/authentication/AuthenticatorBypass.adoc |   1 +
 .../bypass/authorization/AuthorizorBypass.adoc     |   1 +
 .../index/spring/CausewayModuleSecuritySpring.adoc |   1 +
 .../spring/authentication/AuthenticatorSpring.adoc |   1 +
 .../spring/webmodule/WebModuleSpringSecurity.adoc  |   1 +
 .../applib/fixturescripts/FixtureScripts.adoc      |   2 +
 .../index/h2console/ui/services/H2ManagerMenu.adoc |   1 -
 .../CausewayModuleValJodatimeIntegration.adoc      |   1 +
 antora/supplemental-ui/index.html                  |  10 +-
 .../causeway/applib/annotation/DomainObject.java   |   5 +-
 .../apache/causeway/applib/annotation/Nature.java  |  33 ++
 .../services/metamodel/MetaModelServiceMenu.java   |  73 ++---
 core/adoc/modules/_overview/pages/about.adoc       | 341 +--------------------
 .../CausewayBeanFactoryPostProcessorForSpring.java |   3 +-
 .../config/beans/CausewayDomainObjectScope.java    |  90 ++++++
 .../EventSubscriberDemoImplementation.java         |   3 +-
 .../model/valuetypes/ValueTypeExample.java         |  91 +++---
 scripts/ci/rename-all-published-sources.jsh        |  50 ++-
 starters/adoc/modules/starters/pages/about.adoc    |  16 +-
 .../applib/fixturescripts/FixtureScripts.java      |  11 +-
 .../adoc/modules/h2console/pages/about.adoc        |  37 ++-
 .../h2console/ui/services/H2ManagerMenu.java       |  13 +-
 .../viewer/wicket/ui/pages/PageAbstract.java       |   5 +-
 44 files changed, 496 insertions(+), 561 deletions(-)

diff --cc api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java
index 3d522e8cdc,6ecca3273e..9382dfad8d
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/metamodel/MetaModelServiceMenu.java
@@@ -21,24 -21,15 +21,26 @@@ package org.apache.causeway.applib.serv
  import java.io.IOException;
  import java.util.ArrayList;
  import java.util.List;
- import java.util.SortedSet;
  import java.util.function.BiFunction;
  
 -import javax.inject.Inject;
 -import javax.inject.Named;
 +import static java.nio.charset.StandardCharsets.UTF_8;
 +
++import jakarta.inject.Inject;
++import jakarta.inject.Named;
+ 
  import org.apache.causeway.applib.CausewayModuleApplib;
 -import org.apache.causeway.applib.annotation.*;
 +import org.apache.causeway.applib.annotation.Action;
 +import org.apache.causeway.applib.annotation.ActionLayout;
 +import org.apache.causeway.applib.annotation.DomainService;
 +import org.apache.causeway.applib.annotation.DomainServiceLayout;
 +import org.apache.causeway.applib.annotation.MemberSupport;
 +import org.apache.causeway.applib.annotation.NatureOfService;
 +import org.apache.causeway.applib.annotation.Optionality;
 +import org.apache.causeway.applib.annotation.Parameter;
 +import org.apache.causeway.applib.annotation.ParameterLayout;
 +import org.apache.causeway.applib.annotation.PriorityPrecedence;
 +import org.apache.causeway.applib.annotation.RestrictTo;
 +import org.apache.causeway.applib.annotation.SemanticsOf;
  import org.apache.causeway.applib.services.jaxb.JaxbService;
  import org.apache.causeway.applib.value.Blob;
  import org.apache.causeway.applib.value.Clob;
@@@ -48,9 -39,7 +50,7 @@@ import org.apache.causeway.commons.inte
  import org.apache.causeway.commons.io.JaxbUtils;
  import org.apache.causeway.schema.metamodel.v2.MetamodelDto;
  
- import jakarta.inject.Inject;
- import jakarta.inject.Named;
 -import static java.nio.charset.StandardCharsets.UTF_8;
 +import lombok.val;
  
  /**
   * Provides a UI to allow domain model metadata (obtained from {@link MetaModelService}) to be downloaded.
diff --cc examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberDemoImplementation.java
index f37dee724a,67096c3114..3bef247197
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberDemoImplementation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventSubscriberDemoImplementation.java
@@@ -20,10 -20,11 +20,11 @@@ package demoapp.dom.services.core.event
  
  import static demoapp.dom._infra.utils.LogUtils.emphasize;
  
 -import javax.inject.Inject;
 -import javax.inject.Named;
 +import jakarta.inject.Inject;
 +import jakarta.inject.Named;
  
  import org.springframework.beans.factory.annotation.Qualifier;
+ import org.springframework.context.annotation.Scope;
  import org.springframework.context.event.EventListener;
  import org.springframework.stereotype.Service;
  
diff --cc testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/services/H2ManagerMenu.java
index 8b5d6d64a9,cab035f800..898379d80e
--- a/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/services/H2ManagerMenu.java
+++ b/testing/h2console/ui/src/main/java/org/apache/causeway/testing/h2console/ui/services/H2ManagerMenu.java
@@@ -18,25 -18,21 +18,29 @@@
   */
  package org.apache.causeway.testing.h2console.ui.services;
  
 -import lombok.RequiredArgsConstructor;
 -
  import java.util.Optional;
  
 -import javax.annotation.Priority;
 -import javax.inject.Inject;
 -import javax.inject.Named;
++import jakarta.annotation.Priority;
 +import jakarta.inject.Inject;
 +import jakarta.inject.Named;
  
  import org.apache.causeway.applib.CausewayModuleApplib;
 -import org.apache.causeway.applib.annotation.*;
 +import org.apache.causeway.applib.annotation.Action;
 +import org.apache.causeway.applib.annotation.ActionLayout;
 +import org.apache.causeway.applib.annotation.DomainService;
 +import org.apache.causeway.applib.annotation.DomainServiceLayout;
 +import org.apache.causeway.applib.annotation.MemberSupport;
 +import org.apache.causeway.applib.annotation.NatureOfService;
 +import org.apache.causeway.applib.annotation.PriorityPrecedence;
 +import org.apache.causeway.applib.annotation.RestrictTo;
 +import org.apache.causeway.applib.annotation.SemanticsOf;
  import org.apache.causeway.applib.value.LocalResourcePath;
+ import org.apache.causeway.core.config.CausewayConfiguration;
  import org.apache.causeway.testing.h2console.ui.CausewayModuleTestingH2ConsoleUi;
  import org.apache.causeway.testing.h2console.ui.webmodule.WebModuleH2Console;
  
++import lombok.RequiredArgsConstructor;
++
  /**
   * @since 2.0 {@index}
   */