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/12 17:09:08 UTC

[isis] 07/07: 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 2d3e0452ed007a2bd07158e678cbbf1b714ecd41
Merge: 7c3d99d a9c1cb7
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Fri Nov 12 18:08:46 2021 +0100

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

 .../java/org/apache/isis/applib/Identifier.java    |    9 +-
 .../applib/adapters/ValueSemanticsAbstract.java    |    2 -
 .../isis/commons/internal/base/_Optionals.java     |   10 +
 .../metamodel/commons/CanonicalParameterUtil.java  |    9 +-
 .../core/metamodel/facets/all/help/HelpFacet.java  |    2 +-
 .../facets/all/help/HelpFacetAbstract.java         |    8 +-
 .../facets/fallback/FallbackFacetFactory.java      |    3 -
 .../metamodel/facets/fallback/HelpFacetNone.java   |   41 -
 ...acetForPersistentBigDecimalWhenUnspecified.java |   70 +
 .../interactions/managed/ActionInteraction.java    |    5 +-
 .../interactions/managed/ManagedMember.java        |   21 +-
 .../managed/ParameterNegotiationModel.java         |   15 +-
 .../managed/nonscalar/DataTableModel.java          |    7 +-
 .../specimpl/ObjectActionParameterAbstract.java    |    6 +-
 core/pom.xml                                       |   10 +-
 .../sitemap/SitemapServiceDefault.java             |    1 +
 ...shingVm_publishingEnabledAnnotatedEntities.java |    2 +-
 .../usingjaxb/StatefulVmUsingJaxb-description.adoc |    2 +-
 .../objects/other/mixins/MixinVm-description.adoc  |    2 +-
 examples/demo/pre-flight.adoc                      | 2948 ++++++++++++++++++++
 isis-parent/pom.xml                                |    2 +-
 .../impl/IsisModuleExtJaxRsClientImpl.java         |    6 +-
 ...DecimalFromJdoColumnAnnotationFacetFactory.java |   17 +-
 ... => MaxFractionalDigitsFacetFromJdoColumn.java} |    6 +-
 ...malFromJdoColumnAnnotationFacetFactoryTest.java |    2 +-
 ...DecimalFromJpaColumnAnnotationFacetFactory.java |   17 +-
 ...ctionalDigitsFacetFromJpaColumnAnnotation.java} |    6 +-
 regressiontests/stable-cucumber/pom.xml            |    6 +
 .../isis/testdomain/cucumber/CucumberTest.java     |   17 +-
 .../cucumber/HeadlessCucumberTestAbstract.java     |   39 -
 .../apache/isis/testdomain/cucumber/StepDefs.java  |   18 +-
 .../src/test/resources/junit-platform.properties   |    2 +
 .../base/applib/services/BaseServicesModule.java   |    8 +-
 .../applib/services/calendar/CalendarService.java  |   57 +-
 ...darService.java => CalendarServiceDefault.java} |   63 +-
 .../CalendarServiceTest_beginningOfMonth.java      |    2 +-
 .../CalendarServiceTest_beginningOfQuarter.java    |    2 +-
 .../isis/subdomains/docx/applib/DocxService.java   |  399 +--
 .../applib/IsisModuleSubdomainsDocxApplib.java     |    6 +
 .../DocxServiceDefault.java}                       |  162 +-
 .../isis/subdomains/docx/applib/util/Docx.java     |   17 +-
 .../isis/subdomains/docx/applib/util/Dump.java     |   28 +-
 .../isis/subdomains/docx/applib/util/Jdom2.java    |   20 +-
 .../isis/subdomains/docx/applib/util/Types.java    |    2 +-
 .../docx/applib/DocxService_merge_Test.java        |   13 +-
 .../applib/IsisModuleSubdomainsExcelApplib.java    |    8 +-
 .../subdomains/excel/applib/dom/ExcelService.java  |  222 +-
 .../subdomains/excel/applib/dom/WorksheetSpec.java |    2 +-
 .../ExcelServiceDefault.java}                      |  162 +-
 .../_CellMarshaller.java}                          |    8 +-
 .../_ExcelConverter.java}                          |   26 +-
 .../_ExcelServiceHelper.java}                      |   62 +-
 .../applib/{dom => }/util/AnnotationList.java      |    2 +-
 .../applib/{dom => }/util/AnnotationTriplet.java   |    2 +-
 .../{dom => }/util/ExcelFileBlobConverter.java     |    5 +-
 .../excel/applib/{dom => }/util/Mode.java          |    2 +-
 .../excel/applib/{dom => }/util/PivotUtils.java    |    2 +-
 .../excel/applib/{dom => }/util/SheetPivoter.java  |    6 +-
 .../applib/{dom => }/util/AnnotationListTest.java  |    5 +-
 .../{dom => }/util/AnnotationTripletTest.java      |    4 +-
 .../applib/{dom => }/util/PivotUtilsTest.java      |    4 +-
 .../applib/{dom => }/util/SheetPivoterTest.java    |    4 +-
 .../IsisModuleSubdomainsExcelFixtures.java         |    2 +-
 .../ExcelPivotByCategoryAndSubcategoryMenu.java    |    4 +-
 .../DemoFixture_extending_ExcelFixture2.java       |    2 +-
 .../ExcelModuleDemoUploadService_IntegTest.java    |    2 +-
 .../subdomains/excel/testing/ExcelFixture.java     |    7 +-
 .../IsisModuleSubdomainsFreemarkerApplib.java      |    6 +-
 .../applib/IsisModuleSubdomainsOgnlApplib.java     |    2 -
 .../applib/IsisModuleSubdomainsPdfBoxApplib.java   |    6 +-
 .../IsisModuleSubdomainsXDocReportApplib.java      |    8 +-
 .../xdocreport/applib/XDocReportService.java       |   42 +
 .../xdocreport/applib/service/OutputType.java      |   27 -
 .../xdocreport/applib/service/XDocReportModel.java |   48 -
 ...tService.java => XDocReportServiceDefault.java} |   26 +-
 .../applib/service/XDocReportServiceTest.java      |    4 +-
 .../example/models/ProjectDevelopersModel.java     |    2 +-
 .../zip/applib}/IsisModuleExtZip.java              |   10 +-
 .../isis/subdomains/zip/applib/ZipService.java     |   41 +
 .../zip/applib/service/ZipServiceDefault.java}     |   42 +-
 .../integration/ObjectFactoryForIntegration.java   |    8 +-
 .../isis/testing/specsupport/applib/specs/V.java   |  121 +-
 tooling/pom.xml                                    |    2 +-
 .../semantics/AsciiDocValueSemantics.java          |   18 +-
 valuetypes/asciidoc/ui/pom.xml                     |    2 +-
 valuetypes/markdown/pom.xml                        |    2 +-
 .../applib/mixins/Object_impersonateWithRoles.java |    2 +-
 .../rendering/domainobjects/JsonValueEncoder.java  |   43 +-
 .../domainobjects/ObjectPropertyReprRenderer.java  |    8 +-
 .../entityactions/LinkAndLabelFactory.java         |   23 +-
 .../bookmarkedpages/BookmarkedPagesPanel.java      |   43 +-
 .../org/apache/isis/viewer/wicket/ui/util/Wkt.java |   15 +
 92 files changed, 3793 insertions(+), 1391 deletions(-)