You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/02/27 19:48:29 UTC

[isis] branch master updated (7cfe55a -> 2976f60)

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

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


    from 7cfe55a  Bump togglz.version from 2.9.2 to 2.9.6
     add a589db0  ISIS-2534: add Spring Security module (just a stub)
     add 7f203a9  ISIS-2534: adds spring security web filter (yet bypassing authorization)
     add 9b93724  ISIS-2534: remove NOP authorizor
     add 169bfbe  ISIS-2534: working on logout redirect
     add a6035fa  ISIS-2534: LogoutMenu: handle logout redirect for external authentication type
     add eaac991  ISIS-1922: Notify user when expired session is refreshed
     add caf5829  ISIS-2534: session expired handling: code review (post-merge)
     add ac96609  ISIS-1922: don't create a new session as a side-effect of checking whether the session was expired
     add 0c008bb  ISIS-1922: polishing
     add afa7b6e  ISIS-1922: polish the expiry message
     add 8662408  ISIS-2534: Demo: explicitly set session timeout (20 min)
     add e222031  ISIS-2534: SecMan: sec-admin should be allowed to logout
     add b455749  ISIS-2534: adds configuration option to enable CSRF protection
     add 93e78ad  ISIS-2534: Wicket: adds experimental code to enable CSRF tokens for AJAX requests
     add 8c9fe66  ISIS-2547: cache grids per layout in production mode
     add 7090046  ISIS-2547: cache grids per layout in production mode
     add a04416c  ISIS-2547: GridFacetDefault: fix logic (inconsistent hasLayoutFacet)
     add 8e15793  ISIS-2547: GridFacetDefault: make caching thread safe
     add 622437c  ISIS-2547: GridFacetDefault: account for the special meaning of layoutName==null
     add 9e8d1b2  ISIS-2534: simplifying Authorizor interface
     add 7da685c  ISIS-2534: create a SecMan authorizor (remove the Spring authorizor)
     add 2167660  ISIS-2534: Identifier: house-keeping and thread-safety
     add 088e19d  ISIS-2534: Identifier: more refactoring ...
     add 2aeb8fc  ISIS-2534: Identifier: further simplify
     add aba7c77  ISIS-2534: introduces TypeIdentifier to make Identifiers aware of logical their logical names
     add 3a07c4a  ISIS-2534: move Identifier into subpackage 'id'
     add 49590d2  ISIS-2534: Wicket: fixes CollectionContentsAsAjaxTablePanel misusing the GridFacet
     add 2976f60  ISIS-2534: adds ApplicationFeatureId factory method that takes an Identifier

No new revisions were added by this update.

Summary of changes:
 .../java/org/apache/isis/applib/Identifier.java    | 445 ---------------------
 .../events/ActionArgumentUsabilityEvent.java       |   2 +-
 .../events/ActionArgumentVisibilityEvent.java      |   2 +-
 .../applib/events/domain/AbstractDomainEvent.java  |   2 +-
 .../recoverable/InteractionException.java          |   2 +-
 .../java/org/apache/isis/applib/id/Identifier.java | 238 +++++++++++
 .../org/apache/isis/applib/id/TypeIdentifier.java  | 154 +++++++
 .../java/org/apache/isis/applib/package-info.java  |   2 +-
 .../applib/services/grid/GridLoaderService.java    |   8 +-
 .../services/wrapper/events/AccessEvent.java       |   2 +-
 .../wrapper/events/ActionArgumentEvent.java        |   2 +-
 .../wrapper/events/ActionInvocationEvent.java      |   2 +-
 .../wrapper/events/ActionUsabilityEvent.java       |   2 +-
 .../wrapper/events/ActionVisibilityEvent.java      |   2 +-
 .../wrapper/events/CollectionAccessEvent.java      |   2 +-
 .../wrapper/events/CollectionAddToEvent.java       |   2 +-
 .../wrapper/events/CollectionMethodEvent.java      |   2 +-
 .../wrapper/events/CollectionRemoveFromEvent.java  |   2 +-
 .../wrapper/events/CollectionUsabilityEvent.java   |   2 +-
 .../wrapper/events/CollectionVisibilityEvent.java  |   2 +-
 .../services/wrapper/events/InteractionEvent.java  |  11 +-
 .../services/wrapper/events/ObjectTitleEvent.java  |   2 +-
 .../wrapper/events/ObjectValidityEvent.java        |   2 +-
 .../wrapper/events/ObjectVisibilityEvent.java      |   2 +-
 .../services/wrapper/events/ParseValueEvent.java   |   2 +-
 .../wrapper/events/PropertyAccessEvent.java        |   2 +-
 .../wrapper/events/PropertyModifyEvent.java        |   2 +-
 .../wrapper/events/PropertyUsabilityEvent.java     |   2 +-
 .../wrapper/events/PropertyVisibilityEvent.java    |   2 +-
 .../services/wrapper/events/UsabilityEvent.java    |   2 +-
 .../services/wrapper/events/ValidityEvent.java     |   2 +-
 .../services/wrapper/events/VisibilityEvent.java   |   2 +-
 .../org/apache/isis/applib/IdentifierTests.java    |  19 +-
 .../isis/applib/events/InteractionEventTest.java   |  11 +-
 .../apache/isis/core/config/IsisConfiguration.java |  18 +
 .../isis/core/metamodel/facetapi/FeatureType.java  |  32 +-
 .../core/metamodel/facetapi/IdentifiedHolder.java  |   2 +-
 .../core/metamodel/facets/DomainEventHelper.java   |   2 +-
 .../isis/core/metamodel/facets/FacetedMethod.java  |  12 +-
 .../metamodel/facets/FacetedMethodParameter.java   |  11 +-
 .../core/metamodel/facets/ImperativeFacet.java     |   4 +-
 .../invocation/ActionDomainEventFacetAbstract.java |   2 +-
 .../actions/action/invocation/CommandUtil.java     |   4 +-
 .../annotation/HomePageFacetAnnotationFactory.java |   6 +-
 .../ActionValidationFacetViaMethodFactory.java     |   2 +-
 .../facets/all/deficiencies/DeficiencyFacet.java   |   2 +-
 .../facets/all/i18n/TranslationFacetFactory.java   |   6 +-
 .../modify/CollectionDomainEventFacetAbstract.java |   2 +-
 .../DisableForContextFacetViaMethodFactory.java    |   2 +-
 .../ViewModelSemanticCheckingFacetFactory.java     |  11 +-
 .../BookmarkPolicyFacetFallbackFactory.java        |   2 +-
 .../disabled/DisabledObjectFacetAbstract.java      |   2 +-
 .../method/DisabledObjectFacetViaMethod.java       |   4 +-
 .../DisabledObjectFacetViaMethodFactory.java       |   4 +-
 .../DomainObjectAnnotationFacetFactory.java        |   5 +-
 .../facets/object/grid/GridFacetDefault.java       |  82 ++--
 .../mixin/MetaModelValidatorForMixinTypes.java     |   7 +-
 .../parser/ParseableFacetUsingParser.java          |   2 +-
 .../method/ValidateObjectFacetMethodFactory.java   |   2 +-
 .../MustSatisfySpecificationFacetAbstract.java     |   2 +-
 ...tionParameterDisabledFacetViaMethodFactory.java |   2 +-
 ...onParameterValidationFacetViaMethodFactory.java |   2 +-
 .../modify/PropertyDomainEventFacetAbstract.java   |   2 +-
 .../PropertyValidateFacetViaMethodFactory.java     |   2 +-
 .../core/metamodel/interactions/AccessContext.java |   2 +-
 .../interactions/ActionArgUsabilityContext.java    |   2 +-
 .../interactions/ActionArgValidityContext.java     |   2 +-
 .../interactions/ActionArgVisibilityContext.java   |   2 +-
 .../interactions/ActionUsabilityContext.java       |   2 +-
 .../interactions/ActionValidityContext.java        |   2 +-
 .../interactions/ActionVisibilityContext.java      |   2 +-
 .../interactions/CollectionAccessContext.java      |   2 +-
 .../interactions/CollectionAddToContext.java       |   2 +-
 .../interactions/CollectionRemoveFromContext.java  |   2 +-
 .../interactions/CollectionUsabilityContext.java   |   2 +-
 .../interactions/CollectionVisibilityContext.java  |   2 +-
 .../metamodel/interactions/InteractionContext.java |   2 +-
 .../metamodel/interactions/ObjectTitleContext.java |   2 +-
 .../interactions/ObjectValidityContext.java        |   2 +-
 .../interactions/ObjectVisibilityContext.java      |   2 +-
 .../metamodel/interactions/ParseValueContext.java  |   2 +-
 .../interactions/PropertyAccessContext.java        |   2 +-
 .../interactions/PropertyModifyContext.java        |   2 +-
 .../interactions/PropertyUsabilityContext.java     |   2 +-
 .../interactions/PropertyVisibilityContext.java    |   2 +-
 .../metamodel/interactions/UsabilityContext.java   |   2 +-
 .../metamodel/interactions/ValidityContext.java    |   2 +-
 .../metamodel/interactions/VisibilityContext.java  |   2 +-
 .../interactions/managed/ManagedFeature.java       |   2 +-
 .../interactions/managed/ManagedMember.java        |   2 +-
 .../managed/ParameterNegotiationModel.java         |   2 +-
 .../MemberIdentifierComparator.java                |   2 +-
 .../dflt/ProgrammingModelFacetsJava8.java          |   2 +-
 .../services/appfeat/ApplicationFeatureId.java     |  19 +-
 .../title/TitlesAndTranslationsValidator.java      |  21 +-
 .../core/metamodel/spec/feature/ObjectAction.java  |   2 +-
 .../spec/feature/ObjectActionContainer.java        |   2 +-
 .../spec/feature/OneToOneAssociation.java          |   2 +-
 .../specloader/specimpl/ObjectActionMixedIn.java   |  14 +-
 .../specimpl/ObjectActionParameterAbstract.java    |   2 +-
 .../specloader/specimpl/ObjectMemberAbstract.java  |   2 +-
 .../specimpl/ObjectSpecificationAbstract.java      |  25 +-
 .../specimpl/OneToManyAssociationMixedIn.java      |  24 +-
 .../specimpl/OneToOneAssociationMixedIn.java       |  24 +-
 .../specimpl/dflt/ObjectSpecificationDefault.java  |   6 +-
 .../specloader/validator/MetaModelValidator.java   |   2 +-
 .../validator/MetaModelValidatorAbstract.java      |   2 +-
 ...etaModelValidatorForConflictingOptionality.java |   2 +-
 .../MetaModelValidatorForDeprecatedAnnotation.java |   4 +-
 ...etaModelValidatorForDeprecatedMethodPrefix.java |   4 +-
 .../specloader/validator/ValidationFailure.java    |   2 +-
 .../specloader/validator/ValidationFailures.java   |   2 +-
 .../facetapi/FeatureTypeTest_identifierFor.java    |   9 +-
 .../facets/AbstractFacetFactoryJUnit4TestCase.java |   6 +-
 .../metamodel/facets/AbstractFacetFactoryTest.java |   5 +-
 ...nEventHelperTest_newActionInteractionEvent.java |   9 +-
 ...HelperTest_newCollectionDomainEvent_forAdd.java |  12 +-
 ...perTest_newCollectionDomainEvent_forRemove.java |  12 +-
 ...HelperTest_newPropertyDomainEvent_forClear.java |   9 +-
 ...elperTest_newPropertyDomainEvent_forModify.java |   9 +-
 .../actions/ActionMethodsFacetFactoryTest.java     |   2 +-
 ...nnotationFacetFactoryTest_ActionInvocation.java |   6 +-
 .../ObjectDisabledMethodFacetFactoryTest.java      |   4 +-
 .../facets/object/mixin/MixinIntendedAs.java       |   7 +-
 .../metamodel/id/TypeIdentifierTestFactory.java    |  21 +-
 .../objects/ObjectActionLayoutXmlDefaultTest.java  |   5 +-
 .../objects/OneToManyAssociationDefaultTest.java   |   9 +-
 .../metamodel/MetaModelServiceDefaultTest.java     |   6 +-
 .../testspec/ObjectSpecificationStub.java          |  23 +-
 core/pom.xml                                       |  10 +-
 .../executor/MemberExecutorServiceDefault.java     |   4 +-
 .../InteractionDtoServiceInternalDefault.java      |   6 +-
 .../menubars/bootstrap3/ServiceAndAction.java      |   2 +-
 .../security/authentication/logout/LogoutMenu.java |  39 +-
 .../manager/AuthorizationManager.java              |  37 +-
 .../authorization/standard/Authorizor.java         |  46 +--
 .../changetracking/AdapterAndProperty.java         |   2 +-
 .../demo/domain/src/main/resources/application.yml |   3 +
 .../java/demoapp/webapp/wicket/DemoAppWicket.java  |   4 +-
 .../extensions/secman/api/SecmanConfiguration.java |   1 +
 .../secman/api/authorizor/AuthorizorSecman.java    |  70 ++++
 .../ApplicationPermissionRepository.java           |   2 +-
 .../jdo/dom/role/ApplicationRoleRepository.java    |   2 +-
 .../dom/tenancy/ApplicationTenancyRepository.java  |   2 +-
 .../jdo/dom/user/ApplicationUserRepository.java    |   2 +-
 .../ApplicationPermissionRepository.java           |   2 +-
 .../jpa/dom/role/ApplicationRoleRepository.java    |   2 +-
 .../dom/tenancy/ApplicationTenancyRepository.java  |   2 +-
 .../jpa/dom/user/ApplicationUserRepository.java    |   2 +-
 .../secman/shiro/AuthInfoForApplicationUser.java   |   2 +-
 .../object/query/VisitorForClauseAbstract.java     |   9 +-
 .../facets/object/query/VisitorForFromClause.java  |  11 +-
 .../object/query/VisitorForVariablesClause.java    |   9 +-
 ...DerivedFromJdoColumnAnnotationFacetFactory.java |   4 +-
 ...ndatoryFromJdoColumnAnnotationFacetFactory.java |   8 +-
 ...DerivedFromJdoColumnAnnotationFacetFactory.java |   2 +-
 ...AnnotationFacetFactoryTest_refineMetaModel.java |   6 +-
 .../object/version/TypeIdentifierTestFactory.java  |  18 +-
 .../testing/AbstractFacetFactoryTest.java          |   5 +-
 .../bypass/authorization/AuthorizorBypass.java     |  17 +-
 .../keycloak/authorization/AuthorizorKeycloak.java |  17 +-
 .../shiro/authorization/AuthorizorShiro.java       |  40 +-
 ...AuthenticatorOrAuthorizorTest_authenticate.java |  33 +-
 ...ticatorOrAuthorizorTest_isVisibleInAnyRole.java |  22 +-
 .../security/shiro/TypeIdentifierTestFactory.java  |  21 +-
 security/shiro/src/test/resources/shiro.ini        |   6 +-
 .../vro/cors/impl => security/spring}/pom.xml      |  40 +-
 .../security/spring/IsisModuleSecuritySpring.java  |  84 ++++
 .../authentication/AuthenticatorSpring.java}       |  15 +-
 .../spring/webmodule/SpringSecurityFilter.java}    |  66 ++-
 .../spring/webmodule/WebModuleSpringSecurity.java} |  20 +-
 .../applib/validate/DomainModelValidator.java      |   2 +-
 .../common/model/mementos/ActionMemento.java       |   5 +-
 .../wicket/model/common/CommonContextUtils.java    |   2 +-
 .../wicket/model/links/LinkAndLabelAbstract.java   |   2 +-
 .../wicket/model/mementos/CollectionMemento.java   |   4 +-
 .../wicket/model/mementos/PropertyMemento.java     |   4 +-
 .../wicket/model/models/PageParameterUtil.java     |   4 +-
 .../wicket/model/models/ScalarPropertyModel.java   |   3 +-
 .../CollectionContentsAsAjaxTablePanel.java        |  18 +-
 .../linkandlabel/LinkAndLabelFactoryAbstract.java  |   4 +-
 .../viewer/integration/WebRequestCycleForIsis.java | 170 ++++++--
 .../viewer/wicketapp/IsisWicketApplication.java    |   7 +-
 .../IsisWicketApplication_Experimental.java        | 107 -----
 .../IsisWicketApplication_experimental.java        | 171 ++++++++
 185 files changed, 1540 insertions(+), 1209 deletions(-)
 delete mode 100644 api/applib/src/main/java/org/apache/isis/applib/Identifier.java
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/id/Identifier.java
 create mode 100644 api/applib/src/main/java/org/apache/isis/applib/id/TypeIdentifier.java
 copy subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/DescriptionType.java => core/metamodel/src/test/java/org/apache/isis/core/metamodel/id/TypeIdentifierTestFactory.java (75%)
 create mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/authorizor/AuthorizorSecman.java
 copy regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/stereotypes/MyObject_mixin.java => persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/version/TypeIdentifierTestFactory.java (74%)
 copy regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/bad/AmbiguousTitle.java => security/shiro/src/test/java/org/apache/isis/security/shiro/TypeIdentifierTestFactory.java (69%)
 copy {extensions/vro/cors/impl => security/spring}/pom.xml (62%)
 create mode 100644 security/spring/src/main/java/org/apache/isis/security/spring/IsisModuleSecuritySpring.java
 copy security/{keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java => spring/src/main/java/org/apache/isis/security/spring/authentication/AuthenticatorSpring.java} (87%)
 copy security/{keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java => spring/src/main/java/org/apache/isis/security/spring/webmodule/SpringSecurityFilter.java} (52%)
 copy security/{keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java => spring/src/main/java/org/apache/isis/security/spring/webmodule/WebModuleSpringSecurity.java} (77%)
 delete mode 100644 viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Experimental.java
 create mode 100644 viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_experimental.java