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 2021/02/28 13:35:48 UTC
[isis] branch master updated (3f6a332 -> 642bced)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 3f6a332 ISIS-2534: revert renaming of Identifier
add 22c559a ISIS-2444: moves runtime-services out of the build; as not public API and need to fix up
new 642bced ISIS-2444: regenerating index
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:
.../pages/what-is-apache-isis/screencasts.adoc | 30 ++---
.../modules/_overview/pages/about.adoc | 80 ++++++++++--
.../modules/applib/pages/index/Identifier.adoc | 79 ++----------
.../hooks/ActionLayout_021-promptStyle.adoc | 8 +-
.../hooks/ActionLayout_022-position.adoc | 2 +-
.../hooks/ActionLayout_024-cssClass.adoc | 2 +-
.../annotation/hooks/ActionLayout_027-hidden.adoc | 2 +-
.../hooks/ActionLayout_029-redirect.adoc | 4 +-
.../hooks/Action_022-action-semantics.adoc | 2 +-
.../annotation/hooks/Action_024-domain-events.adoc | 4 +-
.../hooks/Action_025-execution-publishing.adoc | 2 +-
.../CollectionLayout_010-examples-and-usage.adoc | 2 +-
.../hooks/CollectionLayout_022-paged.adoc | 2 +-
.../hooks/CollectionLayout_027-hidden.adoc | 2 +-
.../hooks/Collection_010-examples-and-usage.adoc | 2 +-
.../hooks/Collection_021_domainEvent.adoc | 6 +-
.../annotation/hooks/Collection_022_hidden.adoc | 2 +-
.../DomainObjectLayout_010-examples-and-usage.adoc | 2 +-
.../hooks/DomainObjectLayout_022-cssClass.adoc | 2 +-
.../hooks/DomainObjectLayout_023-cssClassFa.adoc | 2 +-
.../hooks/DomainObjectLayout_026-paged.adoc | 4 +-
.../hooks/DomainObjectLayout_027-ui-events.adoc | 2 +-
.../hooks/DomainObject_010-examples-and-usage.adoc | 4 +-
.../hooks/DomainObject_021-objectType.adoc | 6 +-
.../annotation/hooks/DomainObject_023-editing.adoc | 4 +-
.../hooks/DomainObject_025-lifecycle-events.adoc | 6 +-
.../DomainObject_026-entityChangePublishing.adoc | 4 +-
.../hooks/DomainObject_027-bounding.adoc | 2 +-
.../DomainObject_028-autoCompleteRepository.adoc | 4 +-
.../hooks/DomainObject_029-mixinMethod.adoc | 4 +-
.../hooks/DomainObject_040-see-also.adoc | 2 +-
.../hooks/DomainServiceLayout_021-menuBar.adoc | 2 +-
.../hooks/DomainService_021-objectType.adoc | 2 +-
.../InteractionScope_010-examples-and-usage.adoc | 4 +-
.../hooks/MemberOrder_010-examples-and-usage.adoc | 2 +-
.../ParameterLayout_010-examples-and-usage.adoc | 2 +-
.../hooks/ParameterLayout_021-labelPosition.adoc | 4 +-
.../hooks/ParameterLayout_022-multiLine.adoc | 2 +-
.../hooks/Parameter_021-optionality.adoc | 2 +-
.../annotation/hooks/Parameter_025-fileAccept.adoc | 4 +-
.../PropertyLayout_010-examples-and-usage.adoc | 2 +-
.../hooks/PropertyLayout_021_labelPosition.adoc | 4 +-
.../hooks/PropertyLayout_022_promptStyle.adoc | 2 +-
.../hooks/PropertyLayout_023_multiLine.adoc | 2 +-
.../hooks/PropertyLayout_028_repainting.adoc | 2 +-
.../hooks/PropertyLayout_030_hidden.adoc | 4 +-
.../hooks/Property_010-examples-and-usage.adoc | 2 +-
.../annotation/hooks/Property_021-optionality.adoc | 6 +-
.../annotation/hooks/Property_022-editing.adoc | 2 +-
.../annotation/hooks/Property_023-maxLength.adoc | 2 +-
.../hooks/Property_026-domain-events.adoc | 4 +-
.../hooks/Property_027-execution-publishing.adoc | 4 +-
.../hooks/Property_028-command-processing.adoc | 2 +-
.../annotation/hooks/Property_030-snapshot.adoc | 2 +-
.../annotation/hooks/Property_031-fileAccept.adoc | 2 +-
.../annotation/hooks/Property_033-hidden.adoc | 4 +-
.../applib/pages/index/id/TypeIdentifier.adoc | 76 ++++++++++++
...AcceptHeaderService_020-examples-and-usage.adoc | 4 +-
...cationFeatureRepository_010-implementation.adoc | 2 +-
...onFeatureRepository_020-examples-and-usage.adoc | 6 +-
.../hooks/BookmarkService_010-implementation.adoc | 6 +-
.../BookmarkService_020-examples-and-usage.adoc | 4 +-
...mandExecutorService_020-examples-and-usage.adoc | 2 +-
...DtoProcessorService_020-examples-and-usage.adoc | 2 +-
.../ConfigurationMenu_020-examples-and-usage.adoc | 2 +-
...onfigurationViewService_010-implementation.adoc | 6 +-
...gurationViewService_020-examples-and-usage.adoc | 4 +-
.../ContentMappingService_010-implementation.adoc | 2 +-
...ntentMappingService_020-examples-and-usage.adoc | 8 +-
.../hooks/EmailService_020-examples-and-usage.adoc | 2 +-
.../EventBusService_020-examples-and-usage.adoc | 16 +--
.../FactoryService_020-examples-and-usage.adoc | 2 +-
.../index/services/grid/GridLoaderService.adoc | 4 +-
.../hooks/GridService_020-examples-and-usage.adoc | 6 +-
.../GridSystemService_020-examples-and-usage.adoc | 4 +-
...PageResolverService_020-examples-and-usage.adoc | 2 +-
.../LocaleProvider_020-examples-and-usage.adoc | 4 +-
.../TranslationService_020-examples-and-usage.adoc | 4 +-
...ranslationsResolver_020-examples-and-usage.adoc | 2 +-
.../hooks/Execution_020-examples-and-usage.adoc | 2 +-
.../InteractionContext_020-examples-and-usage.adoc | 2 +-
.../ServiceInjector_020-examples-and-usage.adoc | 2 +-
.../hooks/JaxbService_020-examples-and-usage.adoc | 4 +-
.../LayoutService_020-examples-and-usage.adoc | 8 +-
.../hooks/DeepLinkService_010-implementation.adoc | 2 +-
.../DeepLinkService_020-examples-and-usage.adoc | 2 +-
...ExecutionSubscriber_020-examples-and-usage.adoc | 4 +-
.../hooks/RoutingService_010-implementation.adoc | 2 +-
.../RoutingService_020-examples-and-usage.adoc | 4 +-
.../hooks/Scratchpad_010-implementation.adoc | 2 +-
.../hooks/Scratchpad_020-examples-and-usage.adoc | 2 +-
.../hooks/SudoService_020-examples-and-usage.adoc | 4 +-
.../UrlEncodingService_020-examples-and-usage.adoc | 2 +-
...NotificationService_020-examples-and-usage.adoc | 8 +-
...RegistrationService_020-examples-and-usage.adoc | 2 +-
.../services/wrapper/events/InteractionEvent.adoc | 4 +-
.../WrapperFactory_020-examples-and-usage.adoc | 12 +-
.../XmlSnapshotService_020-examples-and-usage.adoc | 2 +-
.../applib/pages/index/util/ObjectContracts.adoc | 36 +-----
.../hooks/ObjectContracts_examples-and-usage.adoc | 51 ++++----
.../pages/index/runtimeservices/hooks/README.txt | 1 +
.../ContentNegotiationService/accept-json.png | Bin
.../ContentNegotiationService/accept-xml.png | Bin
.../ContentNegotiationService/facade-choices.png | Bin
.../ContentNegotiationService/facade-choices.pptx | Bin
.../service-collaborations.png | Bin
.../service-collaborations.pptx | Bin
.../ApplicationFeatureFactory.adoc | 0
.../AuthenticationSessionProvider.adoc | 2 +-
.../CommandDtoServiceInternal.adoc | 6 +-
.../hooks/pages-to-update}/CommandPublisher.adoc | 2 +-
.../ContentNegotiationService.adoc | 10 +-
.../pages-to-update}/EntityChangeTracker.adoc | 8 +-
.../pages-to-update}/EntityChangesPublisher.adoc | 6 +-
.../EntityPropertyChangePublisher.adoc | 4 +-
.../hooks/pages-to-update}/ExecutionPublisher.adoc | 10 +-
.../InteractionDtoServiceInternal.adoc | 4 +-
.../PersistenceSessionServiceInternal.adoc | 0
.../pages-to-update}/RepresentationService.adoc | 10 +-
.../hooks/pages-to-update}/about.adoc | 0
.../hooks}/partials/_application-layer.adoc | 4 +-
.../hooks}/partials/_persistence-layer.adoc | 8 +-
.../hooks}/partials/_presentation-layer.adoc | 4 +-
.../hooks}/partials/module-nav.adoc | 0
.../secman/api/authorizor/AuthorizorSecman.adoc} | 14 +--
.../jdo/datanucleus/IsisModuleJdoDatanucleus.adoc | 2 +-
.../bypass/authorization/AuthorizorBypass.adoc | 6 +-
.../keycloak/authorization/AuthorizorKeycloak.adoc | 6 +-
.../index/shiro/authorization/AuthorizorShiro.adoc | 28 +----
.../index/spring/IsisModuleSecuritySpring.adoc} | 14 ++-
.../authentication/AuthenticatorSpring.adoc} | 13 +-
.../spring/webmodule/SpringSecurityFilter.adoc} | 12 +-
.../spring/webmodule/WebModuleSpringSecurity.adoc} | 15 ++-
.../refguide/modules/applib-ant/pages/Column.adoc | 10 +-
.../refguide/modules/applib-ant/pages/Digits.adoc | 2 +-
.../modules/applib-ant/pages/Discriminator.adoc | 8 +-
.../modules/applib-ant/pages/Nullable.adoc | 10 +-
.../applib-ant/pages/PersistenceCapable.adoc | 8 +-
.../modules/applib-ant/pages/PrimaryKey.adoc | 2 +-
.../applib-ant/pages/XmlJavaTypeAdapter.adoc | 2 +-
.../modules/applib-ant/pages/XmlRootElement.adoc | 12 +-
.../modules/applib-ant/pages/about/jdo.adoc | 4 +-
.../modules/applib-ant/pages/about/jee.adoc | 2 +-
.../modules/applib-ant/pages/about/main.adoc | 24 ++--
.../modules/applib-ant/pages/about/other.adoc | 12 +-
.../applib-classes/pages/events/domainevent.adoc | 4 +-
.../events/domainevent/AbstractDomainEvent.adoc | 6 +-
.../events/domainevent/ActionDomainEvent.adoc | 4 +-
.../events/domainevent/CollectionDomainEvent.adoc | 4 +-
.../events/domainevent/PropertyDomainEvent.adoc | 4 +-
.../pages/events/lifecycleevent.adoc | 12 +-
.../lifecycleevent/AbstractLifecycleEvent.adoc | 14 +--
.../events/lifecycleevent/ObjectCreatedEvent.adoc | 4 +-
.../events/lifecycleevent/ObjectLoadedEvent.adoc | 2 +-
.../lifecycleevent/ObjectPersistedEvent.adoc | 4 +-
.../lifecycleevent/ObjectPersistingEvent.adoc | 4 +-
.../events/lifecycleevent/ObjectRemovingEvent.adoc | 4 +-
.../events/lifecycleevent/ObjectUpdatedEvent.adoc | 6 +-
.../events/lifecycleevent/ObjectUpdatingEvent.adoc | 6 +-
.../applib-classes/pages/events/uievent.adoc | 12 +-
.../pages/events/uievent/CssClassUiEvent.adoc | 2 +-
.../pages/events/uievent/IconUiEvent.adoc | 4 +-
.../pages/events/uievent/TitleUiEvent.adoc | 2 +-
.../applib-classes/pages/layout/menubars.adoc | 6 +-
.../applib-classes/pages/layout/object-layout.adoc | 14 +--
.../roles-mixins-contributees/contributee.adoc | 4 +-
.../roles-mixins-contributees/mixins/Dto.adoc | 10 +-
.../roles-mixins-contributees/mixins/Object.adoc | 10 +-
.../mixins/Persistable.adoc | 4 +-
.../roles/HoldsUpdatedAt.adoc | 4 +-
.../roles/HoldsUpdatedBy.adoc | 2 +-
.../roles/Timestampable.adoc | 4 +-
.../modules/applib-classes/pages/spec.adoc | 2 +-
.../modules/applib-classes/pages/utility.adoc | 13 +-
.../applib-classes/partials/module-nav.adoc | 7 +-
.../modules/applib-methods/pages/lifecycle.adoc | 2 +-
.../applib-methods/pages/lifecycle/created.adoc | 4 +-
.../applib-methods/pages/lifecycle/loaded.adoc | 2 +-
.../applib-methods/pages/lifecycle/persisted.adoc | 4 +-
.../applib-methods/pages/lifecycle/persisting.adoc | 4 +-
.../applib-methods/pages/lifecycle/removing.adoc | 4 +-
.../applib-methods/pages/lifecycle/updated.adoc | 4 +-
.../applib-methods/pages/lifecycle/updating.adoc | 4 +-
.../modules/applib-methods/pages/prefixes.adoc | 44 +++----
.../pages/prefixes/autoComplete.adoc | 6 +-
.../applib-methods/pages/prefixes/choices.adoc | 2 +-
.../applib-methods/pages/prefixes/default.adoc | 4 +-
.../pages/prefixes/deprecated/addTo.adoc | 2 +-
.../pages/prefixes/deprecated/clear.adoc | 2 +-
.../pages/prefixes/deprecated/modify.adoc | 2 +-
.../pages/prefixes/deprecated/removeFrom.adoc | 2 +-
.../pages/prefixes/deprecated/validateAddTo.adoc | 2 +-
.../prefixes/deprecated/validateRemoveFrom.adoc | 2 +-
.../modules/applib-methods/pages/prefixes/get.adoc | 2 +-
.../modules/applib-methods/pages/prefixes/set.adoc | 2 +-
.../modules/applib-methods/pages/reserved.adoc | 16 +--
.../applib-methods/pages/reserved/cssClass.adoc | 6 +-
.../pages/reserved/deprecated/disable.adoc | 4 +-
.../pages/reserved/deprecated/getId.adoc | 6 +-
.../pages/reserved/deprecated/hide.adoc | 4 +-
.../applib-methods/pages/reserved/iconName.adoc | 8 +-
.../applib-methods/pages/reserved/layout.adoc | 8 +-
.../applib-methods/pages/reserved/title.adoc | 8 +-
.../refguide/modules/applib-svc/pages/about.adoc | 76 ++++++------
.../partials/_application-layer-api.adoc | 4 -
.../partials/_application-layer-spi.adoc | 9 +-
.../modules/applib-svc/partials/_metadata-spi.adoc | 6 +-
.../partials/_presentation-layer-spi.adoc | 4 +-
.../modules/applib-svc/partials/_security-spi.adoc | 2 +-
.../2018/2.0.0-M1/mignotes/other-changes.adoc | 2 +-
.../2.0.0-M1/mignotes/removed-annotations.adoc | 122 +++++++++---------
.../mignotes/removed-configuration-properties.adoc | 2 +-
.../2018/2.0.0-M1/mignotes/removed-types.adoc | 4 +-
.../2.0.0-M1/mignotes/updated-annotations.adoc | 82 ++++++------
.../modules/ROOT/pages/2020/2.0.0-M3/relnotes.adoc | 6 +-
.../partials/UNUSED/faster-turnaround-times.adoc | 2 +-
.../btb/pages/hints-and-tips/are-you-sure.adoc | 2 +-
.../how-to-handle-void-and-null-results.adoc | 4 +-
.../how-to-implement-a-spellchecker.adoc | 4 +-
.../replacing-default-service-implementations.adoc | 4 +-
.../simulating-collections-of-values.adoc | 2 +-
.../hints-and-tips/transactions-and-errors.adoc | 6 +-
.../pages/hints-and-tips/vetoing-visibility.adoc | 2 +-
.../hints-and-tips/view-model-instantiation.adoc | 6 +-
.../userguide/modules/btb/pages/i18n.adoc | 2 +-
.../fun/pages/business-rules/usability.adoc | 10 +-
.../modules/fun/pages/business-rules/validity.adoc | 6 +-
.../fun/pages/business-rules/visibility.adoc | 2 +-
.../apache-isis-vs-cqrs-and-event-sourcing.adoc | 2 +-
.../fun/pages/concepts-patterns/metamodel.adoc | 2 +-
.../pages/domain-entities-and-services/crud.adoc | 26 ++--
.../domain-entities.adoc | 2 +-
.../domain-services.adoc | 38 +++---
.../inject-services.adoc | 14 +--
.../modules/fun/pages/drop-downs-and-defaults.adoc | 12 +-
.../modules/fun/pages/meta-annotations.adoc | 4 +-
.../userguide/modules/fun/pages/mixins.adoc | 14 +--
.../userguide/modules/fun/pages/modules.adoc | 4 +-
.../modules/fun/pages/object-members/actions.adoc | 28 ++---
.../fun/pages/object-members/collections.adoc | 10 +-
.../fun/pages/object-members/properties.adoc | 16 +--
.../modules/fun/pages/overview/events.adoc | 12 +-
.../modules/fun/pages/overview/identifiers.adoc | 4 +-
.../modules/fun/pages/overview/modules.adoc | 6 +-
.../modules/fun/pages/overview/object-members.adoc | 16 +--
.../pages/overview/types-of-domain-objects.adoc | 6 +-
.../modules/fun/pages/ui/action-icons-and-css.adoc | 14 +--
.../modules/fun/pages/ui/menubars-layout.adoc | 10 +-
.../fun/pages/ui/names-and-descriptions.adoc | 20 +--
.../modules/fun/pages/ui/object-layout.adoc | 12 +-
.../fun/pages/ui/object-titles-and-icons.adoc | 22 ++--
.../modules/fun/pages/ui/table-columns.adoc | 2 +-
.../userguide/modules/fun/pages/view-models.adoc | 14 +--
.../modules/fun/pages/view-models/UNUSED-dto.adoc | 8 +-
.../modules/fun/partials/_deployment-options.adoc | 2 +-
antora/playbooks/site-core.yml | 3 -
antora/playbooks/site.yml | 3 -
.../apache/isis/applib/util/ObjectContracts.java | 37 ------
.../applib/util/ObjectContractsTest_equals.java | 46 +++++++
.../src/main/adoc/modules/schema/pages/chg.adoc | 2 +-
.../src/main/adoc/modules/schema/pages/cmd.adoc | 2 +-
.../src/main/adoc/modules/schema/pages/common.adoc | 8 +-
.../src/main/adoc/modules/schema/pages/ixn.adoc | 14 +--
core/config/generateConfigDocs.groovy | 7 ++
.../src/main/adoc/modules/config/pages/about.adoc | 26 ++--
.../application-specific/application-css.adoc | 10 +-
...sy~post.adoc => isis.security.spring~post.adoc} | 0
.../section-hooks/isis.security.spring~pre.adoc} | 5 +-
.../adoc/modules/config/pages/sections/_nav.adoc | 1 +
.../pages/sections/isis.security.spring.adoc | 35 +++---
.../DatanucleusAutocreateNoValidate.properties | 5 +-
.../ActionCommandPublishingJdo-description.adoc | 6 +-
.../usingjaxb/StatefulVmUsingJaxb-description.adoc | 2 +-
.../PropertyCommandPublishingJdo-description.adoc | 6 +-
.../dom/homepage/DemoHomePage-description.adoc | 4 +-
.../adoc/modules/audit-trail/pages/about.adoc | 8 +-
.../disabling-persistence-by-reachability.adoc | 4 +-
.../modules/ROOT/pages/configuring/properties.adoc | 2 +-
.../hints-and-tips/overriding-jdo-annotations.adoc | 2 +-
.../ROOT/pages/services/IsisJdoSupport.adoc | 6 +-
preview.sh | 11 +-
.../apache/isis/testdomain/rospec/BigComplex.java | 47 +++----
.../isis/testdomain/rospec/RoSpecSampler.java | 118 +++++++++---------
.../testdomain/interact/CommandArgumentTest.java | 45 +++----
.../persistence/jdo/_JdoExceptionTranslator.java | 24 ++--
.../persistence/jpa/_JpaExceptionTranslator.java | 16 +--
.../ci/_adoc-fix-adoc-line-endings.sh | 43 ++++++-
scripts/ci/_adoc-gen-projdoc.sh | 13 --
scripts/ci/_build-site.sh | 6 +
security/adoc/modules/ROOT/pages/about.adoc | 2 +-
.../domain-services-api-for-applications.adoc | 2 +-
.../pages/about/enhanced-wildcard-permission.adoc | 2 +-
.../adoc/modules/shiro/pages/about/ini-realm.adoc | 2 +-
.../adoc/modules/starters/pages/helloworld.adoc | 6 +-
.../adoc/modules/starters/pages/simpleapp.adoc | 2 +-
.../pages/fixture-scripts/api-and-usage.adoc | 4 +-
.../pages/fixture-scripts/mocking-the-clock.adoc | 6 +-
.../pages/services/ExecutionParametersService.adoc | 2 +-
.../fixtures/pages/services/FixtureScripts.adoc | 6 +-
.../FixtureScriptsSpecificationProvider.adoc | 2 +-
.../adoc/modules/integtestsupport/pages/about.adoc | 12 +-
.../adoc/modules/specsupport/pages/about.adoc | 2 +-
.../adoc/modules/unittestsupport/pages/about.adoc | 4 +-
.../modules/tooling-cli/examples/isis-tooling.yml | 138 ++++++++++-----------
.../adoc/modules/ROOT/pages/architecture.adoc | 6 +-
.../adoc/modules/ROOT/pages/health-check.adoc | 2 +-
.../hints-and-tips/restful-image-property.adoc | 2 +-
.../adoc/modules/ROOT/pages/layout-resources.adoc | 10 +-
.../adoc/modules/ROOT/pages/ro-spec.adoc | 4 +-
.../ROOT/partials/security/user-registration.adoc | 2 +-
.../ROOT/pages/configuration-properties.adoc | 8 +-
.../ROOT/pages/customisation/brand-logo.adoc | 2 +-
.../pages/customisation/tweaking-css-classes.adoc | 2 +-
.../ROOT/pages/features/bookmarked-pages.adoc | 2 +-
.../i18n-label-in-wicket-viewer.adoc | 2 +-
.../ROOT/partials/security/user-registration.adoc | 2 +-
316 files changed, 1454 insertions(+), 1339 deletions(-)
create mode 100644 antora/components/refguide-index/modules/applib/pages/index/id/TypeIdentifier.adoc
create mode 100644 antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/README.txt
rename {core/runtimeservices/src/main/adoc/modules/runtime-services => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks}/images/ContentNegotiationService/accept-json.png (100%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks}/images/ContentNegotiationService/accept-xml.png (100%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks}/images/ContentNegotiationService/facade-choices.png (100%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks}/images/ContentNegotiationService/facade-choices.pptx (100%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks}/images/RepresentationService/service-collaborations.png (100%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks}/images/RepresentationService/service-collaborations.pptx (100%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services/pages => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update}/ApplicationFeatureFactory.adoc (100%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services/pages => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update}/AuthenticationSessionProvider.adoc (89%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services/pages => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update}/CommandDtoServiceInternal.adoc (89%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services/pages => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update}/CommandPublisher.adoc (93%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services/pages => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update}/ContentNegotiationService.adoc (95%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services/pages => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update}/EntityChangeTracker.adoc (87%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services/pages => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update}/EntityChangesPublisher.adoc (84%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services/pages => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update}/EntityPropertyChangePublisher.adoc (86%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services/pages => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update}/ExecutionPublisher.adoc (82%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services/pages => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update}/InteractionDtoServiceInternal.adoc (94%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services/pages => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update}/PersistenceSessionServiceInternal.adoc (100%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services/pages => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update}/RepresentationService.adoc (83%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services/pages => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update}/about.adoc (100%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks}/partials/_application-layer.adoc (93%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks}/partials/_persistence-layer.adoc (89%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks}/partials/_presentation-layer.adoc (92%)
rename {core/runtimeservices/src/main/adoc/modules/runtime-services => antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks}/partials/module-nav.adoc (100%)
copy antora/components/refguide-index/modules/{security/pages/index/bypass/authorization/AuthorizorBypass.adoc => extensions/pages/index/secman/api/authorizor/AuthorizorSecman.adoc} (70%)
copy antora/components/refguide-index/modules/{applib/pages/index/services/confview/hooks/ConfigurationMenu_020-examples-and-usage.adoc => security/pages/index/spring/IsisModuleSecuritySpring.adoc} (78%)
copy antora/components/refguide-index/modules/security/pages/index/{keycloak/authorization/AuthorizorKeycloak.adoc => spring/authentication/AuthenticatorSpring.adoc} (72%)
copy antora/components/refguide-index/modules/{applib/pages/index/services/confview/hooks/ConfigurationMenu_020-examples-and-usage.adoc => security/pages/index/spring/webmodule/SpringSecurityFilter.adoc} (76%)
copy antora/components/refguide-index/modules/{applib/pages/index/services/confview/hooks/ConfigurationMenu_020-examples-and-usage.adoc => security/pages/index/spring/webmodule/WebModuleSpringSecurity.adoc} (72%)
copy core/config/src/main/adoc/modules/config/pages/section-hooks/{resteasy~post.adoc => isis.security.spring~post.adoc} (100%)
rename core/{runtimeservices/src/main/adoc/modules/runtime-services/nav.adoc => config/src/main/adoc/modules/config/pages/section-hooks/isis.security.spring~pre.adoc} (91%)
copy antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/removed-configuration-properties.adoc => core/config/src/main/adoc/modules/config/pages/sections/isis.security.spring.adoc (52%)
rename core/runtimeservices/src/main/adoc/antora.yml => scripts/ci/_adoc-fix-adoc-line-endings.sh (52%)
[isis] 01/01: ISIS-2444: regenerating index
Posted by da...@apache.org.
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 642bced7f6de6f80d223ada14e0610ade85a2163
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Feb 28 13:35:06 2021 +0000
ISIS-2444: regenerating index
---
.../modules/_overview/pages/about.adoc | 80 ++++++++++++++++++++--
.../modules/applib/pages/index/Identifier.adoc | 79 ++++-----------------
.../applib/pages/index/id/TypeIdentifier.adoc | 76 ++++++++++++++++++++
.../index/services/grid/GridLoaderService.adoc | 4 +-
.../services/wrapper/events/InteractionEvent.adoc | 4 +-
.../applib/pages/index/util/ObjectContracts.adoc | 36 +---------
.../secman/api/authorizor/AuthorizorSecman.adoc} | 14 ++--
.../bypass/authorization/AuthorizorBypass.adoc | 6 +-
.../keycloak/authorization/AuthorizorKeycloak.adoc | 6 +-
.../index/shiro/authorization/AuthorizorShiro.adoc | 28 +-------
.../IsisModuleSecuritySpring.adoc} | 13 ++--
.../authentication/AuthenticatorSpring.adoc} | 13 ++--
.../webmodule/SpringSecurityFilter.adoc} | 11 ++-
.../webmodule/WebModuleSpringSecurity.adoc} | 14 ++--
core/config/generateConfigDocs.groovy | 7 ++
.../src/main/adoc/modules/config/pages/about.adoc | 26 +++----
.../section-hooks/isis.security.spring~post.adoc | 14 +---
.../section-hooks/isis.security.spring~pre.adoc | 15 +---
.../adoc/modules/config/pages/sections/_nav.adoc | 1 +
.../pages/sections/isis.security.spring.adoc | 36 ++++++----
20 files changed, 253 insertions(+), 230 deletions(-)
diff --git a/antora/components/refguide-index/modules/_overview/pages/about.adoc b/antora/components/refguide-index/modules/_overview/pages/about.adoc
index 1bbd048..1f1a1b0 100644
--- a/antora/components/refguide-index/modules/_overview/pages/about.adoc
+++ b/antora/components/refguide-index/modules/_overview/pages/about.adoc
@@ -1424,7 +1424,7 @@ org.jmock:jmock:jar:<managed> +
.Document Index Entries
****
-xref:refguide:applib:index/AbstractViewModel.adoc[AbstractViewModel], xref:refguide:applib:index/Identifier.adoc[Identifier], xref:refguide:applib:index/IsisModuleApplib.adoc[IsisModuleApplib], xref:refguide:applib:index/RecreatableDomainObject.adoc[RecreatableDomainObject], xref:refguide:applib:index/ViewModel.adoc[ViewModel], xref:refguide:applib:index/adapters/AbstractValueSemanticsProvider.adoc[AbstractValueSemanticsProvider], xref:refguide:applib:index/adapters/DefaultsProvider.adoc [...]
+xref:refguide:applib:index/AbstractViewModel.adoc[AbstractViewModel], xref:refguide:applib:index/Identifier.adoc[Identifier], xref:refguide:applib:index/IsisModuleApplib.adoc[IsisModuleApplib], xref:refguide:applib:index/RecreatableDomainObject.adoc[RecreatableDomainObject], xref:refguide:applib:index/ViewModel.adoc[ViewModel], xref:refguide:applib:index/adapters/AbstractValueSemanticsProvider.adoc[AbstractValueSemanticsProvider], xref:refguide:applib:index/adapters/DefaultsProvider.adoc [...]
****
|Apache Isis Core - Code Gen (ByteBuddy)
@@ -2220,6 +2220,65 @@ org.apache.isis.persistence:isis-persistence-jpa-applib:jar:<managed> +
== Security
+[plantuml,Security,svg]
+----
+@startuml(id=Security)
+title Security - Containers
+caption Artifact Hierarchy (Maven)
+
+skinparam {
+ shadowing false
+ arrowFontSize 10
+ defaultTextAlignment center
+ wrapWidth 200
+ maxMessageSize 100
+}
+hide stereotype
+left to right direction
+skinparam rectangle<<2>> {
+ BackgroundColor #438dd5
+ FontColor #fffffe
+ BorderColor #2E6295
+}
+package "Security\n[Software System]" {
+ rectangle "==Apache Isis Security - Spring\n<size:10>[Container: packaging: jar]</size>" <<2>> as 2
+}
+@enduml
+----
+.Projects/Modules (Security)
+[cols="3a,5a", options="header"]
+|===
+|Coordinates |Description
+
+|Apache Isis Security - Spring
+[source,yaml]
+----
+Group: org.apache.isis.security
+Artifact: isis-security-spring
+Type: jar
+Directory: /security/spring
+----
+|Authentication using Spring Security
+
+.Components
+****
+o.a.i.security.spring.authentication.AuthenticatorSpring +
+o.a.i.security.spring.webmodule.WebModuleSpringSecurity +
+****
+
+.Dependencies
+****
+org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
+org.apache.isis.core:isis-core-webapp:jar:<managed> +
+org.springframework.boot:spring-boot-starter-security:jar:<managed> +
+****
+
+.Document Index Entries
+****
+xref:refguide:security:index/spring/IsisModuleSecuritySpring.adoc[IsisModuleSecuritySpring], xref:refguide:security:index/spring/authentication/AuthenticatorSpring.adoc[AuthenticatorSpring], xref:refguide:security:index/spring/webmodule/SpringSecurityFilter.adoc[SpringSecurityFilter], xref:refguide:security:index/spring/webmodule/WebModuleSpringSecurity.adoc[WebModuleSpringSecurity]
+****
+|===
+
=== Bypass
[plantuml,Bypass,svg]
@@ -3696,22 +3755,22 @@ skinparam rectangle<<11>> {
FontColor #fffffe
BorderColor #2E6295
}
-skinparam rectangle<<12>> {
+skinparam rectangle<<23>> {
BackgroundColor #438dd5
FontColor #fffffe
BorderColor #2E6295
}
-skinparam rectangle<<23>> {
+skinparam rectangle<<12>> {
BackgroundColor #438dd5
FontColor #fffffe
BorderColor #2E6295
}
-skinparam rectangle<<13>> {
+skinparam rectangle<<24>> {
BackgroundColor #438dd5
FontColor #fffffe
BorderColor #2E6295
}
-skinparam rectangle<<24>> {
+skinparam rectangle<<13>> {
BackgroundColor #438dd5
FontColor #fffffe
BorderColor #2E6295
@@ -4108,9 +4167,14 @@ Artifact: isis-extensions-secman-api
Type: jar
Directory: /extensions/security/secman/api
----
-|.Document Index Entries
+|.Components
+****
+o.a.i.extensions.secman.api.authorizor.AuthorizorSecman +
+****
+
+.Document Index Entries
****
-xref:refguide:extensions:index/secman/api/IsisModuleExtSecmanApi.adoc[IsisModuleExtSecmanApi], xref:refguide:extensions:index/secman/api/SecmanConfiguration.adoc[SecmanConfiguration], xref:refguide:extensions:index/secman/api/SecurityRealm.adoc[SecurityRealm], xref:refguide:extensions:index/secman/api/SecurityRealmCharacteristic.adoc[SecurityRealmCharacteristic], xref:refguide:extensions:index/secman/api/SecurityRealmService.adoc[SecurityRealmService], xref:refguide:extensions:index/secm [...]
+xref:refguide:extensions:index/secman/api/IsisModuleExtSecmanApi.adoc[IsisModuleExtSecmanApi], xref:refguide:extensions:index/secman/api/SecmanConfiguration.adoc[SecmanConfiguration], xref:refguide:extensions:index/secman/api/SecurityRealm.adoc[SecurityRealm], xref:refguide:extensions:index/secman/api/SecurityRealmCharacteristic.adoc[SecurityRealmCharacteristic], xref:refguide:extensions:index/secman/api/SecurityRealmService.adoc[SecurityRealmService], xref:refguide:extensions:index/secm [...]
****
|Apache Isis Ext - Sec Man Encryption (Using jbcrypt)
@@ -5576,7 +5640,9 @@ o.a.i.testdomain.conf.Configuration_headless$HeadlessCommandSupport +
o.a.i.testdomain.jdo.JdoInventoryDao +
o.a.i.testdomain.jpa.JpaInventoryDao +
o.a.i.testdomain.jpa.springdata.EmployeeRepository +
+o.a.i.testdomain.util.interaction.InteractionBoundaryProbe +
o.a.i.testdomain.util.kv.KVStoreForTesting +
+o.a.i.testdomain.util.rest.RestEndpointService +
****
.Dependencies
diff --git a/antora/components/refguide-index/modules/applib/pages/index/Identifier.adoc b/antora/components/refguide-index/modules/applib/pages/index/Identifier.adoc
index 3eae005..b448428 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/Identifier.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/Identifier.adoc
@@ -1,82 +1,29 @@
= Identifier
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+Combines xref:refguide:applib:index/id/TypeIdentifier.adoc[TypeIdentifier] and member identification (from properties, collections or actions), to a fully qualified _feature_ identifier.
+
+For xref:refguide:applib:index/Identifier.adoc[Identifier] (s) of type _Identifier.Type#CLASS_ member information is left empty.
+
== API
[source,java]
.Identifier.java
----
class Identifier {
- public static final Depth CLASS;
- public static final Depth CLASS_MEMBERNAME;
- public static final Depth CLASS_MEMBERNAME_PARAMETERS;
- public static final Depth MEMBERNAME_ONLY;
- public static final Depth PARAMETERS_ONLY;
- Identifier classIdentifier(final Class<?> cls)
- Identifier classIdentifier(final String className)
- Identifier propertyOrCollectionIdentifier(final Class<?> declaringClass, final String propertyOrCollectionName)
- Identifier propertyOrCollectionIdentifier(final String declaringClassName, final String propertyOrCollectionName)
- Identifier actionIdentifier(final Class<?> declaringClass, final String actionName, final Class<?>... parameterClasses)
- Identifier actionIdentifier(final String declaringClassName, final String actionName, final Class<?>... parameterClasses)
- Identifier actionIdentifier(final String declaringClassName, final String actionName, final List<String> parameterClassNames)
- String getClassName()
+ Identifier classIdentifier(final TypeIdentifier typeIdentifier)
+ Identifier propertyOrCollectionIdentifier(final TypeIdentifier typeIdentifier, final String propertyOrCollectionName)
+ Identifier actionIdentifier(final TypeIdentifier typeIdentifier, final String actionName, final Class<?>... parameterClasses)
+ Identifier actionIdentifier(final TypeIdentifier typeIdentifier, final String actionName, final Can<String> parameterClassNames)
+ String getLogicalIdentityString(final String delimiter)
String getClassNaturalName()
- String getMemberName()
String getMemberNaturalName()
- List<String> getMemberParameterNames()
- List<String> getMemberParameterNaturalNames()
- Type getType()
- boolean isPropertyOrCollection() // <.>
- String toIdentityString(final Depth depth)
- String toClassIdentityString()
- StringBuilder toClassIdentityString(final StringBuilder buf)
- String toNameIdentityString()
- StringBuilder toNameIdentityString(final StringBuilder buf)
- String toClassAndNameIdentityString()
- StringBuilder toClassAndNameIdentityString(final StringBuilder buf)
- String toParmsIdentityString()
- StringBuilder toParmsIdentityString(final StringBuilder buf)
- String toNameParmsIdentityString()
- StringBuilder toNameParmsIdentityString(final StringBuilder buf)
- String toFullIdentityString()
- int compareTo(final Identifier o2)
- boolean equals(final Object obj) // <.>
- boolean equals(final Identifier other)
+ Can<String> getMemberParameterClassNaturalNames()
+ int compareTo(final Identifier other)
+ boolean equals(final Object obj)
+ boolean isEqualTo(final Identifier other)
int hashCode()
String toString()
- Identifier fromIdentityString(final String asString) // <.>
}
----
-<.> xref:#isPropertyOrCollection__[isPropertyOrCollection()]
-+
---
-Convenience method.
---
-<.> xref:#equals__Object[equals(Object)]
-+
---
-REVIEW: why not just compare the _#toString()_ representations?
---
-<.> xref:#fromIdentityString__String[fromIdentityString(String)]
-+
---
-Factory method.
---
-
-== Members
-
-[#isPropertyOrCollection__]
-=== isPropertyOrCollection()
-
-Convenience method.
-
-[#equals__Object]
-=== equals(Object)
-
-REVIEW: why not just compare the _#toString()_ representations?
-
-[#fromIdentityString__String]
-=== fromIdentityString(String)
-
-Factory method.
diff --git a/antora/components/refguide-index/modules/applib/pages/index/id/TypeIdentifier.adoc b/antora/components/refguide-index/modules/applib/pages/index/id/TypeIdentifier.adoc
new file mode 100644
index 0000000..e222f54
--- /dev/null
+++ b/antora/components/refguide-index/modules/applib/pages/index/id/TypeIdentifier.adoc
@@ -0,0 +1,76 @@
+= TypeIdentifier
+:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+
+A generalization of Java's class type to also hold a logical name, which can be supplied lazily.
+
+== API
+
+[source,java]
+.TypeIdentifier.java
+----
+class TypeIdentifier {
+ TypeIdentifier lazy(final Class<?> correspondingClass, final Supplier<String> logicalNameProvider) // <.>
+ TypeIdentifier eager(final Class<?> correspondingClass, final String logicalName) // <.>
+ TypeIdentifier fqcn(final Class<?> correspondingClass) // <.>
+ String getClassName() // <.>
+ String getLogicalTypeName()
+ String getLogicalTypeNameFormatted(final String root, final String delimiter) // <.>
+ boolean equals(final Object obj)
+ boolean isEqualTo(final TypeIdentifier other)
+ int hashCode()
+ int compareTo(final TypeIdentifier other)
+}
+----
+
+<.> xref:#lazy__Class_Supplier[lazy(Class, Supplier)]
++
+--
+Returns a new TypeIdentifier based on the corresponding class and a _logicalNameProvider_ for lazy logical name lookup.
+--
+<.> xref:#eager__Class_String[eager(Class, String)]
++
+--
+Returns a new TypeIdentifier based on the corresponding class and (ahead of time) known _logicalName_ .
+--
+<.> xref:#fqcn__Class[fqcn(Class)]
++
+--
+Use the corresponding class's fully qualified name for the _logicalName_ . Most likely used in testing scenarios.
+--
+<.> xref:#getClassName__[getClassName()]
++
+--
+Canonical name of the corresponding class.
+--
+<.> xref:#getLogicalTypeNameFormatted__String_String[getLogicalTypeNameFormatted(String, String)]
++
+--
+The logical type name consists of 2 parts, the _namespace_ and the _logical simple name_ . Returns a concatenation of _namespace_ , _delimiter_ and the _logical simple name_ , whereas in the absence of a _namespace_ returns a concatenation of _root_ and the _logical simple name_ .
+--
+
+== Members
+
+[#lazy__Class_Supplier]
+=== lazy(Class, Supplier)
+
+Returns a new TypeIdentifier based on the corresponding class and a _logicalNameProvider_ for lazy logical name lookup.
+
+[#eager__Class_String]
+=== eager(Class, String)
+
+Returns a new TypeIdentifier based on the corresponding class and (ahead of time) known _logicalName_ .
+
+[#fqcn__Class]
+=== fqcn(Class)
+
+Use the corresponding class's fully qualified name for the _logicalName_ . Most likely used in testing scenarios.
+
+[#getClassName__]
+=== getClassName()
+
+Canonical name of the corresponding class.
+
+[#getLogicalTypeNameFormatted__String_String]
+=== getLogicalTypeNameFormatted(String, String)
+
+The logical type name consists of 2 parts, the _namespace_ and the _logical simple name_ . Returns a concatenation of _namespace_ , _delimiter_ and the _logical simple name_ , whereas in the absence of a _namespace_ returns a concatenation of _root_ and the _logical simple name_ .
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/grid/GridLoaderService.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/grid/GridLoaderService.adoc
index 8bce09b..ad94349 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/grid/GridLoaderService.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/grid/GridLoaderService.adoc
@@ -12,8 +12,8 @@ interface GridLoaderService {
boolean supportsReloading() // <.>
void remove(Class<?> domainClass) // <.>
boolean existsFor(Class<?> domainClass) // <.>
- Grid load(final Class<?> domainClass) // <.>
- Grid load(final Class<?> domainClass, String layout) // <.>
+ Grid load(Class<?> domainClass) // <.>
+ Grid load(Class<?> domainClass, String layout) // <.>
}
----
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/wrapper/events/InteractionEvent.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/wrapper/events/InteractionEvent.adoc
index 6d71182..e32007b 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/wrapper/events/InteractionEvent.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/wrapper/events/InteractionEvent.adoc
@@ -18,8 +18,8 @@ class InteractionEvent {
String getClassNaturalName() // <.>
String getMemberName() // <.>
String getMemberNaturalName() // <.>
- List<String> getMemberParameterNames() // <.>
- List<String> getMemberParameterNaturalNames() // <.>
+ Can<String> getMemberParameterNames() // <.>
+ Can<String> getMemberParameterNaturalNames() // <.>
String getReason() // <.>
String getReasonMessage() // <.>
Class<?> getAdvisorClass() // <.>
diff --git a/antora/components/refguide-index/modules/applib/pages/index/util/ObjectContracts.adoc b/antora/components/refguide-index/modules/applib/pages/index/util/ObjectContracts.adoc
index 73dafa2..9f4991c 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/util/ObjectContracts.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/util/ObjectContracts.adoc
@@ -1,41 +1,7 @@
= ObjectContracts
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-Provides fluent composition for Objects' equals, hashCode and toString. Sample usage by composing getters ...For 'compareTo' use JDK's comparator composition ...
-
-----
-
-private static final Equality equality =
- ObjectContracts.checkEquals(ApplicationFeature::getFeatureId);
-
-private static final Hashing hashing =
- ObjectContracts.hashing(ApplicationFeature::getFeatureId);
-
-private static final ToString toString =
- ObjectContracts.toString("featureId", ApplicationFeature::getFeatureId);
-
-public boolean equals(final Object obj) {
- return equality.equals(this, obj);
-}
-
-public int hashCode() {
- return hashing.hashCode(this);
-}
-
-public String toString() {
- return toString.toString(this);
-}
-----
-
-----
-
-private static final Comparator comparator =
- Comparator.comparing(ApplicationFeature::getFeatureId);
-
-public int compareTo(final ApplicationFeature other) {
- return comparator.compare(this, other);
-}
-----
+Provides fluent composition for Objects' equals, hashCode and toString.
== API
diff --git a/antora/components/refguide-index/modules/security/pages/index/bypass/authorization/AuthorizorBypass.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/api/authorizor/AuthorizorSecman.adoc
similarity index 70%
copy from antora/components/refguide-index/modules/security/pages/index/bypass/authorization/AuthorizorBypass.adoc
copy to antora/components/refguide-index/modules/extensions/pages/index/secman/api/authorizor/AuthorizorSecman.adoc
index b94155a..0b08938 100644
--- a/antora/components/refguide-index/modules/security/pages/index/bypass/authorization/AuthorizorBypass.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/api/authorizor/AuthorizorSecman.adoc
@@ -1,16 +1,16 @@
-= AuthorizorBypass
+= AuthorizorSecman
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
== API
[source,java]
-.AuthorizorBypass.java
+.AuthorizorSecman.java
----
-class AuthorizorBypass {
- boolean isUsableInRole(final String role, final Identifier identifier)
- boolean isVisibleInRole(final String user, final Identifier identifier)
- boolean isVisibleInAnyRole(Identifier identifier)
- boolean isUsableInAnyRole(Identifier identifier)
+class AuthorizorSecman {
+ @Inject
+ApplicationUserRepository<? extends ApplicationUser> applicationUserRepository;
+ boolean isVisible(final Authentication authentication, final Identifier identifier)
+ boolean isUsable(final Authentication authentication, final Identifier identifier)
}
----
diff --git a/antora/components/refguide-index/modules/security/pages/index/bypass/authorization/AuthorizorBypass.adoc b/antora/components/refguide-index/modules/security/pages/index/bypass/authorization/AuthorizorBypass.adoc
index b94155a..e10ef64 100644
--- a/antora/components/refguide-index/modules/security/pages/index/bypass/authorization/AuthorizorBypass.adoc
+++ b/antora/components/refguide-index/modules/security/pages/index/bypass/authorization/AuthorizorBypass.adoc
@@ -7,10 +7,8 @@
.AuthorizorBypass.java
----
class AuthorizorBypass {
- boolean isUsableInRole(final String role, final Identifier identifier)
- boolean isVisibleInRole(final String user, final Identifier identifier)
- boolean isVisibleInAnyRole(Identifier identifier)
- boolean isUsableInAnyRole(Identifier identifier)
+ boolean isVisible(final Authentication authentication, final Identifier identifier)
+ boolean isUsable(final Authentication authentication, final Identifier identifier)
}
----
diff --git a/antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc b/antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc
index f959daa..716ee7f 100644
--- a/antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc
+++ b/antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc
@@ -7,10 +7,8 @@
.AuthorizorKeycloak.java
----
class AuthorizorKeycloak {
- boolean isVisibleInRole(String role, Identifier identifier)
- boolean isUsableInRole(String role, Identifier identifier)
- boolean isVisibleInAnyRole(Identifier identifier)
- boolean isUsableInAnyRole(Identifier identifier)
+ boolean isVisible(final Authentication authentication, Identifier identifier)
+ boolean isUsable(final Authentication authentication, Identifier identifier)
}
----
diff --git a/antora/components/refguide-index/modules/security/pages/index/shiro/authorization/AuthorizorShiro.adoc b/antora/components/refguide-index/modules/security/pages/index/shiro/authorization/AuthorizorShiro.adoc
index dd1f35c..2766594 100644
--- a/antora/components/refguide-index/modules/security/pages/index/shiro/authorization/AuthorizorShiro.adoc
+++ b/antora/components/refguide-index/modules/security/pages/index/shiro/authorization/AuthorizorShiro.adoc
@@ -11,32 +11,8 @@ However, although there are two objects, they are set up to share the same _Secu
.AuthorizorShiro.java
----
class AuthorizorShiro {
- boolean isVisibleInAnyRole(Identifier identifier)
- boolean isUsableInAnyRole(Identifier identifier)
- boolean isVisibleInRole(String role, Identifier identifier) // <.>
- boolean isUsableInRole(String role, Identifier identifier) // <.>
+ boolean isVisible(final Authentication authentication, final Identifier identifier)
+ boolean isUsable(final Authentication authentication, final Identifier identifier)
}
----
-<.> xref:#isVisibleInRole__String_Identifier[isVisibleInRole(String, Identifier)]
-+
---
-Returns `false` because the checking across all roles is done in _#isVisibleInAnyRole(Identifier)_ , which is always called prior to this.
---
-<.> xref:#isUsableInRole__String_Identifier[isUsableInRole(String, Identifier)]
-+
---
-Returns `false` because the checking across all roles is done in _#isUsableInAnyRole(Identifier)_ , which is always called prior to this.
---
-
-== Members
-
-[#isVisibleInRole__String_Identifier]
-=== isVisibleInRole(String, Identifier)
-
-Returns `false` because the checking across all roles is done in _#isVisibleInAnyRole(Identifier)_ , which is always called prior to this.
-
-[#isUsableInRole__String_Identifier]
-=== isUsableInRole(String, Identifier)
-
-Returns `false` because the checking across all roles is done in _#isUsableInAnyRole(Identifier)_ , which is always called prior to this.
diff --git a/antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc b/antora/components/refguide-index/modules/security/pages/index/spring/IsisModuleSecuritySpring.adoc
similarity index 72%
copy from antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc
copy to antora/components/refguide-index/modules/security/pages/index/spring/IsisModuleSecuritySpring.adoc
index f959daa..4f17f9b 100644
--- a/antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc
+++ b/antora/components/refguide-index/modules/security/pages/index/spring/IsisModuleSecuritySpring.adoc
@@ -1,16 +1,15 @@
-= AuthorizorKeycloak
+= IsisModuleSecuritySpring
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+Configuration Bean to support authentication using Spring Security.
+
== API
[source,java]
-.AuthorizorKeycloak.java
+.IsisModuleSecuritySpring.java
----
-class AuthorizorKeycloak {
- boolean isVisibleInRole(String role, Identifier identifier)
- boolean isUsableInRole(String role, Identifier identifier)
- boolean isVisibleInAnyRole(Identifier identifier)
- boolean isUsableInAnyRole(Identifier identifier)
+class IsisModuleSecuritySpring {
+ void disableCsrf()
}
----
diff --git a/antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc b/antora/components/refguide-index/modules/security/pages/index/spring/authentication/AuthenticatorSpring.adoc
similarity index 72%
copy from antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc
copy to antora/components/refguide-index/modules/security/pages/index/spring/authentication/AuthenticatorSpring.adoc
index f959daa..57e42e1 100644
--- a/antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc
+++ b/antora/components/refguide-index/modules/security/pages/index/spring/authentication/AuthenticatorSpring.adoc
@@ -1,16 +1,15 @@
-= AuthorizorKeycloak
+= AuthenticatorSpring
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
== API
[source,java]
-.AuthorizorKeycloak.java
+.AuthenticatorSpring.java
----
-class AuthorizorKeycloak {
- boolean isVisibleInRole(String role, Identifier identifier)
- boolean isUsableInRole(String role, Identifier identifier)
- boolean isVisibleInAnyRole(Identifier identifier)
- boolean isUsableInAnyRole(Identifier identifier)
+class AuthenticatorSpring {
+ boolean canAuthenticate(final Class<? extends AuthenticationRequest> authenticationRequestClass)
+ Authentication authenticate(final AuthenticationRequest request, final String code)
+ void logout(final Authentication session)
}
----
diff --git a/antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc b/antora/components/refguide-index/modules/security/pages/index/spring/webmodule/SpringSecurityFilter.adoc
similarity index 72%
copy from antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc
copy to antora/components/refguide-index/modules/security/pages/index/spring/webmodule/SpringSecurityFilter.adoc
index f959daa..6d2011b 100644
--- a/antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc
+++ b/antora/components/refguide-index/modules/security/pages/index/spring/webmodule/SpringSecurityFilter.adoc
@@ -1,16 +1,13 @@
-= AuthorizorKeycloak
+= SpringSecurityFilter
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
== API
[source,java]
-.AuthorizorKeycloak.java
+.SpringSecurityFilter.java
----
-class AuthorizorKeycloak {
- boolean isVisibleInRole(String role, Identifier identifier)
- boolean isUsableInRole(String role, Identifier identifier)
- boolean isVisibleInAnyRole(Identifier identifier)
- boolean isUsableInAnyRole(Identifier identifier)
+class SpringSecurityFilter {
+ void doFilter(final ServletRequest servletRequest, final ServletResponse servletResponse, final FilterChain filterChain)
}
----
diff --git a/antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc b/antora/components/refguide-index/modules/security/pages/index/spring/webmodule/WebModuleSpringSecurity.adoc
similarity index 72%
copy from antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc
copy to antora/components/refguide-index/modules/security/pages/index/spring/webmodule/WebModuleSpringSecurity.adoc
index f959daa..2a17e18 100644
--- a/antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc
+++ b/antora/components/refguide-index/modules/security/pages/index/spring/webmodule/WebModuleSpringSecurity.adoc
@@ -1,16 +1,16 @@
-= AuthorizorKeycloak
+= WebModuleSpringSecurity
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+WebModule to enable support for Spring Security.
+
== API
[source,java]
-.AuthorizorKeycloak.java
+.WebModuleSpringSecurity.java
----
-class AuthorizorKeycloak {
- boolean isVisibleInRole(String role, Identifier identifier)
- boolean isUsableInRole(String role, Identifier identifier)
- boolean isVisibleInAnyRole(Identifier identifier)
- boolean isUsableInAnyRole(Identifier identifier)
+class WebModuleSpringSecurity {
+ WebModuleSpringSecurity(ServiceInjector serviceInjector)
+ Can<ServletContextListener> init(ServletContext ctx)
}
----
diff --git a/core/config/generateConfigDocs.groovy b/core/config/generateConfigDocs.groovy
index 67f7e0e..b9cdb7e 100644
--- a/core/config/generateConfigDocs.groovy
+++ b/core/config/generateConfigDocs.groovy
@@ -106,6 +106,13 @@ groups+= new PropertyGroup() {{
}}
groups+= new PropertyGroup() {{
+ prefix = "isis.security.spring"
+ name = "Spring Security Implementation"
+ properties: []
+ searchOrder = 501
+}}
+
+groups+= new PropertyGroup() {{
prefix = "datanucleus"
name = "JDO DataNucleus"
properties: []
diff --git a/core/config/src/main/adoc/modules/config/pages/about.adoc b/core/config/src/main/adoc/modules/config/pages/about.adoc
index 689d4d3..89463c3 100644
--- a/core/config/src/main/adoc/modules/config/pages/about.adoc
+++ b/core/config/src/main/adoc/modules/config/pages/about.adoc
@@ -93,6 +93,7 @@ Applications can discover the prototyping mode by injecting the `IsisSystemEnvir
+[#specifying-components]
== Specifying components
Components are pluggable parts of the Apache Isis framework that are responsible for the presentation layer, for security, or for persistence.
@@ -129,26 +130,27 @@ It looks like this:
----
@Configuration
@Import({
- IsisModuleCoreRuntimeServices.class, // <1>
- IsisModuleSecurityShiro.class, // <2>
- IsisModuleJdoDataNucleus5.class, // <3>
- IsisModuleViewerRestfulObjectsJaxrsResteasy4.class, // <4>
- IsisModuleViewerWicketViewer.class, // <5>
+ IsisModuleCoreRuntimeServices.class, // <.>
+ IsisModuleSecurityShiro.class, // <.>
+ IsisModuleJdoDataNucleus5.class, // <.>
+ IsisModuleViewerRestfulObjectsJaxrsResteasy4.class, // <.>
+ IsisModuleViewerWicketViewer.class, // <.>
...
- ApplicationModule.class, // <6>
+ ApplicationModule.class, // <.>
...
})
public class AppManifest {
}
----
-<1> Mandatory - specifies the core of the Apache Isis framework
-<2> Enables the Shiro security mechanism.
+
+<.> Mandatory - specifies the core of the Apache Isis framework
+<.> Enables the Shiro security mechanism.
There are several security implementations, precisely one must be selected
-<3> Enables JDO/DataNucleus for persistence.
+<.> Enables JDO/DataNucleus for persistence.
Optional (though if omitted then only xref:userguide:fun:overview.adoc#view-models[view models] may be used, with hand-rolled persistence).
-<4> Enables the xref:vro:ROOT:about.adoc[Restful Objects viewer] (ie REST API).
-<5> Enables the xref:vw:ROOT:about.adoc[Wicket viewer]
-<6> References the application's module(s), in this case just the one, `ApplicationModule`. +
+<.> Enables the xref:vro:ROOT:about.adoc[Restful Objects viewer] (ie REST API).
+<.> Enables the xref:vw:ROOT:about.adoc[Wicket viewer]
+<.> References the application's module(s), in this case just the one, `ApplicationModule`. +
All of the components available are named in the form`IsisModuleXxx`, so they are easy to discover.
diff --git a/antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc b/core/config/src/main/adoc/modules/config/pages/section-hooks/isis.security.spring~post.adoc
similarity index 69%
copy from antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc
copy to core/config/src/main/adoc/modules/config/pages/section-hooks/isis.security.spring~post.adoc
index f959daa..21f4ba4 100644
--- a/antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc
+++ b/core/config/src/main/adoc/modules/config/pages/section-hooks/isis.security.spring~post.adoc
@@ -1,16 +1,4 @@
-= AuthorizorKeycloak
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-== API
+:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-[source,java]
-.AuthorizorKeycloak.java
-----
-class AuthorizorKeycloak {
- boolean isVisibleInRole(String role, Identifier identifier)
- boolean isUsableInRole(String role, Identifier identifier)
- boolean isVisibleInAnyRole(Identifier identifier)
- boolean isUsableInAnyRole(Identifier identifier)
-}
-----
diff --git a/antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc b/core/config/src/main/adoc/modules/config/pages/section-hooks/isis.security.spring~pre.adoc
similarity index 69%
copy from antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc
copy to core/config/src/main/adoc/modules/config/pages/section-hooks/isis.security.spring~pre.adoc
index f959daa..787a933 100644
--- a/antora/components/refguide-index/modules/security/pages/index/keycloak/authorization/AuthorizorKeycloak.adoc
+++ b/core/config/src/main/adoc/modules/config/pages/section-hooks/isis.security.spring~pre.adoc
@@ -1,16 +1,7 @@
-= AuthorizorKeycloak
+
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-== API
+Configuration of the Spring implementation of the `Authenticator` API.
+
-[source,java]
-.AuthorizorKeycloak.java
-----
-class AuthorizorKeycloak {
- boolean isVisibleInRole(String role, Identifier identifier)
- boolean isUsableInRole(String role, Identifier identifier)
- boolean isVisibleInAnyRole(Identifier identifier)
- boolean isUsableInAnyRole(Identifier identifier)
-}
-----
diff --git a/core/config/src/main/adoc/modules/config/pages/sections/_nav.adoc b/core/config/src/main/adoc/modules/config/pages/sections/_nav.adoc
index 6059759..86fadcd 100644
--- a/core/config/src/main/adoc/modules/config/pages/sections/_nav.adoc
+++ b/core/config/src/main/adoc/modules/config/pages/sections/_nav.adoc
@@ -6,6 +6,7 @@
** xref:refguide:config:sections/isis.core.runtime-services.adoc[Core Runtime Services configurations]
** xref:refguide:config:sections/isis.persistence.schema.adoc[Core Persistence Schema]
** xref:refguide:config:sections/isis.security.shiro.adoc[Shiro Security Implementation]
+** xref:refguide:config:sections/isis.security.spring.adoc[Spring Security Implementation]
** xref:refguide:config:sections/isis.viewer.restfulobjects.adoc[Restful Objects Viewer]
** xref:refguide:config:sections/isis.viewer.wicket.adoc[Wicket Viewer]
** xref:refguide:config:sections/isis.extensions.adoc[Extensions]
diff --git a/antora/components/refguide-index/modules/security/pages/index/bypass/authorization/AuthorizorBypass.adoc b/core/config/src/main/adoc/modules/config/pages/sections/isis.security.spring.adoc
similarity index 51%
copy from antora/components/refguide-index/modules/security/pages/index/bypass/authorization/AuthorizorBypass.adoc
copy to core/config/src/main/adoc/modules/config/pages/sections/isis.security.spring.adoc
index b94155a..af63819 100644
--- a/antora/components/refguide-index/modules/security/pages/index/bypass/authorization/AuthorizorBypass.adoc
+++ b/core/config/src/main/adoc/modules/config/pages/sections/isis.security.spring.adoc
@@ -1,16 +1,28 @@
-= AuthorizorBypass
+= Spring Security Implementation
+:page-role: -toc -narrow
+
+
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-== API
+include::../section-hooks/isis.security.spring~pre.adoc[]
+
+[cols="3a,2a,5a", options="header"]
+|===
+|Property
+|Default
+|Description
+|
+[[isis.security.spring.allow-csrf-filters]]
+isis.security.spring. +
+allow-csrf-filters
+
+|
+| The framework on initialization by default disables any \{@code CsrfFilter}(s) it finds with _Spring Security_ registered filters.
+
+Setting this option to \{@literal true} allows \{@code CsrfFilter}(s) to be configured. Yet EXPERIMENTAL. @see org.springframework.security.web.csrf.CsrfFilter @see "https://www.baeldung.com/spring-security-registered-filters"
+
+
-[source,java]
-.AuthorizorBypass.java
-----
-class AuthorizorBypass {
- boolean isUsableInRole(final String role, final Identifier identifier)
- boolean isVisibleInRole(final String user, final Identifier identifier)
- boolean isVisibleInAnyRole(Identifier identifier)
- boolean isUsableInAnyRole(Identifier identifier)
-}
-----
+|===
+include::../section-hooks/isis.security.spring~post.adoc[]