This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
commit 663f5218f4820216fd2b6779da1bf6d890fcd2f5 Merge: 273efa05fc e1d7ca482e Author: Dan Haywood <[email protected]> AuthorDate: Mon Jul 25 08:49:16 2022 +0100 Merge pull request #1027 from apache/ISIS-3091 Isis 3091, also ISIS-3096, ISIS-3095, ISIS-3094, ISIS-3093, ISIS-3092 .../org/apache/isis/applib/id/LogicalType.java | 4 +- .../applib/mixins/system/DomainChangeRecord.java | 2 + .../appfeat/ApplicationFeatureRepository.java | 8 +- .../services/confview/ConfigurationMenu.java | 4 +- .../services/iactnlayer/InteractionService.java | 29 ++ .../applib/services/layout/LayoutServiceMenu.java | 8 +- .../services/metamodel/MetaModelServiceMenu.java | 16 +- .../publishing/spi/EntityPropertyChange.java | 37 +- .../services/sitemap/SitemapServiceMenu.java | 4 +- .../isis/applib/services/user/ImpersonateMenu.java | 8 +- .../applib/services/user/ImpersonateStopMenu.java | 4 +- .../isis/applib/services/userui/UserMenu.java | 4 +- .../apache/isis/applib/services/wrapper/Mixin.java | 23 +- .../applib/services/wrapper/WrapperFactory.java | 40 +++ .../isis/commons/collections/Can_Multiple.java | 7 +- .../isis/commons/internal/base/_Strings.java | 31 +- .../isis/core/config/IsisModuleCoreConfig.java | 2 + .../IsisBeanFactoryPostProcessorForSpring.java | 3 +- .../config/beans/IsisBeanTypeRegistryDefault.java | 5 +- .../isis/core/config/beans/PersistenceStack.java | 6 + .../isis/core/config/beans/aoppatch/AopPatch.java | 8 +- .../core/config/converters/PatternsConverter.java | 3 +- .../DataSourceIntrospectionService.java | 3 +- .../config/environment/IsisSystemEnvironment.java | 4 +- .../core/config/viewer/web/WebAppContextPath.java | 3 +- .../core/metamodel/IsisModuleCoreMetamodel.java | 2 + .../core/metamodel/context/MetaModelContexts.java | 3 +- .../EntityPropertyChangePublishingPolicyFacet.java | 4 +- .../objectmanager/ObjectManagerDefault.java | 3 +- .../ProgrammingModelInitFilterDefault.java | 3 +- .../metamodel/services/ServiceInjectorDefault.java | 3 +- .../appfeat/ApplicationFeatureDefault.java | 3 +- .../ApplicationFeatureRepositoryDefault.java | 27 +- .../classsubstitutor/ClassSubstitutorDefault.java | 4 +- .../ClassSubstitutorForCollections.java | 3 +- .../ClassSubstitutorForDomainObjects.java | 3 +- .../classsubstitutor/ClassSubstitutorRegistry.java | 3 +- .../services/events/MetamodelEventService.java | 3 +- ...ExceptionRecognizerForRecoverableException.java | 3 +- .../services/grid/GridLoaderServiceDefault.java | 3 +- .../services/grid/GridReaderUsingJaxb.java | 3 +- .../services/grid/GridServiceDefault.java | 3 +- .../grid/bootstrap/GridSystemServiceBootstrap.java | 3 +- .../services/layout/LayoutServiceDefault.java | 3 +- .../metamodel/MetaModelServiceDefault.java | 3 +- .../objectlifecycle/ObjectLifecyclePublisher.java | 3 + .../objectlifecycle/PropertyChangeRecord.java | 40 +-- .../services/registry/ServiceRegistryDefault.java | 7 +- .../tablecol/TableColumnOrderServiceDefault.java | 3 +- .../TableColumnOrderServiceUsingTxtFile.java | 3 +- .../services/title/TitleServiceDefault.java | 3 +- .../specloader/ProgrammingModelServiceDefault.java | 3 +- .../specloader/SpecificationLoaderDefault.java | 3 +- .../valuetypes/ValueSemanticsResolverDefault.java | 5 +- .../isis/core/runtime/IsisModuleCoreRuntime.java | 1 + .../core/runtime/events/MetamodelEventService.java | 3 +- .../idstringifier/IdStringifierLookupService.java | 3 +- .../bookmarks/BookmarkServiceDefault.java | 3 +- .../command/CommandDtoFactoryDefault.java | 3 +- .../command/CommandExecutorServiceDefault.java | 3 +- .../command/SchemaValueMarshallerDefault.java | 3 +- .../runtimeservices/email/EmailServiceDefault.java | 5 +- .../eventbus/EventBusServiceSpring.java | 4 +- .../executor/MemberExecutorServiceDefault.java | 3 +- .../factory/FactoryServiceDefault.java | 14 +- .../homepage/HomePageResolverServiceDefault.java | 3 +- .../i18n/po/TranslationServicePo.java | 3 +- .../icons/ObjectIconServiceDefault.java | 3 +- .../interaction/InteractionDtoFactoryDefault.java | 3 +- .../runtimeservices/jaxb/JaxbServiceDefault.java | 3 +- .../locale/LocaleChoiceProviderDefault.java | 3 +- .../memento/ObjectMementoServiceDefault.java | 3 +- .../menubars/MenuBarsLoaderServiceDefault.java | 3 +- .../menubars/bootstrap/MenuBarsServiceBS.java | 3 +- .../message/MessageServiceDefault.java | 3 +- .../publish/CommandPublisherDefault.java | 3 +- .../publish/EntityChangesPublisherDefault.java | 3 +- .../EntityPropertyChangePublisherDefault.java | 4 +- .../publish/ExecutionPublisherDefault.java | 3 +- .../publish/ObjectLifecyclePublisherDefault.java | 3 +- .../ExceptionRecognizerServiceDefault.java | 3 +- .../ExceptionRecognizerForDataAccessException.java | 5 +- .../repository/RepositoryServiceDefault.java | 3 +- .../routing/RoutingServiceDefault.java | 3 +- .../scratchpad/ScratchpadDefault.java | 3 +- .../session/InteractionServiceDefault.java | 10 +- .../sitemap/SitemapServiceDefault.java | 3 +- .../transaction/TransactionServiceSpring.java | 3 +- .../UrlEncodingServiceWithCompression.java | 3 +- .../user/ImpersonateMenuAdvisorDefault.java | 3 +- .../user/ImpersonatedUserHolderDefault.java | 3 +- .../userreg/EmailNotificationServiceDefault.java | 3 +- .../wrapper/WrapperFactoryDefault.java | 5 +- .../xmlsnapshot/XmlSnapshotServiceDefault.java | 3 +- enhance.sh | 47 +-- .../commandlog/applib/dom/CommandLogEntry.java | 4 +- .../applib/dom/CommandLogEntry.layout.fallback.xml | 40 ++- .../applib/dom/CommandLogEntryRepository.java | 14 +- .../integtest/CommandLog_IntegTestAbstract.java | 38 +- .../src/main/java/META-INF/persistence.xml | 19 - .../commandlog/jdo/dom/CommandLogEntry.java | 40 ++- extensions/core/commandlog/persistence-jpa/pom.xml | 15 +- .../jpa/IsisModuleExtCommandLogPersistenceJpa.java | 17 +- .../commandlog/jpa/dom/CommandLogEntry.java | 4 +- .../executionlog/applib/dom/ExecutionLogEntry.java | 4 +- .../dom/ExecutionLogEntry.layout.fallback.xml | 14 +- .../applib/dom/ExecutionLogEntryRepository.java | 10 +- .../integtest/ExecutionLog_IntegTestAbstract.java | 35 +- .../core/executionlog/persistence-jdo/pom.xml | 2 +- .../executionlog/jdo/dom/ExecutionLogEntry.java | 4 +- .../IsisModuleExtExecutionLogPersistenceJpa.java | 17 +- .../executionlog/jpa/dom/ExecutionLogEntry.java | 4 +- .../applib/dom/ExecutionOutboxEntry.java | 4 +- .../dom/ExecutionOutboxEntry.layout.fallback.xml | 14 +- .../applib/dom/ExecutionOutboxEntryRepository.java | 12 +- .../jdo/dom/ExecutionOutboxEntry.java | 4 +- ...IsisModuleExtExecutionOutboxPersistenceJpa.java | 17 +- .../jpa/dom/ExecutionOutboxEntry.java | 4 +- extensions/pom.xml | 31 ++ .../persistence-jdo => audittrail/applib}/pom.xml | 32 +- .../applib/IsisModuleExtAuditTrailApplib.java} | 20 +- .../audittrail/applib/app/AuditTrailMenu.java} | 72 ++-- .../HasInteractionId_auditTrailEntries.java | 53 +++ .../Object_recentAuditTrailEntries.java | 84 +++++ .../audittrail/applib/dom/AuditTrailEntry.java | 342 ++++++++++++++++++ .../dom/AuditTrailEntry.layout.fallback.xml} | 70 +++- .../audittrail/applib/dom/AuditTrailEntry.png} | Bin .../applib/dom/AuditTrailEntryRepository.java | 178 ++++++++++ ...ntityPropertyChangeSubscriberForAuditTrail.java | 69 ++++ .../integtests/AuditTrail_IntegTestAbstract.java | 209 +++++++++++ .../model/AuditTrailTestDomainModel.java} | 11 +- .../applib/integtests/model/Counter.java | 76 ++++ .../applib/integtests/model/CounterRepository.java | 55 +++ .../integtests/model/Counter_bumpUsingMixin.java} | 18 +- ...mpUsingMixinWithCommandPublishingDisabled.java} | 18 +- .../impl/src/main/java/META-INF/persistence.xml | 23 -- .../org/isisaddons/module/audit/AuditModule.java | 30 -- .../isisaddons/module/audit/dom/AuditEntry.java | 395 --------------------- .../module/audit/dom/AuditerServiceUsingJdo.java | 56 --- .../module/audit/dom/AuditingServiceMenu.java | 84 ----- .../audit/dom/AuditingServiceRepository.java | 163 --------- ...HasTransactionId_auditEntriesInTransaction.java | 51 --- .../audit/dom/Object_recentAuditEntries.java | 96 ----- ...itledEnumContractForIncodeModuleTest_title.java | 16 - ...rableContractForIncodeModuleTest_compareTo.java | 18 - ...codeModuleTest_hasJdoUniqueIndexAnnotation.java | 13 - ...rableContractForIncodeModuleTest_compareTo.java | 18 - ...codeModuleTest_hasJdoUniqueIndexAnnotation.java | 13 - ...rableContractForIncodeModuleTest_compareTo.java | 19 - ...codeModuleTest_hasJdoUniqueIndexAnnotation.java | 13 - ...rableContractForIncodeModuleTest_compareTo.java | 18 - ...codeModuleTest_hasJdoUniqueIndexAnnotation.java | 13 - ...rableContractForIncodeModuleTest_compareTo.java | 18 - ...codeModuleTest_hasJdoUniqueIndexAnnotation.java | 13 - .../audittrail/persistence-jdo/log4j2-test.xml | 78 ++++ .../persistence-jdo/logging-dn-enhance.properties | 41 +++ .../persistence-jdo/pom.xml | 14 +- .../IsisModuleExtAuditTrailPersistenceJdo.java} | 18 +- .../audittrail/jdo/dom/AuditTrailEntry.java | 209 +++++++++++ .../jdo/dom/AuditTrailEntryRepository.java} | 9 +- .../jdo/integtests/AuditTrail_IntegTest.java} | 28 +- .../audittrail/jdo/integtests/model/Counter.java | 65 ++++ .../jdo/integtests/model/CounterRepository.java} | 13 +- .../src/test/resources/application-test.yml | 26 ++ .../audittrail/persistence-jpa/log4j2-test.xml | 78 ++++ .../persistence-jpa/pom.xml | 12 +- .../IsisModuleExtAuditTrailPersistenceJpa.java} | 26 +- .../audittrail/jpa/dom/AuditTrailEntry.java | 309 ++++++++++++++++ .../jpa/dom/AuditTrailEntryRepository.java} | 9 +- .../jpa/integtests/AuditTrail_IntegTest.java} | 39 +- .../audittrail/jpa/integtests/model/Counter.java | 70 ++++ .../jpa/integtests/model/CounterRepository.java} | 14 +- .../src/test/resources/application-test.yml | 29 ++ extensions/security/audittrail/pom.xml | 207 +++-------- .../permission/menu/ApplicationPermissionMenu.java | 8 +- .../dom/ApplicationRoleRepositoryAbstract.java | 3 +- .../applib/role/menu/ApplicationRoleMenu.java | 8 +- .../applib/seed/SeedSecurityModuleService.java | 3 +- .../tenancy/menu/ApplicationTenancyMenu.java | 8 +- .../applib/user/menu/ApplicationUserMenu.java | 9 +- .../secman/applib/user/menu/MeService.java | 8 +- .../services/PasswordEncoderUsingJBcrypt.java | 3 +- .../integration/authorizor/AuthorizorSecman.java | 5 +- .../PermissionsEvaluationServiceForSecman.java | 3 +- .../spiimpl/ImpersonateMenuAdvisorForSecman.java | 5 +- .../TableColumnVisibilityServiceForSecman.java | 3 +- .../userreg/UserRegistrationServiceForSecman.java | 3 +- extensions/security/secman/persistence-jdo/pom.xml | 2 +- .../jdo/permission/dom/ApplicationPermission.java | 10 +- .../dom/ApplicationPermissionRepository.java | 3 +- .../secman/jdo/role/dom/ApplicationRole.java | 6 +- .../jdo/role/dom/ApplicationRoleRepository.java | 3 +- .../secman/jdo/tenancy/dom/ApplicationTenancy.java | 10 +- .../tenancy/dom/ApplicationTenancyRepository.java | 3 +- .../secman/jdo/user/dom/ApplicationUser.java | 10 +- .../jdo/user/dom/ApplicationUserRepository.java | 3 +- .../extensions/secman/jdo/util/RegexReplacer.java | 3 +- extensions/security/secman/persistence-jpa/pom.xml | 2 +- .../jpa/IsisModuleExtSecmanPersistenceJpa.java | 20 +- .../dom/ApplicationPermissionRepository.java | 3 +- .../jpa/role/dom/ApplicationRoleRepository.java | 3 +- .../tenancy/dom/ApplicationTenancyRepository.java | 3 +- .../jpa/user/dom/ApplicationUserRepository.java | 3 +- .../extensions/secman/jpa/util/RegexReplacer.java | 3 +- extensions/security/secman/shiro-realm/pom.xml | 4 +- .../applib/IsisModuleExtSessionLogApplib.java | 11 +- .../sessionlog/applib/app/SessionLogMenu.java | 49 +-- .../HasUsername_recentSessionsForUser.java | 8 +- .../applib/dom/SessionLogEntry-expired.png | Bin .../applib/dom/SessionLogEntry-login.png | Bin .../applib/dom/SessionLogEntry-logout.png | Bin .../sessionlog/applib/dom/SessionLogEntry.java | 49 +-- .../applib/dom/SessionLogEntry.layout.fallback.xml | 4 +- .../applib/dom/SessionLogEntryRepository.java | 47 ++- .../spiimpl/SessionLogServiceInitializer.java | 6 +- .../spiimpl/SessionSubscriberForSessionLog.java} | 15 +- .../integtests}/SessionLogIntegTestAbstract.java | 10 +- .../security/sessionlog/persistence-jdo/pom.xml | 4 +- .../src/main/java/META-INF/persistence.xml | 23 -- .../jdo/IsisModuleExtSessionLogPersistenceJdo.java | 8 +- .../sessionlog/jdo/dom/SessionLogEntry.java | 18 +- .../jdo/dom/SessionLogEntryRepository.java | 4 +- .../jdo/integtests}/SessionLog_IntegTest.java | 12 +- .../security/sessionlog/persistence-jpa/pom.xml | 4 +- .../jpa/IsisModuleExtSessionLogPersistenceJpa.java | 14 +- .../sessionlog/jpa/dom/SessionLogEntry.java | 36 +- .../sessionlog/jpa/dom/SessionLogEntryPK.java | 79 +++++ .../jpa/dom/SessionLogEntryRepository.java | 4 +- .../jpa/integtests}/SessionLog_IntegTest.java | 10 +- extensions/security/shiro-realm-ldap/impl/pom.xml | 12 +- .../applib/IsisModuleExtFullCalendarApplib.java | 1 + .../fullcalendar/applib/value/CalendarEvent.java | 3 +- .../primary/ui/CommandReplayOnPrimaryService.java | 6 +- .../ui/CommandReplayOnSecondaryService.java | 4 +- .../NonEnhancedClassesFailureAnalyzer.java | 71 ++++ .../changetracking/JdoLifecycleListener.java | 1 + .../applib/IsisBookmarkConverter.java | 6 +- .../src/main/resources/META-INF/spring.factories | 2 + .../changetracking/EntityChangeTrackerJdo.java | 17 +- .../_EntityPropertyChangeFactory.java | 55 --- .../jdo/metamodel/menu/JdoMetamodelMenu.java | 4 +- .../applib/IsisBookmarkConverter.java | 6 +- regressiontests/pom.xml | 49 ++- .../stable-cmdexecauditsess/generic/pom.xml | 74 ++++ .../CmdExecAuditSessLog_IntegTestAbstract.java | 314 ++++++++++++++++ .../model/CmdExecAuditSessTestDomainModel.java | 11 +- .../generic/integtest/model/Counter.java | 68 ++++ .../generic/integtest/model/CounterRepository.java | 56 +++ .../integtest/model/Counter_bumpUsingMixin.java | 22 +- .../persistence-jdo/log4j2-test.xml | 78 ++++ .../persistence-jdo/logging-dn-enhance.properties | 48 +++ .../persistence-jdo/pom.xml | 78 ++++ .../persistence-jdo/src/main/java/include.txt | 1 + .../integtests/CmdExecAuditSessLog_IntegTest.java | 35 +- .../jdo/integtests/model/Counter.java | 65 ++++ .../jdo/integtests/model/CounterRepository.java | 13 +- .../src/test/resources/application-test.yml | 31 ++ .../persistence-jpa/log4j2-test.xml | 78 ++++ .../persistence-jpa/pom.xml | 79 +++++ .../persistence-jpa/src/main/java/include.txt | 1 + .../resources/META-INF/orm-commandlog.template | 32 ++ .../integtests/CmdExecAuditSessLog_IntegTest.java | 34 +- .../jpa/integtests/model/Counter.java | 73 ++++ .../jpa/integtests/model/CounterRepository.java | 14 +- .../src/test/resources/META-INF/persistence.xml | 30 ++ .../src/test/resources/application-test.yml | 34 ++ regressiontests/stable-cmdexecauditsess/pom.xml | 58 +++ .../EntityPropertyChangeSubscriberForTesting.java | 23 +- .../applib/entity/jdo/dom/JdoEntity.java | 3 +- .../teardown/jpa/TeardownFixtureJpaAbstract.java | 28 +- testing/pom.xml | 1 + .../applib/IsisModuleValAsciidocApplib.java | 1 + .../valuetypes/asciidoc/applib/value/AsciiDoc.java | 3 +- .../semantics/AsciiDocValueSemantics.java | 3 +- .../ChangesDtoValueSemanticsPrettyRender.java | 3 +- .../CommandDtoValueSemanticsPrettyRender.java | 3 +- .../InteractionDtoValueSemanticsPrettyRender.java | 3 +- valuetypes/asciidoc/persistence-jdo/pom.xml | 58 +++ .../dn/IsisModuleValAsciidocPersistenceJdoDn.java | 0 .../jdo/dn/converters/IsisAsciiDocConverter.java | 0 .../src/main/resources/META-INF/MANIFEST.MF | 0 .../src/main/resources/plugin.xml | 0 valuetypes/asciidoc/persistence-jpa/pom.xml | 54 +++ .../jpa/IsisModuleValAsciidocPersistenceJpa.java | 0 .../jpa/converters/IsisAsciiDocConverter.java | 0 valuetypes/asciidoc/persistence/jdo/pom.xml | 38 -- valuetypes/asciidoc/persistence/jpa/pom.xml | 35 -- valuetypes/asciidoc/persistence/pom.xml | 51 --- valuetypes/asciidoc/pom.xml | 21 +- .../applib/IsisModuleValMarkdownApplib.java | 1 + .../valuetypes/markdown/applib/value/Markdown.java | 3 +- .../semantics/MarkdownValueSemantics.java | 3 +- valuetypes/markdown/persistence-jdo/pom.xml | 59 +++ .../dn/IsisModuleValMarkdownPersistenceJdoDn.java | 0 .../jdo/dn/converters/IsisMarkdownConverter.java | 0 .../src/main/resources/META-INF/MANIFEST.MF | 0 .../src/main/resources/plugin.xml | 0 valuetypes/markdown/persistence-jpa/pom.xml | 54 +++ .../jpa/IsisModuleValMarkdownPersistenceJpa.java | 0 .../jpa/converters/IsisMarkdownConverter.java | 0 valuetypes/markdown/persistence/jdo/pom.xml | 42 --- valuetypes/markdown/persistence/jpa/pom.xml | 39 -- valuetypes/markdown/persistence/pom.xml | 50 --- valuetypes/markdown/pom.xml | 21 +- .../IsisModuleViewerRestfulObjectsApplib.java | 3 + .../webmodule/WebModuleJaxrsResteasy4.java | 3 +- .../rendering/domainobjects/JsonValueEncoder.java | 3 +- .../rendering/service/RepresentationService.java | 3 +- .../acceptheader/AcceptHeaderServiceForRest.java | 4 +- ...entNegotiationServiceForRestfulObjectsV1_0.java | 3 +- .../ContentNegotiationServiceOrgApacheIsisV1.java | 4 +- .../ContentNegotiationServiceOrgApacheIsisV2.java | 3 +- .../ContentNegotiationServiceXRoDomainType.java | 3 +- .../service/swagger/SwaggerServiceDefault.java | 4 +- .../service/swagger/SwaggerServiceMenu.java | 13 +- .../swagger/internal/ClassExcluderDefault.java | 4 +- .../swagger/internal/SwaggerSpecGenerator.java | 3 +- .../service/swagger/internal/TaggerDefault.java | 3 +- .../internal/ValuePropertyFactoryDefault.java | 3 +- .../ObjectAdapterMementoProviderForChoices.java | 39 +- 320 files changed, 4978 insertions(+), 2512 deletions(-)
