You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jo...@apache.org on 2021/11/30 13:43:58 UTC

[isis] 03/03: Merge branch 'master' of https://github.com/apache/isis

This is an automated email from the ASF dual-hosted git repository.

joergrade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 30552bbfb20197c565c90565160f76d38f08e031
Merge: 8deeff0 5d73a3e
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Tue Nov 30 14:43:39 2021 +0100

    Merge branch 'master' of https://github.com/apache/isis

 .../workflows/ci-build-artifacts-no-push-maven.yml |   2 +-
 .../modules/ROOT/pages/2021/2.0.0-M7/mignotes.adoc |  35 ++
 api/applib/pom.xml                                 |   6 +
 .../org/apache/isis/applib/clock/VirtualClock.java |  79 ++-
 .../org/apache/isis/applib/id/LogicalType.java     |   4 +-
 .../JavaTimeXMLGregorianCalendarMarshalling.java   |  24 +-
 .../applib/jaxb/PersistentEntitiesAdapter.java     |   6 +-
 .../isis/applib/jaxb/PersistentEntityAdapter.java  |   2 -
 .../isis/applib/services/bookmark/Bookmark.java    |  13 +-
 .../applib/services/iactn/ActionInvocation.java    |   3 +-
 .../isis/applib/services/iactn/Execution.java      |   3 +
 .../isis/applib/services/jaxb/JaxbService.java     |  19 +-
 .../services/schema/SchemaValueMarshaller.java     | 102 ++++
 .../isis/applib/util/schema/CommonDtoUtils.java    | 558 +------------------
 .../applib/util/schema/InteractionDtoUtils.java    |  79 ++-
 .../isis/applib/util/schema/_JodaTimeHelper.java   | 139 -----
 ...{ValueSemanticsResolver.java => Converter.java} |  22 +-
 .../applib/value/semantics/EncoderDecoder.java     |   3 +-
 .../isis/applib/value/semantics/OrderRelation.java |  68 +++
 .../value/semantics/TemporalValueSemantics.java    |   2 +
 .../isis/applib/value/semantics/ValueComposer.java |  25 +-
 .../value/semantics/ValueSemanticsAbstract.java    |  13 +
 .../value/semantics/ValueSemanticsProvider.java    |  10 +
 .../value/semantics/ValueSemanticsResolver.java    |  22 +-
 .../applib/util/schema/CommonDtoUtils_Test.java    |  65 +--
 .../schema/CommonDtoUtils_setValueOn_Test.java     |  89 ---
 .../apache/isis/applib/util/schema/Roundtrip.java  | 307 -----------
 api/schema/pom.xml                                 |   4 -
 .../org/apache/isis/schema/common/common-2.0.xsd   |  45 +-
 .../commons/internal/base/_Lazy_ThreadSafe.java    |   5 +-
 .../isis/commons/internal/image/_Images.java       |  23 +-
 .../config/valuetypes/ValueSemanticsRegistry.java  |  36 --
 .../core/metamodel/IsisModuleCoreMetamodel.java    |   6 +-
 .../_testing/MetaModelContext_forTesting.java      |  20 +-
 .../metamodel/consent/InteractionInitiatedBy.java  |  28 +-
 .../actions/action/ActionOverloadingValidator.java |   4 +-
 ...ctionInvocationFacetForDomainEventAbstract.java | 102 ++--
 .../{CommandUtil.java => IdentifierUtil.java}      | 104 ++--
 .../publish/command/CommandPublishingFacet.java    |   4 +-
 ...ableObjectFacetForXmlRootElementAnnotation.java |  25 +-
 .../metamodel/facets/object/value/ValueFacet.java  |   6 +
 .../facets/object/value/ValueFacetAbstract.java    |  14 +
 ...ionOrAnyMatchingValueSemanticsFacetFactory.java |  20 +-
 .../method/PropertyChoicesFacetViaMethod.java      |  10 -
 .../interactions/managed/ManagedAction.java        |  11 +-
 .../interactions/managed/ManagedMember.java        |   6 +-
 .../managed/nonscalar/DataTableModel.java          |  13 +-
 .../identify/ObjectBookmarker_builtinHandlers.java |  28 +
 .../ObjectSpecificationPostProcessorAbstract.java  |  13 +-
 ...ectionParamDefaultsAndChoicesPostProcessor.java |   4 +-
 .../services/metamodel/MetaModelExporter.java      |   4 +-
 .../objectlifecycle/PropertyChangeRecord.java      |   4 +-
 .../spec/{ActionType.java => ActionScope.java}     |  22 +-
 .../isis/core/metamodel/spec/ManagedObjects.java   |  15 -
 .../core/metamodel/spec/ObjectSpecification.java   |   2 -
 .../core/metamodel/spec/feature/ObjectAction.java  |   8 +-
 .../spec/feature/ObjectActionContainer.java        |  77 +--
 .../spec/feature/ObjectAssociationContainer.java   |  55 +-
 .../spec/feature/memento/ActionMemento.java        |   8 +-
 .../metamodel/specloader/SpecificationLoader.java  |   7 +
 .../specloader/SpecificationLoaderDefault.java     |  18 +-
 .../specloader/specimpl/ObjectActionDefault.java   |  26 +-
 .../specloader/specimpl/ObjectMemberContainer.java |  26 +-
 .../specimpl/ObjectSpecificationAbstract.java      |  30 +-
 .../specimpl/dflt/ObjectSpecificationDefault.java  |  23 +-
 .../valuesemantics/BookmarkValueSemantics.java     |  36 +-
 .../BufferedImageValueSemantics.java               |  21 +
 .../LocalResourcePathValueSemantics.java           |   2 +-
 .../valuesemantics/MarkupValueSemantics.java       |   2 +-
 .../valuesemantics/OidDtoValueSemantics.java       |  69 +--
 .../valuesemantics/URLValueSemantics.java          |   2 +-
 .../valuesemantics/UUIDValueSemantics.java         |   2 +-
 .../temporal/LocalDateTimeValueSemantics.java      |  12 +-
 .../temporal/LocalDateValueSemantics.java          |  12 +-
 .../temporal/LocalTimeValueSemantics.java          |   8 +
 .../temporal/OffsetDateTimeValueSemantics.java     |   8 +
 .../temporal/OffsetTimeValueSemantics.java         |   8 +
 .../temporal/TemporalValueSemanticsProvider.java   |  33 +-
 .../temporal/ZonedDateTimeValueSemantics.java      |   8 +
 .../temporal/legacy/JavaSqlDateValueSemantics.java |  11 +-
 .../legacy/JavaSqlTimeStampValueSemantics.java     |  10 +-
 .../temporal/legacy/JavaSqlTimeValueSemantics.java |  10 +-
 .../legacy/JavaUtilDateValueSemantics.java         |  10 +-
 .../valuetypes/TemporalSemanticsAdapter.java       |  21 +-
 .../valuetypes/ValueSemanticsAdapter.java          |  51 +-
 ...ult.java => ValueSemanticsResolverDefault.java} |  16 +-
 .../testspec/ObjectSpecificationStub.java          |  32 +-
 core/pom.xml                                       |   8 +-
 .../IsisModuleCoreRuntimeServices.java             |   2 +
 .../command/CommandDtoFactoryDefault.java          |  49 +-
 .../command/CommandExecutorServiceDefault.java     |  73 ++-
 .../command/SchemaValueMarshallerDefault.java      | 596 +++++++++++++++++++++
 .../executor/MemberExecutorServiceDefault.java     |  36 +-
 .../interaction/InteractionDtoFactoryDefault.java  |  10 +-
 .../runtimeservices/jaxb/JaxbServiceDefault.java   |  46 +-
 .../runtimeservices/memento/_ObjectMemento.java    |   6 +-
 .../menubars/bootstrap3/MenuBarsServiceBS3.java    |   8 +-
 .../sitemap/SitemapServiceDefault.java             |   6 +-
 .../wrapper/WrapperFactoryDefault.java             |   9 +-
 examples/demo/domain/pom.xml                       |   2 +-
 .../viewmodels/jaxbrefentity/JaxbRefEntity.java    |  12 +-
 .../viewmodels/jaxbrefentity/jdo/JaxbRefJdo.java   |   2 -
 .../viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java   |   2 -
 .../strings/samples/JavaLangStringSamples.java     |  40 --
 examples/demo/pom.xml                              |   2 +-
 examples/demo/vaadin/pom.xml                       |   2 +-
 .../java/demoapp/web/DemoAppManifestCommon.java    |   6 +-
 extensions/pom.xml                                 |   5 +
 extensions/security/secman/applib/pom.xml          |   5 +
 .../dom/ApplicationUserRepositoryAbstract.java     |  35 +-
 .../dom/mixins/ApplicationUser_updatePassword.java |  13 +-
 .../security/secman/encryption-jbcrypt/pom.xml     |   2 -
 .../IsisModuleExtSecmanEncryptionJbcrypt.java      |   4 +-
 ...crypt.java => PasswordEncoderUsingJBcrypt.java} |  23 +-
 .../pom.xml                                        |  15 +-
 .../IsisModuleExtSecmanEncryptionSpring.java       |  58 ++
 .../authenticator/AuthenticatorSecman.java         |  24 +-
 .../AuthenticatorSecmanAutoConfiguration.java      |   8 +-
 extensions/security/secman/pom.xml                 |   1 +
 .../shiro/IsisModuleExtSecmanShiroRealm.java       |  24 +-
 .../ui/component/EventProviderAbstract.java        |   4 +-
 isis-parent/pom.xml                                |   2 +-
 .../isis/extensions/restclient/ResponseDigest.java |  26 +-
 .../applib/IsisBookmarkConverter.java              |   2 +-
 .../_EntityPropertyChangeFactory.java              |   4 +-
 regressiontests/incubating/pom.xml                 |   2 +-
 .../isis/testdomain/shiro/ShiroSecmanLdapTest.java |   4 +-
 .../shiro/ShiroSecmanLdap_restfulStressTest.java   |   4 +-
 .../isis/testdomain/shiro/ShiroSecmanTest.java     |   4 +-
 .../testdomain/interact/ActionInteractionTest.java |   6 +-
 .../testdomain/persistence/jdo/JdoJaxbTest.java    |  94 ++++
 .../testdomain/persistence/jpa/JpaJaxbTest.java    |  94 ++++
 .../isis/testdomain/value/ValueSemanticsTest.java  | 206 ++++---
 .../testdomain/value/ValueSemanticsTester.java     |  68 ++-
 regressiontests/stable/pom.xml                     |  15 +
 .../testdomain/conf/Configuration_headless.java    |   5 +-
 .../isis/testdomain/jdo/JdoInventoryJaxbVm.java    |  95 ++++
 .../isis/testdomain/jpa/JpaInventoryJaxbVm.java    |  77 +++
 .../valuetypes/Configuration_usingValueTypes.java  |   8 +-
 .../model/valuetypes/ValueTypeExample.java         | 417 ++++++++++++--
 .../model/valuetypes/ValueTypeExampleService.java  |  31 ++
 .../interaction/DomainObjectTesterFactory.java     |   3 +-
 starters/pom.xml                                   |   2 +-
 subdomains/poi/pom.xml                             |  10 +
 testing/specsupport/applib/pom.xml                 |  70 ++-
 tooling/pom.xml                                    |   4 +-
 valuetypes/asciidoc/ui/pom.xml                     |   2 +-
 valuetypes/jodatime/applib/pom.xml                 |   8 +
 ...timeConverters.java => JodaTimeConverters.java} |   6 +-
 .../applib/value/JodaTimeConvertersTest.java       |  92 ++++
 .../valuesemantics/JodaDateTimeValueSemantics.java |  16 +-
 .../JodaLocalDateTimeValueSemantics.java           |  16 +-
 .../JodaLocalDateValueSemantics.java               |  16 +-
 .../JodaLocalTimeValueSemantics.java               |  27 +-
 .../domainobjects/ObjectActionReprRenderer.java    |   2 +-
 ...entNegotiationServiceForRestfulObjectsV1_0.java |   6 +-
 .../service/swagger/internal/Caching.java          |   2 +-
 .../service/swagger/internal/Generation.java       |  50 +-
 .../swagger/internal/{Util.java => _Util.java}     |  45 +-
 .../viewer/wicket/model/models/EntityModel.java    |   3 +-
 .../wicket/model/models/ScalarParameterModel.java  |   4 +-
 .../interaction/prop/PropertyInteractionWkt.java   |   5 +-
 .../wicket/model/util/PageParameterUtils.java      |  11 +-
 .../ui/components/scalars/ConverterTester.java     |  23 +-
 .../jodatime/JodaDateTimeConverterTest.java        |   2 +-
 .../jdk8time/OffsetDateTimeConverterTest.java      |   2 +-
 166 files changed, 3299 insertions(+), 2370 deletions(-)