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/05/26 06:43:12 UTC
[isis] branch master updated (6ce03f0 -> f728760)
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 6ce03f0 ISIS-2631: don't break with layout/menubars/bootstrap3
add 78b0c3b ISIS-2698: renames isis-extensions-secman-model to isis-extensions-secman-integration
add 388e061 ISIS-2698: renames o.a.i.extensions.secman.model to o.a.i.extensions.secman.integration
add b6b160f ISIS-2698: renames IsisModuleExtSecmanModel to IsisModuleExtSecmanIntegration
add c83819a ISIS-2698: removes PasswordEncryptionServiceNone as this is unused code
add d233eaa ISIS-2698: adds a comment is all.
add c234ab5 ISIS-2698: moves PasswordEncryptionService to an spi subpackage of user.
add 9bb9482 ISIS-2698: renames <artifactId>isis-extensions-secman-api</artifactId> to <artifactId>isis-extensions-secman-applib</artifactId>
add 3d7c014 ISIS-2698: renames directory also of secman's api -> applib
add c54de91 ISIS-2698: renames o.a.i.extensions.secman.api to o.a.i.extensions.secman.applib
add c1406e4 ISIS-2698: renames IsisModuleExtSecmanApi to IsisModuleExtSecmanApplib
add 90af791 ISIS-2698: moves AuthorizorSecman from secman's applib to integration module
add 344abbc ISIS-2698: moves secman's seed scripts from integration module up to applib module
add 12adb47 ISIS-2698: moves secman seed classes around in its applib
new f728760 Merge pull request #560 from apache/ISIS-2698
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:
.../index/secman/api/user/dom/ApplicationUser.adoc | 4 +-
.../manager/AuthorizationManager.java | 1 +
examples/demo/domain/pom.xml | 2 +-
.../main/java/demoapp/dom/DemoModuleCommon.java | 6 +-
.../ApplicationTenancyEvaluatorForDemo.java | 4 +-
examples/demo/pom.xml | 6 +-
.../java/demoapp/web/DemoAppManifestCommon.java | 4 +-
extensions/pom.xml | 2 +-
.../secman/api/IsisModuleExtSecmanApi.java | 179 --------------------
.../encryption/PasswordEncryptionServiceNone.java | 42 -----
extensions/security/secman/{api => applib}/pom.xml | 4 +-
.../secman/applib/IsisModuleExtSecmanApplib.java | 180 +++++++++++++++++++++
.../secman/applib}/SecmanConfiguration.java | 4 +-
.../feature/api/ApplicationFeatureChoices.java | 10 +-
.../ApplicationFeatureViewModel_permissions.java | 6 +-
.../app/ApplicationOrphanedPermissionManager.java | 12 +-
...OrphanedPermissionManager_relocateSelected.java | 12 +-
.../permission/dom/ApplicationPermission.java | 14 +-
.../dom/ApplicationPermission.layout.fallback.xml | 0
.../permission/dom/ApplicationPermissionMode.java | 2 +-
.../dom/ApplicationPermissionRepository.java | 6 +-
.../ApplicationPermissionRepositoryAbstract.java | 20 +--
.../permission/dom/ApplicationPermissionRule.java | 2 +-
.../permission/dom/ApplicationPermissionValue.java | 2 +-
.../dom/ApplicationPermissionValueSet.java | 12 +-
.../dom/mixins/ApplicationPermission_allow.java | 12 +-
.../dom/mixins/ApplicationPermission_changing.java | 12 +-
.../dom/mixins/ApplicationPermission_delete.java | 12 +-
.../dom/mixins/ApplicationPermission_feature.java | 8 +-
.../mixins/ApplicationPermission_updateRole.java | 14 +-
.../dom/mixins/ApplicationPermission_veto.java | 12 +-
.../dom/mixins/ApplicationPermission_viewing.java | 12 +-
.../permission/menu/ApplicationPermissionMenu.java | 18 +--
.../spi/PermissionsEvaluationService.java | 14 +-
.../spi/PermissionsEvaluationServiceAbstract.java | 8 +-
...PermissionsEvaluationServiceAllowBeatsVeto.java | 10 +-
...PermissionsEvaluationServiceVetoBeatsAllow.java | 12 +-
.../secman/applib}/role/dom/ApplicationRole.java | 20 +--
.../role/dom/ApplicationRole.layout.fallback.xml | 0
.../role/dom/ApplicationRoleRepository.java | 4 +-
.../dom/ApplicationRoleRepositoryAbstract.java | 10 +-
.../dom/mixins/ApplicationRole_addPermission.java | 20 +--
.../role/dom/mixins/ApplicationRole_addUser.java | 16 +-
.../role/dom/mixins/ApplicationRole_delete.java | 12 +-
.../mixins/ApplicationRole_removePermissions.java | 16 +-
.../dom/mixins/ApplicationRole_removeUsers.java | 16 +-
.../mixins/ApplicationRole_updateDescription.java | 10 +-
.../dom/mixins/ApplicationRole_updateName.java | 10 +-
.../AbstractRoleAndPermissionsFixtureScript.java | 10 +-
.../applib}/role/menu/ApplicationRoleMenu.java | 16 +-
.../seed}/IsisAppFeatureRoleAndPermissions.java | 11 +-
.../seed}/IsisConfigurationRoleAndPermissions.java | 9 +-
.../seed}/IsisExtH2ConsoleRoleAndPermissions.java | 8 +-
.../IsisExtSecmanAdminRoleAndPermissions.java | 11 +-
...IsisExtSecmanRegularUserRoleAndPermissions.java | 23 ++-
...sPersistenceJdoMetaModelRoleAndPermissions.java | 8 +-
.../IsisSudoImpersonateRoleAndPermissions.java | 8 +-
...werRestfulObjectsSwaggerRoleAndPermissions.java | 9 +-
.../applib}/seed/SeedSecurityModuleService.java | 4 +-
.../scripts/SeedUsersAndRolesFixtureScript.java | 24 +--
.../applib}/tenancy/dom/ApplicationTenancy.java | 14 +-
.../dom/ApplicationTenancy.layout.fallback.xml | 0
.../tenancy/dom/ApplicationTenancyRepository.java | 4 +-
.../dom/ApplicationTenancyRepositoryAbstract.java | 6 +-
.../secman/applib}/tenancy/dom/HasAtPath.java | 4 +-
.../dom/mixins/ApplicationTenancy_addChild.java | 12 +-
.../dom/mixins/ApplicationTenancy_addUser.java | 16 +-
.../dom/mixins/ApplicationTenancy_delete.java | 16 +-
.../dom/mixins/ApplicationTenancy_removeChild.java | 12 +-
.../dom/mixins/ApplicationTenancy_removeUser.java | 16 +-
.../dom/mixins/ApplicationTenancy_updateName.java | 10 +-
.../dom/mixins/ApplicationTenancy_users.java | 10 +-
.../fixtures/AbstractTenancyFixtureScript.java | 6 +-
.../tenancy/menu/ApplicationTenancyMenu.java | 16 +-
.../secman/applib/tenancy/seed}/GlobalTenancy.java | 4 +-
.../tenancy/spi/ApplicationTenancyEvaluator.java | 4 +-
.../secman/applib}/user/ApplicationUser.java | 0
.../applib}/user/app/ApplicationUserManager.java | 6 +-
.../app/ApplicationUserManager.layout.fallback.xml | 0
.../mixins/ApplicationUserManager_allUsers.java | 8 +-
.../ApplicationUserManager_newDelegateUser.java | 22 +--
.../ApplicationUserManager_newLocalUser.java | 24 +--
...pplicationUserManager_newLocalUserAbstract.java | 2 +-
.../user/contributions/HasUsername_open.java | 10 +-
.../secman/applib}/user/dom/AccountType.java | 2 +-
.../secman/applib}/user/dom/ApplicationUser.java | 34 ++--
.../user/dom/ApplicationUser.layout.fallback.xml | 0
.../user/dom/ApplicationUserRepository.java | 6 +-
.../dom/ApplicationUserRepositoryAbstract.java | 18 +--
.../applib}/user/dom/ApplicationUserStatus.java | 2 +-
.../user/dom/mixins/ApplicationUser_addRole.java | 14 +-
.../user/dom/mixins/ApplicationUser_delete.java | 12 +-
.../user/dom/mixins/ApplicationUser_duplicate.java | 18 +--
.../user/dom/mixins/ApplicationUser_lock.java | 16 +-
.../dom/mixins/ApplicationUser_removeRoles.java | 16 +-
.../dom/mixins/ApplicationUser_resetPassword.java | 12 +-
.../user/dom/mixins/ApplicationUser_unlock.java | 12 +-
.../mixins/ApplicationUser_updateAccountType.java | 14 +-
.../dom/mixins/ApplicationUser_updateAtPath.java | 10 +-
.../mixins/ApplicationUser_updateEmailAddress.java | 10 +-
.../mixins/ApplicationUser_updateFaxNumber.java | 10 +-
.../dom/mixins/ApplicationUser_updateName.java | 10 +-
.../dom/mixins/ApplicationUser_updatePassword.java | 14 +-
.../mixins/ApplicationUser_updatePhoneNumber.java | 10 +-
.../dom/mixins/ApplicationUser_updateUsername.java | 10 +-
.../perms/ApplicationUser_filterPermissions.java | 10 +-
.../mixins/perms/ApplicationUser_permissions.java | 8 +-
.../dom/mixins/perms/UserPermissionViewModel.java | 24 +--
.../UserPermissionViewModel.layout.fallback.xml | 0
.../applib}/user/events/UserCreatedEvent.java | 6 +-
.../AbstractUserAndRolesFixtureScript.java | 12 +-
.../applib}/user/menu/ApplicationUserMenu.java | 15 +-
.../secman/applib}/user/menu/MeService.java | 16 +-
.../applib/user/seed}/IsisExtSecmanAdminUser.java | 9 +-
.../user/spi}/PasswordEncryptionService.java | 2 +-
.../secman/applib}/util/RegexReplacer.java | 2 +-
.../security/secman/encryption-jbcrypt/pom.xml | 10 +-
.../PasswordEncryptionServiceUsingJBcrypt.java | 2 +-
.../security/secman/{model => integration}/pom.xml | 10 +-
.../IsisModuleExtSecmanIntegration.java} | 22 +--
.../integration}/authorizor/AuthorizorSecman.java | 8 +-
.../facets/TenantedAuthorizationFacet.java | 2 +-
.../facets/TenantedAuthorizationFacetDefault.java | 8 +-
.../facets/TenantedAuthorizationPostProcessor.java | 6 +-
.../spiimpl/ImpersonateMenuAdvisorForSecman.java | 12 +-
.../TableColumnVisibilityServiceForSecman.java | 6 +-
.../userreg/UserRegistrationServiceForSecman.java | 10 +-
.../main/resources/images/ApplicationFeature.png | Bin
.../ApplicationOrphanedPermissionManager.png | Bin
.../main/resources/images/ApplicationPassword.png | Bin
.../resources/images/ApplicationPermission.png | Bin
.../src/main/resources/images/ApplicationRole.png | Bin
.../main/resources/images/ApplicationTenancy.png | Bin
.../resources/images/ApplicationUser-locked.png | Bin
.../resources/images/ApplicationUser-unlocked.png | Bin
.../resources/images/ApplicationUserManager.png | Bin
.../src/main/resources/images/UserPermission.png | Bin
.../src/main/resources/images/zip/key_security.zip | Bin
.../src/main/resources/images/zip/outline_star.zip | Bin
.../main/resources/images/zip/question_shield.zip | Bin
.../main/resources/images/zip/theatre_masks.zip | Bin
.../src/main/resources/images/zip/user.zip | Bin
.../resources/images/zip/worldwide_location.zip | Bin
extensions/security/secman/persistence-jdo/pom.xml | 4 +-
.../jdo/IsisModuleExtSecmanPersistenceJdo.java | 4 +-
.../jdo/permission/dom/ApplicationPermission.java | 18 +--
.../dom/ApplicationPermissionRepository.java | 2 +-
.../secman/jdo/role/dom/ApplicationRole.java | 8 +-
.../jdo/role/dom/ApplicationRoleRepository.java | 2 +-
.../secman/jdo/tenancy/dom/ApplicationTenancy.java | 18 +--
.../tenancy/dom/ApplicationTenancyRepository.java | 2 +-
.../secman/jdo/user/dom/ApplicationUser.java | 29 ++--
.../jdo/user/dom/ApplicationUserRepository.java | 2 +-
.../extensions/secman/jdo/util/RegexReplacer.java | 2 +-
extensions/security/secman/persistence-jpa/pom.xml | 4 +-
.../jpa/IsisModuleExtSecmanPersistenceJpa.java | 4 +-
.../jpa/permission/dom/ApplicationPermission.java | 18 +--
.../dom/ApplicationPermissionRepository.java | 10 +-
.../secman/jpa/role/dom/ApplicationRole.java | 8 +-
.../jpa/role/dom/ApplicationRoleRepository.java | 2 +-
.../secman/jpa/tenancy/dom/ApplicationTenancy.java | 19 ++-
.../tenancy/dom/ApplicationTenancyRepository.java | 2 +-
.../secman/jpa/user/dom/ApplicationUser.java | 37 ++---
.../jpa/user/dom/ApplicationUserRepository.java | 2 +-
.../extensions/secman/jpa/util/RegexReplacer.java | 2 +-
extensions/security/secman/pom.xml | 12 +-
extensions/security/secman/shiro-realm/pom.xml | 8 +-
.../shiro/IsisModuleExtSecmanShiroRealm.java | 8 +-
.../secman/shiro/PermissionForMember.java | 2 +-
.../secman/shiro/PrincipalForApplicationUser.java | 10 +-
.../isis/testdomain/shiro/ShiroSecmanLdapTest.java | 4 +-
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 4 +-
.../isis/testdomain/shiro/ShiroSecmanTest.java | 16 +-
regressiontests/pom.xml | 2 +-
.../conf/Configuration_usingJdoAndShiro.java | 6 +-
.../isis/testdomain/jdo/JdoTestDomainPersona.java | 10 +-
.../isis/testdomain/jpa/JpaTestDomainPersona.java | 10 +-
177 files changed, 922 insertions(+), 996 deletions(-)
delete mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/IsisModuleExtSecmanApi.java
delete mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/encryption/PasswordEncryptionServiceNone.java
rename extensions/security/secman/{api => applib}/pom.xml (95%)
create mode 100644 extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/IsisModuleExtSecmanApplib.java
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/SecmanConfiguration.java (98%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/feature/api/ApplicationFeatureChoices.java (94%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/feature/contributions/ApplicationFeatureViewModel_permissions.java (88%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/app/ApplicationOrphanedPermissionManager.java (79%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/app/mixins/ApplicationOrphanedPermissionManager_relocateSelected.java (83%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/dom/ApplicationPermission.java (96%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/dom/ApplicationPermission.layout.fallback.xml (100%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/dom/ApplicationPermissionMode.java (97%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/dom/ApplicationPermissionRepository.java (93%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/dom/ApplicationPermissionRepositoryAbstract.java (94%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/dom/ApplicationPermissionRule.java (96%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/dom/ApplicationPermissionValue.java (98%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/dom/ApplicationPermissionValueSet.java (92%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/dom/mixins/ApplicationPermission_allow.java (75%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/dom/mixins/ApplicationPermission_changing.java (75%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/dom/mixins/ApplicationPermission_delete.java (76%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/dom/mixins/ApplicationPermission_feature.java (87%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/dom/mixins/ApplicationPermission_updateRole.java (77%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/dom/mixins/ApplicationPermission_veto.java (75%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/dom/mixins/ApplicationPermission_viewing.java (75%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/menu/ApplicationPermissionMenu.java (81%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/spi/PermissionsEvaluationService.java (73%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/spi/PermissionsEvaluationServiceAbstract.java (86%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/spi/PermissionsEvaluationServiceAllowBeatsVeto.java (79%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/permission/spi/PermissionsEvaluationServiceVetoBeatsAllow.java (79%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/role/dom/ApplicationRole.java (90%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/role/dom/ApplicationRole.layout.fallback.xml (100%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/role/dom/ApplicationRoleRepository.java (93%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/role/dom/ApplicationRoleRepositoryAbstract.java (93%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/role/dom/mixins/ApplicationRole_addPermission.java (79%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/role/dom/mixins/ApplicationRole_addUser.java (77%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/role/dom/mixins/ApplicationRole_delete.java (79%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/role/dom/mixins/ApplicationRole_removePermissions.java (80%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/role/dom/mixins/ApplicationRole_removeUsers.java (78%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/role/dom/mixins/ApplicationRole_updateDescription.java (81%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/role/dom/mixins/ApplicationRole_updateName.java (80%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/role/fixtures/AbstractRoleAndPermissionsFixtureScript.java (87%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/role/menu/ApplicationRoleMenu.java (87%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other => applib/src/main/java/org/apache/isis/extensions/secman/applib/role/seed}/IsisAppFeatureRoleAndPermissions.java (84%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other => applib/src/main/java/org/apache/isis/extensions/secman/applib/role/seed}/IsisConfigurationRoleAndPermissions.java (83%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other => applib/src/main/java/org/apache/isis/extensions/secman/applib/role/seed}/IsisExtH2ConsoleRoleAndPermissions.java (84%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/secman => applib/src/main/java/org/apache/isis/extensions/secman/applib/role/seed}/IsisExtSecmanAdminRoleAndPermissions.java (82%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/secman => applib/src/main/java/org/apache/isis/extensions/secman/applib/role/seed}/IsisExtSecmanRegularUserRoleAndPermissions.java (83%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other => applib/src/main/java/org/apache/isis/extensions/secman/applib/role/seed}/IsisPersistenceJdoMetaModelRoleAndPermissions.java (84%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other => applib/src/main/java/org/apache/isis/extensions/secman/applib/role/seed}/IsisSudoImpersonateRoleAndPermissions.java (83%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other => applib/src/main/java/org/apache/isis/extensions/secman/applib/role/seed}/IsisViewerRestfulObjectsSwaggerRoleAndPermissions.java (81%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model => applib/src/main/java/org/apache/isis/extensions/secman/applib}/seed/SeedSecurityModuleService.java (93%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model => applib/src/main/java/org/apache/isis/extensions/secman/applib}/seed/scripts/SeedUsersAndRolesFixtureScript.java (67%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/tenancy/dom/ApplicationTenancy.java (93%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/tenancy/dom/ApplicationTenancy.layout.fallback.xml (100%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/tenancy/dom/ApplicationTenancyRepository.java (92%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/tenancy/dom/ApplicationTenancyRepositoryAbstract.java (97%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/tenancy/dom/HasAtPath.java (95%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/tenancy/dom/mixins/ApplicationTenancy_addChild.java (76%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/tenancy/dom/mixins/ApplicationTenancy_addUser.java (77%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/tenancy/dom/mixins/ApplicationTenancy_delete.java (77%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/tenancy/dom/mixins/ApplicationTenancy_removeChild.java (79%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/tenancy/dom/mixins/ApplicationTenancy_removeUser.java (75%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/tenancy/dom/mixins/ApplicationTenancy_updateName.java (80%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/tenancy/dom/mixins/ApplicationTenancy_users.java (79%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/tenancy/fixtures/AbstractTenancyFixtureScript.java (88%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/tenancy/menu/ApplicationTenancyMenu.java (88%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/secman => applib/src/main/java/org/apache/isis/extensions/secman/applib/tenancy/seed}/GlobalTenancy.java (88%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/tenancy/spi/ApplicationTenancyEvaluator.java (95%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/ApplicationUser.java (100%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/app/ApplicationUserManager.java (87%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/app/ApplicationUserManager.layout.fallback.xml (100%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/app/mixins/ApplicationUserManager_allUsers.java (82%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/app/mixins/ApplicationUserManager_newDelegateUser.java (76%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/app/mixins/ApplicationUserManager_newLocalUser.java (81%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/app/mixins/ApplicationUserManager_newLocalUserAbstract.java (95%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/contributions/HasUsername_open.java (85%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/AccountType.java (96%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/ApplicationUser.java (93%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/ApplicationUser.layout.fallback.xml (100%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/ApplicationUserRepository.java (93%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/ApplicationUserRepositoryAbstract.java (92%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/ApplicationUserStatus.java (95%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/ApplicationUser_addRole.java (78%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/ApplicationUser_delete.java (80%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/ApplicationUser_duplicate.java (75%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/ApplicationUser_lock.java (76%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/ApplicationUser_removeRoles.java (79%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/ApplicationUser_resetPassword.java (82%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/ApplicationUser_unlock.java (78%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/ApplicationUser_updateAccountType.java (78%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/ApplicationUser_updateAtPath.java (81%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/ApplicationUser_updateEmailAddress.java (82%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/ApplicationUser_updateFaxNumber.java (82%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/ApplicationUser_updateName.java (87%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/ApplicationUser_updatePassword.java (85%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/ApplicationUser_updatePhoneNumber.java (82%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/ApplicationUser_updateUsername.java (81%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/perms/ApplicationUser_filterPermissions.java (91%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/perms/ApplicationUser_permissions.java (85%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/perms/UserPermissionViewModel.java (94%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/dom/mixins/perms/UserPermissionViewModel.layout.fallback.xml (100%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/events/UserCreatedEvent.java (89%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/fixtures/AbstractUserAndRolesFixtureScript.java (89%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/menu/ApplicationUserMenu.java (85%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/user/menu/MeService.java (86%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/secman => applib/src/main/java/org/apache/isis/extensions/secman/applib/user/seed}/IsisExtSecmanAdminUser.java (78%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api/encryption => applib/src/main/java/org/apache/isis/extensions/secman/applib/user/spi}/PasswordEncryptionService.java (95%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => applib/src/main/java/org/apache/isis/extensions/secman/applib}/util/RegexReplacer.java (94%)
rename extensions/security/secman/{model => integration}/pom.xml (91%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/IsisModuleExtSecmanModel.java => integration/src/main/java/org/apache/isis/extensions/secman/integration/IsisModuleExtSecmanIntegration.java} (61%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api => integration/src/main/java/org/apache/isis/extensions/secman/integration}/authorizor/AuthorizorSecman.java (89%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model => integration/src/main/java/org/apache/isis/extensions/secman/integration}/facets/TenantedAuthorizationFacet.java (95%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model => integration/src/main/java/org/apache/isis/extensions/secman/integration}/facets/TenantedAuthorizationFacetDefault.java (93%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model => integration/src/main/java/org/apache/isis/extensions/secman/integration}/facets/TenantedAuthorizationPostProcessor.java (95%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model => integration/src/main/java/org/apache/isis/extensions/secman/integration}/spiimpl/ImpersonateMenuAdvisorForSecman.java (82%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model => integration/src/main/java/org/apache/isis/extensions/secman/integration}/spiimpl/TableColumnVisibilityServiceForSecman.java (88%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model => integration/src/main/java/org/apache/isis/extensions/secman/integration}/userreg/UserRegistrationServiceForSecman.java (90%)
rename extensions/security/secman/{model => integration}/src/main/resources/images/ApplicationFeature.png (100%)
rename extensions/security/secman/{model => integration}/src/main/resources/images/ApplicationOrphanedPermissionManager.png (100%)
rename extensions/security/secman/{model => integration}/src/main/resources/images/ApplicationPassword.png (100%)
rename extensions/security/secman/{model => integration}/src/main/resources/images/ApplicationPermission.png (100%)
rename extensions/security/secman/{model => integration}/src/main/resources/images/ApplicationRole.png (100%)
rename extensions/security/secman/{model => integration}/src/main/resources/images/ApplicationTenancy.png (100%)
rename extensions/security/secman/{model => integration}/src/main/resources/images/ApplicationUser-locked.png (100%)
rename extensions/security/secman/{model => integration}/src/main/resources/images/ApplicationUser-unlocked.png (100%)
rename extensions/security/secman/{model => integration}/src/main/resources/images/ApplicationUserManager.png (100%)
rename extensions/security/secman/{model => integration}/src/main/resources/images/UserPermission.png (100%)
rename extensions/security/secman/{model => integration}/src/main/resources/images/zip/key_security.zip (100%)
rename extensions/security/secman/{model => integration}/src/main/resources/images/zip/outline_star.zip (100%)
rename extensions/security/secman/{model => integration}/src/main/resources/images/zip/question_shield.zip (100%)
rename extensions/security/secman/{model => integration}/src/main/resources/images/zip/theatre_masks.zip (100%)
rename extensions/security/secman/{model => integration}/src/main/resources/images/zip/user.zip (100%)
rename extensions/security/secman/{model => integration}/src/main/resources/images/zip/worldwide_location.zip (100%)
[isis] 01/01: Merge pull request #560 from apache/ISIS-2698
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 f7287608a9d5a7be429fb39dadc6f9b13411c677
Merge: 6ce03f0 12adb47
Author: Dan Haywood <da...@apache.org>
AuthorDate: Wed May 26 07:42:58 2021 +0100
Merge pull request #560 from apache/ISIS-2698
Isis 2698
.../index/secman/api/user/dom/ApplicationUser.adoc | 4 +-
.../manager/AuthorizationManager.java | 1 +
examples/demo/domain/pom.xml | 2 +-
.../main/java/demoapp/dom/DemoModuleCommon.java | 6 +-
.../ApplicationTenancyEvaluatorForDemo.java | 4 +-
examples/demo/pom.xml | 6 +-
.../java/demoapp/web/DemoAppManifestCommon.java | 4 +-
extensions/pom.xml | 2 +-
.../secman/api/IsisModuleExtSecmanApi.java | 179 --------------------
.../encryption/PasswordEncryptionServiceNone.java | 42 -----
extensions/security/secman/{api => applib}/pom.xml | 4 +-
.../secman/applib/IsisModuleExtSecmanApplib.java | 180 +++++++++++++++++++++
.../secman/applib}/SecmanConfiguration.java | 4 +-
.../feature/api/ApplicationFeatureChoices.java | 10 +-
.../ApplicationFeatureViewModel_permissions.java | 6 +-
.../app/ApplicationOrphanedPermissionManager.java | 12 +-
...OrphanedPermissionManager_relocateSelected.java | 12 +-
.../permission/dom/ApplicationPermission.java | 14 +-
.../dom/ApplicationPermission.layout.fallback.xml | 0
.../permission/dom/ApplicationPermissionMode.java | 2 +-
.../dom/ApplicationPermissionRepository.java | 6 +-
.../ApplicationPermissionRepositoryAbstract.java | 20 +--
.../permission/dom/ApplicationPermissionRule.java | 2 +-
.../permission/dom/ApplicationPermissionValue.java | 2 +-
.../dom/ApplicationPermissionValueSet.java | 12 +-
.../dom/mixins/ApplicationPermission_allow.java | 12 +-
.../dom/mixins/ApplicationPermission_changing.java | 12 +-
.../dom/mixins/ApplicationPermission_delete.java | 12 +-
.../dom/mixins/ApplicationPermission_feature.java | 8 +-
.../mixins/ApplicationPermission_updateRole.java | 14 +-
.../dom/mixins/ApplicationPermission_veto.java | 12 +-
.../dom/mixins/ApplicationPermission_viewing.java | 12 +-
.../permission/menu/ApplicationPermissionMenu.java | 18 +--
.../spi/PermissionsEvaluationService.java | 14 +-
.../spi/PermissionsEvaluationServiceAbstract.java | 8 +-
...PermissionsEvaluationServiceAllowBeatsVeto.java | 10 +-
...PermissionsEvaluationServiceVetoBeatsAllow.java | 12 +-
.../secman/applib}/role/dom/ApplicationRole.java | 20 +--
.../role/dom/ApplicationRole.layout.fallback.xml | 0
.../role/dom/ApplicationRoleRepository.java | 4 +-
.../dom/ApplicationRoleRepositoryAbstract.java | 10 +-
.../dom/mixins/ApplicationRole_addPermission.java | 20 +--
.../role/dom/mixins/ApplicationRole_addUser.java | 16 +-
.../role/dom/mixins/ApplicationRole_delete.java | 12 +-
.../mixins/ApplicationRole_removePermissions.java | 16 +-
.../dom/mixins/ApplicationRole_removeUsers.java | 16 +-
.../mixins/ApplicationRole_updateDescription.java | 10 +-
.../dom/mixins/ApplicationRole_updateName.java | 10 +-
.../AbstractRoleAndPermissionsFixtureScript.java | 10 +-
.../applib}/role/menu/ApplicationRoleMenu.java | 16 +-
.../seed}/IsisAppFeatureRoleAndPermissions.java | 11 +-
.../seed}/IsisConfigurationRoleAndPermissions.java | 9 +-
.../seed}/IsisExtH2ConsoleRoleAndPermissions.java | 8 +-
.../IsisExtSecmanAdminRoleAndPermissions.java | 11 +-
...IsisExtSecmanRegularUserRoleAndPermissions.java | 23 ++-
...sPersistenceJdoMetaModelRoleAndPermissions.java | 8 +-
.../IsisSudoImpersonateRoleAndPermissions.java | 8 +-
...werRestfulObjectsSwaggerRoleAndPermissions.java | 9 +-
.../applib}/seed/SeedSecurityModuleService.java | 4 +-
.../scripts/SeedUsersAndRolesFixtureScript.java | 24 +--
.../applib}/tenancy/dom/ApplicationTenancy.java | 14 +-
.../dom/ApplicationTenancy.layout.fallback.xml | 0
.../tenancy/dom/ApplicationTenancyRepository.java | 4 +-
.../dom/ApplicationTenancyRepositoryAbstract.java | 6 +-
.../secman/applib}/tenancy/dom/HasAtPath.java | 4 +-
.../dom/mixins/ApplicationTenancy_addChild.java | 12 +-
.../dom/mixins/ApplicationTenancy_addUser.java | 16 +-
.../dom/mixins/ApplicationTenancy_delete.java | 16 +-
.../dom/mixins/ApplicationTenancy_removeChild.java | 12 +-
.../dom/mixins/ApplicationTenancy_removeUser.java | 16 +-
.../dom/mixins/ApplicationTenancy_updateName.java | 10 +-
.../dom/mixins/ApplicationTenancy_users.java | 10 +-
.../fixtures/AbstractTenancyFixtureScript.java | 6 +-
.../tenancy/menu/ApplicationTenancyMenu.java | 16 +-
.../secman/applib/tenancy/seed}/GlobalTenancy.java | 4 +-
.../tenancy/spi/ApplicationTenancyEvaluator.java | 4 +-
.../secman/applib}/user/ApplicationUser.java | 0
.../applib}/user/app/ApplicationUserManager.java | 6 +-
.../app/ApplicationUserManager.layout.fallback.xml | 0
.../mixins/ApplicationUserManager_allUsers.java | 8 +-
.../ApplicationUserManager_newDelegateUser.java | 22 +--
.../ApplicationUserManager_newLocalUser.java | 24 +--
...pplicationUserManager_newLocalUserAbstract.java | 2 +-
.../user/contributions/HasUsername_open.java | 10 +-
.../secman/applib}/user/dom/AccountType.java | 2 +-
.../secman/applib}/user/dom/ApplicationUser.java | 34 ++--
.../user/dom/ApplicationUser.layout.fallback.xml | 0
.../user/dom/ApplicationUserRepository.java | 6 +-
.../dom/ApplicationUserRepositoryAbstract.java | 18 +--
.../applib}/user/dom/ApplicationUserStatus.java | 2 +-
.../user/dom/mixins/ApplicationUser_addRole.java | 14 +-
.../user/dom/mixins/ApplicationUser_delete.java | 12 +-
.../user/dom/mixins/ApplicationUser_duplicate.java | 18 +--
.../user/dom/mixins/ApplicationUser_lock.java | 16 +-
.../dom/mixins/ApplicationUser_removeRoles.java | 16 +-
.../dom/mixins/ApplicationUser_resetPassword.java | 12 +-
.../user/dom/mixins/ApplicationUser_unlock.java | 12 +-
.../mixins/ApplicationUser_updateAccountType.java | 14 +-
.../dom/mixins/ApplicationUser_updateAtPath.java | 10 +-
.../mixins/ApplicationUser_updateEmailAddress.java | 10 +-
.../mixins/ApplicationUser_updateFaxNumber.java | 10 +-
.../dom/mixins/ApplicationUser_updateName.java | 10 +-
.../dom/mixins/ApplicationUser_updatePassword.java | 14 +-
.../mixins/ApplicationUser_updatePhoneNumber.java | 10 +-
.../dom/mixins/ApplicationUser_updateUsername.java | 10 +-
.../perms/ApplicationUser_filterPermissions.java | 10 +-
.../mixins/perms/ApplicationUser_permissions.java | 8 +-
.../dom/mixins/perms/UserPermissionViewModel.java | 24 +--
.../UserPermissionViewModel.layout.fallback.xml | 0
.../applib}/user/events/UserCreatedEvent.java | 6 +-
.../AbstractUserAndRolesFixtureScript.java | 12 +-
.../applib}/user/menu/ApplicationUserMenu.java | 15 +-
.../secman/applib}/user/menu/MeService.java | 16 +-
.../applib/user/seed}/IsisExtSecmanAdminUser.java | 9 +-
.../user/spi}/PasswordEncryptionService.java | 2 +-
.../secman/applib}/util/RegexReplacer.java | 2 +-
.../security/secman/encryption-jbcrypt/pom.xml | 10 +-
.../PasswordEncryptionServiceUsingJBcrypt.java | 2 +-
.../security/secman/{model => integration}/pom.xml | 10 +-
.../IsisModuleExtSecmanIntegration.java} | 22 +--
.../integration}/authorizor/AuthorizorSecman.java | 8 +-
.../facets/TenantedAuthorizationFacet.java | 2 +-
.../facets/TenantedAuthorizationFacetDefault.java | 8 +-
.../facets/TenantedAuthorizationPostProcessor.java | 6 +-
.../spiimpl/ImpersonateMenuAdvisorForSecman.java | 12 +-
.../TableColumnVisibilityServiceForSecman.java | 6 +-
.../userreg/UserRegistrationServiceForSecman.java | 10 +-
.../main/resources/images/ApplicationFeature.png | Bin
.../ApplicationOrphanedPermissionManager.png | Bin
.../main/resources/images/ApplicationPassword.png | Bin
.../resources/images/ApplicationPermission.png | Bin
.../src/main/resources/images/ApplicationRole.png | Bin
.../main/resources/images/ApplicationTenancy.png | Bin
.../resources/images/ApplicationUser-locked.png | Bin
.../resources/images/ApplicationUser-unlocked.png | Bin
.../resources/images/ApplicationUserManager.png | Bin
.../src/main/resources/images/UserPermission.png | Bin
.../src/main/resources/images/zip/key_security.zip | Bin
.../src/main/resources/images/zip/outline_star.zip | Bin
.../main/resources/images/zip/question_shield.zip | Bin
.../main/resources/images/zip/theatre_masks.zip | Bin
.../src/main/resources/images/zip/user.zip | Bin
.../resources/images/zip/worldwide_location.zip | Bin
extensions/security/secman/persistence-jdo/pom.xml | 4 +-
.../jdo/IsisModuleExtSecmanPersistenceJdo.java | 4 +-
.../jdo/permission/dom/ApplicationPermission.java | 18 +--
.../dom/ApplicationPermissionRepository.java | 2 +-
.../secman/jdo/role/dom/ApplicationRole.java | 8 +-
.../jdo/role/dom/ApplicationRoleRepository.java | 2 +-
.../secman/jdo/tenancy/dom/ApplicationTenancy.java | 18 +--
.../tenancy/dom/ApplicationTenancyRepository.java | 2 +-
.../secman/jdo/user/dom/ApplicationUser.java | 29 ++--
.../jdo/user/dom/ApplicationUserRepository.java | 2 +-
.../extensions/secman/jdo/util/RegexReplacer.java | 2 +-
extensions/security/secman/persistence-jpa/pom.xml | 4 +-
.../jpa/IsisModuleExtSecmanPersistenceJpa.java | 4 +-
.../jpa/permission/dom/ApplicationPermission.java | 18 +--
.../dom/ApplicationPermissionRepository.java | 10 +-
.../secman/jpa/role/dom/ApplicationRole.java | 8 +-
.../jpa/role/dom/ApplicationRoleRepository.java | 2 +-
.../secman/jpa/tenancy/dom/ApplicationTenancy.java | 19 ++-
.../tenancy/dom/ApplicationTenancyRepository.java | 2 +-
.../secman/jpa/user/dom/ApplicationUser.java | 37 ++---
.../jpa/user/dom/ApplicationUserRepository.java | 2 +-
.../extensions/secman/jpa/util/RegexReplacer.java | 2 +-
extensions/security/secman/pom.xml | 12 +-
extensions/security/secman/shiro-realm/pom.xml | 8 +-
.../shiro/IsisModuleExtSecmanShiroRealm.java | 8 +-
.../secman/shiro/PermissionForMember.java | 2 +-
.../secman/shiro/PrincipalForApplicationUser.java | 10 +-
.../isis/testdomain/shiro/ShiroSecmanLdapTest.java | 4 +-
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 4 +-
.../isis/testdomain/shiro/ShiroSecmanTest.java | 16 +-
regressiontests/pom.xml | 2 +-
.../conf/Configuration_usingJdoAndShiro.java | 6 +-
.../isis/testdomain/jdo/JdoTestDomainPersona.java | 10 +-
.../isis/testdomain/jpa/JpaTestDomainPersona.java | 10 +-
177 files changed, 922 insertions(+), 996 deletions(-)