You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2022/05/25 17:41:55 UTC

[isis] 01/01: Merge pull request #952 from apache/ISIS-3062

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 bbb88fad90d7fc467099875a4697a46639d386ee
Merge: 1925ca9f32 df107dabd9
Author: Dan Haywood <da...@apache.org>
AuthorDate: Wed May 25 18:41:50 2022 +0100

    Merge pull request #952 from apache/ISIS-3062
    
    Isis 3062

 .../hooks/Action_026-command-processing.adoc       |   4 +-
 .../annotation/hooks/Action_030-see-also.adoc      |   4 +-
 .../hooks/Property_028-command-processing.adoc     |   4 +-
 .../system/hooks/HasInteractionId_see-also.adoc    |   4 +-
 ...mandExecutorService_020-examples-and-usage.adoc |   4 +-
 ...DtoProcessorService_020-examples-and-usage.adoc |   4 +-
 .../ContentMappingService_010-implementation.adoc  |   2 +-
 .../primary/IsisModuleExtCommandReplayPrimary.adoc |   2 +-
 .../IsisModuleExtCommandReplaySecondary.adoc       |   2 +-
 .../applib-classes/pages/mixees-and-mixins.adoc    |   2 +-
 .../roles-mixins-contributees/contributee.adoc     |   6 +-
 .../refguide/modules/applib-svc/pages/about.adoc   |   2 +-
 .../applib-svc/partials/_integration-spi.adoc      |   4 +-
 .../modules/applib-svc/partials/_security-spi.adoc |   2 +-
 .../modules/ROOT/pages/2020/2.0.0-M4/relnotes.adoc |   2 +-
 .../modules/ROOT/pages/2021/2.0.0-M6/relnotes.adoc |   2 +-
 .../modules/ROOT/partials/extensions.adoc          |   4 +-
 .../fun/pages/concepts-patterns/architecture.adoc  |   2 +-
 antora/playbooks/site-extensions.yml               |   4 +-
 antora/playbooks/site-security.yml                 |   4 +-
 antora/playbooks/site.yml                          |   8 +-
 .../org/apache/isis/applib/IsisModuleApplib.java   |   4 +-
 .../isis/applib/mixins/security/HasUsername.java   |  28 +
 .../applib/mixins/system/DomainChangeRecord.java   | 170 ++++-
 .../applib/mixins/system/HasInteractionId.java     |  38 +
 .../applib/mixins/system/HasTransactionId.java     |  22 +-
 .../bookmark/HasTarget.java}                       |  32 +-
 .../isis/applib/services/command/Command.java      |   2 +-
 .../applib/services/commanddto/HasCommandDto.java  |  25 +-
 ...nLoggingService.java => SessionLogService.java} |  15 +-
 ...eLogging.java => SessionLogServiceLogging.java} |  32 +-
 .../src/main/adoc/modules/schema/pages/about.adoc  |   2 +-
 core/adoc/modules/_overview/pages/about.adoc       |  44 +-
 .../config/pages/sections/isis.extensions.adoc     |  84 +--
 .../IsisModuleCoreRuntimeServices.java             |   2 +
 .../session/InteractionIdGenerator.java            |  14 +
 .../session/InteractionServiceDefault.java         |   9 +-
 examples/demo/domain/pom.xml                       |   4 +-
 .../domain/_commands/ExposePersistedCommands.java  |   6 +-
 .../ExposePersistedCommands_commands.java          |   8 +-
 .../ActionCommandPublishingJdo-description.adoc    |  14 +-
 .../ActionCommandPublishingJpa-description.adoc    |  14 +-
 .../PropertyCommandPublishingJdo-description.adoc  |  14 +-
 .../PropertyCommandPublishingJpa-description.adoc  |  14 +-
 .../config/application-primary.properties          |   2 +-
 .../config/application-secondary.properties        |  10 +-
 examples/demo/web/pom.xml                          |   4 +-
 .../demoapp/web/replay/DemoReplayController.java   |   2 +-
 .../modules/command-log/partials/module-nav.adoc   |   6 -
 .../commandlog/applib/command/CommandLog.java      | 477 -------------
 .../commandlog/applib/command/ICommandLog.java     |  88 ---
 .../applib/command/ICommandLogRepository.java      | 150 ----
 .../applib/command/ui/CommandLogServiceMenu.java   | 140 ----
 .../commandlog/applib/util/BigDecimalUtils.java    |  50 --
 .../commandlog/applib/util/StringUtils.java        |  35 -
 .../commandlog/jdo/entities/CommandJdo.java        | 317 ---------
 .../jdo/entities/CommandJdoRepository.java         | 326 ---------
 .../commandlog/jpa/entities/CommandJpa.java        | 283 --------
 .../jpa/entities/CommandJpaRepository.java         | 332 ---------
 .../command-replay/partials/module-nav.adoc        |   5 -
 .../{command-log => commandlog}/adoc/antora.yml    |   0
 .../adoc/modules/command-log/nav.adoc              |   0
 .../adoc/modules/command-log/pages/about.adoc      |   4 +-
 .../modules/command-log/partials/module-nav.adoc   |   6 +
 .../{command-log => commandlog}/applib/pom.xml     |  14 +-
 .../applib/IsisModuleExtCommandLogApplib.java      |  19 +-
 .../applib/app/CommandLogServiceMenu.java          | 147 ++++
 .../contributions}/HasInteractionId_command.java   |  20 +-
 .../HasUsername_recentCommandsByUser.java          |  18 +-
 .../applib/contributions/Object_recent.java}       |  33 +-
 .../contributions}/Object_recentCommands.java      |  12 +-
 .../commandlog/applib/dom/CommandLogEntry.java     | 763 +++++++++++++++++++++
 .../dom/CommandLogEntry.layout.fallback.xml}       |   0
 .../commandlog/applib/dom/CommandLogEntry.png}     | Bin
 .../applib/dom/CommandLogEntryRepository.java      | 376 ++++++++++
 .../commandlog/applib/dom}/ReplayState.java        |   2 +-
 .../dom/mixins/CommandLogEntry_childCommands.java} |  21 +-
 .../mixins/CommandLogEntry_openResultObject.java}  |  16 +-
 .../mixins/CommandLogEntry_openTargetObject.java}  |  16 +-
 .../applib/dom/mixins/CommandLogEntry_retry.java}  |  28 +-
 .../mixins/CommandLogEntry_siblingCommands.java}   |  24 +-
 .../subscriber/CommandSubscriberForCommandLog.java |  21 +-
 .../commandlog/applib/util/BigDecimalUtils.java    |  27 +
 .../commandlog/applib/util/StringUtils.java        |  17 +
 .../applib}/util/StringUtils_trimmed_Test.java     |   6 +-
 .../jdo/logging-dn-enhance.properties              |   0
 .../core/{command-log => commandlog}/jdo/pom.xml   |  10 +-
 .../jdo/src/main/java/META-INF/persistence.xml     |   0
 .../commandlog/jdo/IsisModuleExtCommandLogJdo.java |  27 +-
 .../commandlog/jdo/dom/CommandLogEntry.java        | 313 +++++++++
 .../jdo/dom/CommandLogEntryRepository.java}        |  32 +-
 .../core/{command-log => commandlog}/jpa/pom.xml   |  16 +-
 .../commandlog/jpa/IsisModuleExtCommandLogJpa.java |  26 +-
 .../commandlog/jpa/dom/CommandLogEntry.java        | 300 ++++++++
 .../jpa/dom/CommandLogEntryRepository.java         |  79 +++
 .../resources/META-INF/orm-commandlog.template     |   0
 .../core/{command-log => commandlog}/pom.xml       |  20 +-
 .../adoc/antora.yml                                |   0
 .../adoc/modules/command-replay/nav.adoc           |   0
 .../adoc/modules/command-replay/pages/about.adoc   |   2 +-
 .../command-replay/partials/module-nav.adoc        |   5 +
 .../core/{command-replay => commandreplay}/pom.xml |  20 +-
 .../primary/pom.xml                                |   6 +-
 .../primary/IsisModuleExtCommandReplayPrimary.java |   4 +-
 .../primary/config/PrimaryConfig.java              |   0
 .../primary/mixins/Object_openOnSecondary.java     |   0
 .../restapi/CommandRetrievalOnPrimaryService.java  |  14 +-
 .../primary/spiimpl/CaptureResultOfCommand.java    |   6 +-
 .../primary/ui/CommandReplayOnPrimaryService.java  |  26 +-
 .../secondary/log4j2-test.xml                      |   0
 .../secondary/pom.xml                              |  28 +-
 .../IsisModuleExtCommandReplaySecondary.java       |   4 +-
 .../secondary/analyser/CommandReplayAnalyser.java  |   6 +-
 .../analyser/CommandReplayAnalyserException.java   |   8 +-
 .../analyser/CommandReplayAnalyserResult.java      |   8 +-
 .../analysis/CommandReplayAnalysisService.java     |  12 +-
 .../secondary/config/SecondaryConfig.java          |   0
 .../secondary/fetch/CommandFetcher.java            |   6 +-
 .../secondary/job/ReplicateAndReplayJob.java       |   0
 .../secondary/job/SecondaryStatusData.java         |   0
 .../jobcallables/ReplicateAndRunCommands.java      |  30 +-
 .../secondary/mixins/CommandLogEntry_exclude.java} |  20 +-
 .../mixins/CommandLogEntry_replayQueue.java}       |  18 +-
 .../secondary/mixins/Object_openOnPrimary.java     |   0
 .../spi/ReplayCommandExecutionController.java      |   0
 .../secondary/status/SecondaryStatus.java          |   0
 .../secondary/status/StatusException.java          |   0
 .../ui/CommandReplayOnSecondaryService.java        |  12 +-
 .../secondary/fetch/CommandFetcher_Test.java       |   0
 extensions/pom.xml                                 |  21 +-
 .../modules/audit-trail/partials/module-nav.adoc   |   6 -
 .../{audit-trail => audittrail}/adoc/antora.yml    |   0
 .../adoc/modules/audit-trail/nav.adoc              |   0
 .../adoc/modules/audit-trail/pages/about.adoc      |   4 +-
 .../modules/audit-trail/partials/module-nav.adoc   |   6 +
 .../impl/src/main/java/META-INF/persistence.xml    |  23 +
 .../org/isisaddons/module/audit/AuditModule.java   |  30 +
 .../isisaddons/module/audit/dom/AuditEntry.java    | 395 +++++++++++
 .../audit/dom/AuditEntry.layout.fallback.xml       |  60 ++
 .../org/isisaddons/module/audit/dom/AuditEntry.png | Bin 0 -> 477 bytes
 .../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 +
 extensions/security/audittrail/pom.xml             | 173 +++++
 .../secman/applib/IsisModuleExtSecmanApplib.java   |  14 +
 .../permission/dom/ApplicationPermission.java      |  79 ++-
 .../ApplicationPermissionRepositoryAbstract.java   |  12 +-
 .../secman/applib/role/dom/ApplicationRole.java    |  43 +-
 .../dom/ApplicationRoleRepositoryAbstract.java     |   4 +-
 .../applib/tenancy/dom/ApplicationTenancy.java     |  53 +-
 .../dom/ApplicationTenancyRepositoryAbstract.java  |   6 +-
 .../secman/applib/tenancy/dom/HasAtPath.java       |  30 +
 .../secman/applib/user/dom/ApplicationUser.java    | 215 ++++--
 .../dom/ApplicationUserRepositoryAbstract.java     |  10 +-
 .../dom/mixins/ApplicationUser_updateLocale.java   |  27 +-
 .../jdo/permission/dom/ApplicationPermission.java  | 122 ++--
 .../secman/jdo/role/dom/ApplicationRole.java       |  69 +-
 .../secman/jdo/tenancy/dom/ApplicationTenancy.java |  92 +--
 .../secman/jdo/user/dom/ApplicationUser.java       | 259 +++----
 .../extensions/secman/jdo/util/RegexReplacer.java  |   4 +-
 .../jpa/permission/dom/ApplicationPermission.java  |  99 +--
 .../dom/ApplicationPermissionRepository.java       |  10 -
 .../secman/jpa/role/dom/ApplicationRole.java       |  56 +-
 .../secman/jpa/tenancy/dom/ApplicationTenancy.java |  75 +-
 .../secman/jpa/user/dom/ApplicationUser.java       | 226 ++----
 .../modules/session-log/partials/module-nav.adoc   |   6 -
 .../{session-log => sessionlog}/adoc/antora.yml    |   0
 .../adoc/modules/session-log/nav.adoc              |   0
 .../adoc/modules/session-log/pages/about.adoc      |   0
 .../modules/session-log/partials/module-nav.adoc   |   6 +
 extensions/security/sessionlog/applib/pom.xml      |  58 ++
 .../applib/IsisModuleExtSessionLogApplib.java      |  45 ++
 .../isis/sessionlog/applib/app/SessionLogMenu.java |  82 +++
 .../HasUsername_recentSessionsForUser.java         |  47 ++
 .../applib/dom/SessionLogEntry-expired.png         | Bin 0 -> 630 bytes
 .../applib/dom/SessionLogEntry-login.png           | Bin 0 -> 468 bytes
 .../applib/dom/SessionLogEntry-logout.png          | Bin 0 -> 457 bytes
 .../sessionlog/applib/dom/SessionLogEntry.java     | 373 ++++++++++
 .../applib/dom/SessionLogEntry.layout.fallback.xml |  62 ++
 .../applib/dom/SessionLogEntryRepository.java      | 189 +++++
 .../applib/spiimpl/SessionLogServiceDefault.java   |  54 ++
 .../security/sessionlog/persistence-jdo/pom.xml    |  62 ++
 .../src/main/java/META-INF/persistence.xml         |  23 +
 .../jdo/IsisModuleExtSessionLogPersistenceJdo.java |  32 +
 .../isis/sessionlog/jdo/dom/SessionLogEntry.java   | 172 +++++
 .../jdo/dom/SessionLogEntryRepository.java         |  17 +
 .../sessionlog/persistence-jpa}/log4j2-test.xml    |   0
 .../security/sessionlog/persistence-jpa/pom.xml    |  69 ++
 .../jpa/IsisModuleExtSessionLogPersistenceJpa.java |  32 +
 .../isis/sessionlog/jpa/dom/SessionLogEntry.java   | 178 +++++
 .../jpa/dom/SessionLogEntryRepository.java         |  17 +
 extensions/security/sessionlog/pom.xml             |  85 +++
 isis-tooling.yml                                   |   8 +-
 .../pages/hints-and-tips/jdoql-and-timestamps.adoc |   2 +-
 .../hints-and-tips/overriding-jdo-annotations.adoc |   2 +-
 security/adoc/modules/ROOT/pages/about.adoc        |   4 +-
 .../adoc/modules/ROOT/partials/extensions.adoc     |   4 +-
 .../modules/tooling-cli/examples/isis-tooling.yml  |   8 +-
 .../apache/isis/tooling/cli/test/isis-tooling.yml  |   8 +-
 .../AuthenticatedWebSessionForIsis.java            |  52 +-
 ...uthenticatedWebSessionForIsis_Authenticate.java |   4 +-
 .../AuthenticatedWebSessionForIsis_SignIn.java     |   4 +-
 ...uthenticatedWebSessionForIsis_TestAbstract.java |   4 +-
 216 files changed, 6448 insertions(+), 3650 deletions(-)