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/12 19:40:17 UTC
[isis] branch master updated (f9a1b26 -> a4143cb)
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 f9a1b26 ISIS-2666: make the ImpersonatedUserHolder... a request scoped component
add e62b2aa ISIS-2619: moves UserCreatedEvent to api.users package
add f8a83d7 ISIS-2619: moves most of ApplicationUser's mixins from model to api
add e5002ba ISIS-2619: moves ApplicationUser and related classes into subpackage
add 71336c2 ISIS-2619: moves ApplicationTenancy and related classes into subpackage
add 35bc4cb ISIS-2619: moves ApplicationRole and related classes into subpackage
add 1bbe162 ISIS-2619: moves ApplicationPermission and related classes into subpackage
add 7ee30f7 ISIS-2619: moves ApplicationPermission and related classes into subpackage
add 72435e9 ISIS-2619: moves some of ApplicationRole's mixins from model back to api.
add a3c1949 ISIS-2619: moves some of ApplicationPermission's mixins from model back to api.
add 669d56c ISIS-2619: moves ApplicationRoleMenu from model to api
add dba9cd4 ISIS-2619: moves ApplicationUserManager from model to api
add 657224b ISIS-2619: moves ApplicationUserManager from model to api (ctd)
add 87251e8 ISIS-2619: moves ApplicationUserManager's mixins to subpackage
add 90f8b09 ISIS-2619: moves ApplicationTenancy mixins from model to api
add 2928e26 ISIS-2619: moves ApplicationTenancy menu from model to api
add 34ac093 ISIS-2619: moves ApplicationOrphanedPermissionManager from model to api
add d6d7637 ISIS-2619: moves ApplicationPermissionMenu from model to api
add 41ba404 ISIS-2619: moves most of application feature package from model to api
add 72a2935 ISIS-2619: moves ApplicationFeatureChoices from model to api
add 16e5b95 ISIS-2619: converts ApplicationFeatureChoices into a service
add 9b18218 ISIS-2619: moves ApplicationRole mixins from model to api
add b179725 ISIS-2619: moves ApplicationRole mixins from model to api
add 9f88347 ISIS-2619: moves ApplicationUser mixins from model to api
add 55738ca ISIS-2619: moves ApplicationUserMenu from model to api
add 18ac944 ISIS-2619: moves ApplicationUser mixins from model to api (layout)
add 0a44ffe ISIS-2619: moves HasUsername_open contribution from model to api
add 34eb39f ISIS-2619: moves MeService from model to api
add 507dd6f ISIS-2619: renames impl of TableColumnVisibilityService for secman
add 8507a6a ISIS-2619: moves ApplicationPermission mixin from model to api
add f0f70e0 ISIS-2619: moves ApplicationOrphanedPermissionManager mixin from model to api
add 362cf3e ISIS-2619: moves ImpersonateMenuAdvisorForSecman to same spiimpl package as visibility service impl, is all.
add 64bd15d ISIS-2619: moves import statements of services etc from secman model module to secman api module
add 548fd45 ISIS-2619: moves named constants for ApplicationPermission from jpa to api
add a3a7017 ISIS-2619: moves named constants for ApplicationRol from jpa to api
add c8d6599 ISIS-2619: moves named constants for ApplicationTenancy from jpa to api
add b31f2b8 ISIS-2619: moves named constants for ApplicationUser from jpa to api
add 8667a7b ISIS-2619: removes empty class (used to contain named query constants)
add c2ece63 ISIS-2619: updates jdo and jpa ApplicationPermissionRepository's, remove unnecessary differences
add d2142e6 ISIS-2619: factors out ApplicationPermissionRepositoryAbstract for both jdo and jpa
add b819936 ISIS-2619: moves ApplicationPermissionRepositoryAbstract from jdo/jpa to api
add c3821a6 ISIS-2619: ungenericises ApplicationPermissionRepository
add ae301f2 ISIS-2619: factors out ApplicationRoleRepositoryAbstract, ungenericises ApplicationRoleRepository
add 6973563 ISIS-2619: factors out ApplicationRoleRepositoryAbstract, ungenericises ApplicationRoleRepository (ctd)
add 636897a ISIS-2619: fixes compile issues re: ungenericising ApplicationRoleRepository (ctd)
add 7914829 ISIS-2619: removing unnecessary differences between ApplicationTenancy impls, also the repository
add 2e04772 ISIS-2619: factors out ApplicationTenancyRepositoryAbstract
add f9fa561 ISIS-2619: moves mixins for ApplicationUserManager completely up to api (removes jdo and jpa subclasses)
add 365f3ce ISIS-2619: fixing up compile issues arising; removing unnecessary differences between some of the jdo/jpa seed fixture scripts
add 3f86d27 ISIS-2619: factors out ApplicationUserRepositoryAbstract
add 6e7a524 ISIS-2619: removing unnecessary differences in fixture seed script
add 9927dfa ISIS-2619: removing further unnecessary differences in jdo/jpa impls.
add e0513da ISIS-2619: removing references to genericised version of ApplicationUserRepository
add 258da26 ISIS-2619: moves fixture scripts from jdo/jpa to api; moves seed scripts from jdo/jpa to model
add 890c1ac ISIS-2619: moves SecurityModuleAppUserRegistrationServiceAbstract from jdo/jpa to model
add e96729f ISIS-2619: slight reorg of package structure of jpa/jdo, inline with api
add 77a6037 ISIS-2619: introduces RegexReplacer to standardize handling of regex expressions.
add 1b38299 ISIS-2619: moves domain event classes out to their mixins
add 422d8c2 ISIS-2619: moves domain event classes out to their mixins for ApplicationRole, and tidying up mixin annotations a little
add 24ae0b2 ISIS-2619: tidying up semantics for mixin classes
add 8e9559c ISIS-2619: introduces meta-annotations for ApplicationFeatureViewModel
add 0f6f0eb ISIS-2619: introduces meta-annotations for ApplicationType
add 1c0219e ISIS-2619: introduces meta-annotations for ApplicationTypeAction
add 64a9843 ISIS-2619: introduces meta-annotations for ApplicationTypeCollection
add 07e2ab7 ISIS-2619: introduces meta-annotations for ApplicationTypeMember and ApplicationTypeProperty
add 3f78b3a ISIS-2619: aligning api, jdo, jpa regions for subtypes vs interface
add 7f7a9e6 ISIS-2619: moves constants into meta-annotations
add 8e57da8 ISIS-2619: adds meta-annotations for ApplicationPermission
add 77c09d1 ISIS-2619: moves domain events from jdo/jpa to api, for ApplicationPermission
add c1e85cf ISIS-2619: moves domain events from jdo/jpa to api, for ApplicationRole
add a4c753c ISIS-2619: adds additional meta-annotations for ApplicationUser
add 0bc5c13 ISIS-2619: for ApplicationPermission, moves annotations on jdo/jpa entities up to meta-annotation on api
add 071de28 ISIS-2619: for ApplicationRole, moves annotations on jdo/jpa entities up to meta-annotation on api
add f7c4973 ISIS-2619: interfaces now implement Comparable, fix JPAQL syntax
add 6982eca ISIS-2619: removes use of lombok for ApplicationPermission, ApplicationRole
add 3042e3c ISIS-2619: removes use of lombok for ApplicationTenancy, promotes annotations to meta-annotations
add 13cc6a2 ISIS-2619: removes use of lombok for ApplicationUser, promotes annotations to meta-annotations
add 105966f ISIS-2619: adds missing attrib element
add cd3282b ISIS-2619: removes old version number from .asciidoctorconfig
add 72381e9 ISIS-2619: fixes some compile issues for regression tests
add 075be9f ISIS-2619: fixes for impersonate user, cleaning up of layouts
add 3ece158 ISIS-2619: fixes compile issue
new a4143cb Merge pull request #526 from apache/ISIS-2619
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:
.asciidoctorconfig | 2 +-
.../modules/fun/pages/overview/events.adoc | 2 +-
.../mixins/metamodel/Object_objectIdentifier.java | 20 +-
.../applib/mixins/metamodel/Object_objectType.java | 13 +-
.../isis/applib/services/user/ImpersonateMenu.java | 34 +-
.../apache/isis/applib/types/DescriptionType.java | 1 -
.../modules/config/pages/sections/isis.applib.adoc | 2 +-
.../main/java/demoapp/dom/DemoModuleCommon.java | 4 +-
.../src/main/java/demoapp/dom/menubars.layout.xml | 9 -
.../ApplicationTenancyEvaluatorForDemo.java | 4 +-
extensions/security/secman/api/pom.xml | 14 +-
.../secman/api/IsisModuleExtSecmanApi.java | 145 ++++++
.../secman/api/authorizor/AuthorizorSecman.java | 8 +-
.../feature/dom}/ApplicationFeatureChoices.java | 79 ++--
.../feature/dom}/ApplicationFeatureViewModel.java | 185 +++++---
.../feature/dom}/ApplicationFeatureViewModels.java | 12 +-
.../api/feature/dom}/ApplicationNamespace.java | 33 +-
.../dom/ApplicationNamespace.layout.fallback.xml | 131 ++++++
.../secman/api/feature/dom}/ApplicationType.java | 73 +--
.../dom/ApplicationType.layout.fallback.xml | 131 ++++++
.../api/feature/dom}/ApplicationTypeAction.java | 59 ++-
.../dom/ApplicationTypeAction.layout.fallback.xml | 131 ++++++
.../feature/dom}/ApplicationTypeCollection.java | 55 ++-
.../ApplicationTypeCollection.layout.fallback.xml | 131 ++++++
.../api/feature/dom}/ApplicationTypeMember.java | 32 +-
.../api/feature/dom}/ApplicationTypeProperty.java | 106 +++--
.../ApplicationTypeProperty.layout.fallback.xml | 131 ++++++
.../api/permission/ApplicationPermission.java | 184 --------
.../ApplicationPermission.layout.fallback.xml | 56 ---
.../app}/ApplicationOrphanedPermissionManager.java | 36 +-
...OrphanedPermissionManager_relocateSelected.java | 41 +-
.../api/permission/dom/ApplicationPermission.java | 334 +++++++++++++
.../{ => dom}/ApplicationPermissionMode.java | 2 +-
.../{ => dom}/ApplicationPermissionRepository.java | 38 +-
.../ApplicationPermissionRepositoryAbstract.java} | 114 ++---
.../{ => dom}/ApplicationPermissionRule.java | 2 +-
.../{ => dom}/ApplicationPermissionValue.java | 2 +-
.../{ => dom}/ApplicationPermissionValueSet.java | 5 +-
.../dom/mixins}/ApplicationPermission_allow.java | 24 +-
.../mixins}/ApplicationPermission_changing.java | 27 +-
.../dom/mixins}/ApplicationPermission_delete.java | 25 +-
.../dom/mixins}/ApplicationPermission_feature.java | 18 +-
.../mixins}/ApplicationPermission_updateRole.java | 35 +-
.../dom/mixins}/ApplicationPermission_veto.java | 25 +-
.../dom/mixins}/ApplicationPermission_viewing.java | 29 +-
.../menu}/ApplicationPermissionMenu.java | 9 +-
.../{ => spi}/PermissionsEvaluationService.java | 11 +-
.../PermissionsEvaluationServiceAbstract.java | 5 +-
...PermissionsEvaluationServiceAllowBeatsVeto.java | 9 +-
...PermissionsEvaluationServiceVetoBeatsAllow.java | 10 +-
.../secman/api/role/ApplicationRole.java | 66 ---
.../secman/api/role/dom/ApplicationRole.java | 173 +++++++
.../role/{ => dom}/ApplicationRoleRepository.java | 24 +-
.../dom/ApplicationRoleRepositoryAbstract.java} | 68 +--
.../dom/mixins}/ApplicationRole_addPermission.java | 59 ++-
.../role/dom/mixins}/ApplicationRole_addUser.java | 37 +-
.../role/dom/mixins}/ApplicationRole_delete.java | 33 +-
.../mixins}/ApplicationRole_removePermissions.java | 40 +-
.../dom/mixins}/ApplicationRole_removeUsers.java | 47 +-
.../mixins}/ApplicationRole_updateDescription.java | 38 +-
.../dom/mixins}/ApplicationRole_updateName.java | 32 +-
.../AbstractRoleAndPermissionsFixtureScript.java | 17 +-
.../secman/api/role/menu}/ApplicationRoleMenu.java | 21 +-
.../secman/api/tenancy/ApplicationTenancy.java | 60 ---
.../secman/api/tenancy/dom/ApplicationTenancy.java | 158 +++++++
.../{ => dom}/ApplicationTenancyRepository.java | 21 +-
.../dom/ApplicationTenancyRepositoryAbstract.java | 201 ++++++++
.../secman/api/tenancy/{ => dom}/HasAtPath.java | 14 +-
.../dom/mixins}/ApplicationTenancy_addChild.java | 31 +-
.../dom/mixins}/ApplicationTenancy_addUser.java | 37 +-
.../dom/mixins}/ApplicationTenancy_delete.java | 39 +-
.../mixins}/ApplicationTenancy_removeChild.java | 33 +-
.../dom/mixins}/ApplicationTenancy_removeUser.java | 42 +-
.../dom/mixins}/ApplicationTenancy_updateName.java | 29 +-
.../dom/mixins}/ApplicationTenancy_users.java | 26 +-
.../fixtures}/AbstractTenancyFixtureScript.java | 12 +-
.../api/tenancy/menu}/ApplicationTenancyMenu.java | 14 +-
.../{ => spi}/ApplicationTenancyEvaluator.java | 4 +-
.../secman/api/user/ApplicationUser.java | 127 -----
.../api/user/app}/ApplicationUserManager.java | 10 +-
.../ApplicationUserManager.layout.fallback.xml | 20 +-
.../mixins}/ApplicationUserManager_allUsers.java | 20 +-
.../ApplicationUserManager_newDelegateUser.java | 110 +++++
.../ApplicationUserManager_newLocalUser.java | 87 +++-
...plicationUserManager_newLocalUserAbstract.java} | 35 +-
.../api/user/contributions}/HasUsername_open.java | 10 +-
.../secman/api/user/{ => dom}/AccountType.java | 4 +-
.../secman/api/user/dom/ApplicationUser.java | 521 +++++++++++++++++++++
.../user/{ => dom}/ApplicationUserRepository.java | 39 +-
.../dom/ApplicationUserRepositoryAbstract.java} | 122 ++---
.../api/user/{ => dom}/ApplicationUserStatus.java | 2 +-
.../user/dom/mixins}/ApplicationUser_addRole.java | 32 +-
.../user/dom/mixins}/ApplicationUser_delete.java | 32 +-
.../dom/mixins}/ApplicationUser_duplicate.java | 46 +-
.../api/user/dom/mixins}/ApplicationUser_lock.java | 35 +-
.../dom/mixins}/ApplicationUser_removeRoles.java | 49 +-
.../dom/mixins}/ApplicationUser_resetPassword.java | 43 +-
.../user/dom/mixins}/ApplicationUser_unlock.java | 27 +-
.../mixins}/ApplicationUser_updateAccountType.java | 37 +-
.../dom/mixins}/ApplicationUser_updateAtPath.java | 28 +-
.../ApplicationUser_updateEmailAddress.java | 28 +-
.../mixins}/ApplicationUser_updateFaxNumber.java | 33 +-
.../dom/mixins}/ApplicationUser_updateName.java | 35 +-
.../mixins}/ApplicationUser_updatePassword.java | 46 +-
.../mixins}/ApplicationUser_updatePhoneNumber.java | 32 +-
.../mixins}/ApplicationUser_updateUsername.java | 29 +-
.../perms}/ApplicationUser_filterPermissions.java | 32 +-
.../mixins/perms}/ApplicationUser_permissions.java | 23 +-
.../dom/mixins/perms}/UserPermissionViewModel.java | 227 +++++----
.../UserPermissionViewModel.layout.fallback.xml} | 62 ++-
.../api/{ => user}/events/UserCreatedEvent.java | 6 +-
.../AbstractUserAndRolesFixtureScript.java | 34 +-
.../secman/api/user/menu}/ApplicationUserMenu.java | 27 +-
.../secman/api/user/menu}/MeService.java | 14 +-
.../extensions/secman/api/util/RegexReplacer.java} | 17 +-
.../secman/model/IsisModuleExtSecmanModel.java | 145 +-----
.../ApplicationTypeAction.layout.fallback.xml | 63 ---
.../ApplicationTypeCollection.layout.fallback.xml | 63 ---
.../ApplicationTypeProperty.layout.fallback.xml | 65 ---
.../tenancy/ApplicationTenancy_updateParent.java | 58 ---
.../ApplicationUserManager_newDelegateUser.java | 88 ----
.../user/ApplicationUserManager_newLocalUser.java | 99 ----
.../UserPermissionViewModel.layout.fallback.xml | 53 ---
.../facets/TenantedAuthorizationFacetDefault.java | 10 +-
.../facets/TenantedAuthorizationPostProcessor.java | 7 +-
.../model}/seed/SeedSecurityModuleService.java | 3 +-
.../secman/model}/seed/scripts/GlobalTenancy.java | 3 +-
...xtFixturesFixtureResultsRoleAndPermissions.java | 11 +-
.../IsisExtSecmanAdminRoleAndPermissions.java | 7 +-
.../seed/scripts/IsisExtSecmanAdminUser.java | 5 +-
.../IsisExtSecmanFixtureRoleAndPermissions.java | 9 +-
...IsisExtSecmanRegularUserRoleAndPermissions.java | 20 +-
.../scripts}/SeedUsersAndRolesFixtureScript.java | 13 +-
.../ImpersonateMenuAdvisorForSecman.java | 22 +-
... => TableColumnVisibilityServiceForSecman.java} | 10 +-
...tyModuleAppUserRegistrationServiceAbstract.java | 12 +-
.../jdo/IsisModuleExtSecmanPersistenceJdo.java | 31 +-
.../isis/extensions/secman/jdo/dom/package.jdo | 142 ------
.../jdo/dom/permission/ApplicationPermission.java | 306 ------------
.../ApplicationPermission.layout.fallback.xml | 56 ---
.../dom/tenancy/ApplicationTenancyRepository.java | 219 ---------
.../secman/jdo/dom/user/ApplicationUser.java | 452 ------------------
.../ApplicationUserManager_newDelegateUser.java | 73 ---
.../jdo/permission/dom/ApplicationPermission.java | 230 +++++++++
.../dom/ApplicationPermission.layout.fallback.xml} | 64 ++-
.../dom/ApplicationPermissionRepository.java} | 23 +-
.../{dom/role => role/dom}/ApplicationRole.java | 146 +++---
.../dom}/ApplicationRole.layout.fallback.xml | 40 +-
.../dom/ApplicationRoleRepository.java} | 22 +-
.../seed/scripts/AbstractTenancyFixtureScript.java | 53 ---
...xtFixturesFixtureResultsRoleAndPermissions.java | 47 --
.../IsisExtSecmanAdminRoleAndPermissions.java | 50 --
.../dom}/ApplicationTenancy.java | 164 +++----
.../dom}/ApplicationTenancy.layout.fallback.xml | 44 +-
.../tenancy/dom/ApplicationTenancyRepository.java | 22 +-
.../secman/jdo/user/dom/ApplicationUser.java | 416 ++++++++++++++++
.../user/dom}/ApplicationUser.layout.fallback.xml | 80 ++--
.../jdo/user/dom/ApplicationUserRepository.java | 24 +-
...tyModuleAppUserRegistrationServiceAbstract.java | 103 ----
.../extensions/secman/jdo/util/RegexReplacer.java} | 34 +-
.../jpa/IsisModuleExtSecmanPersistenceJpa.java | 48 +-
.../secman/jpa/dom/constants/NamedQueryNames.java | 41 --
.../jpa/dom/permission/ApplicationPermission.java | 320 -------------
.../ApplicationPermissionRepository.java | 357 --------------
.../jpa/dom/role/ApplicationRoleRepository.java | 174 -------
.../dom/tenancy/ApplicationTenancyRepository.java | 207 --------
.../secman/jpa/dom/user/ApplicationUser.java | 460 ------------------
.../dom/user/ApplicationUserManager_allUsers.java | 41 --
.../ApplicationUserManager_newDelegateUser.java | 73 ---
.../user/ApplicationUserManager_newLocalUser.java | 89 ----
.../jpa/dom/user/ApplicationUserRepository.java | 244 ----------
.../jpa/permission/dom/ApplicationPermission.java | 236 ++++++++++
.../dom}/ApplicationPermission.layout.fallback.xml | 0
.../dom/ApplicationPermissionRepository.java | 65 +++
.../{dom/role => role/dom}/ApplicationRole.java | 126 ++---
.../dom}/ApplicationRole.layout.fallback.xml | 0
.../jpa/role/dom/ApplicationRoleRepository.java | 22 +-
.../secman/jpa/seed/SeedSecurityModuleService.java | 67 ---
.../jpa/seed/SeedUsersAndRolesFixtureScript.java | 65 ---
.../AbstractRoleAndPermissionsFixtureScript.java | 90 ----
.../scripts/AbstractUserAndRolesFixtureScript.java | 119 -----
.../jpa/seed/scripts/IsisExtSecmanAdminUser.java | 39 --
.../IsisExtSecmanFixtureRoleAndPermissions.java | 46 --
...IsisExtSecmanRegularUserRoleAndPermissions.java | 87 ----
.../dom}/ApplicationTenancy.java | 146 +++---
.../dom}/ApplicationTenancy.layout.fallback.xml | 0
.../tenancy/dom/ApplicationTenancyRepository.java | 22 +-
.../secman/jpa/user/dom/ApplicationUser.java | 414 ++++++++++++++++
.../user/dom}/ApplicationUser.layout.fallback.xml | 10 +-
.../jpa/user/dom/ApplicationUserRepository.java} | 25 +-
.../extensions/secman/jpa/util/RegexReplacer.java} | 35 +-
.../shiro/IsisModuleExtSecmanShiroRealm.java | 10 +-
.../secman/shiro/PermissionForMember.java | 2 +-
.../secman/shiro/PrincipalForApplicationUser.java | 38 +-
.../snapshots/demo2_0_0/RESTFUL_DOMAIN_TYPES.kt | 6 +-
.../conf/Configuration_usingJdoAndShiro.java | 4 +-
.../isis/testdomain/jdo/JdoTestDomainPersona.java | 40 +-
.../isis/testdomain/jpa/JpaTestDomainPersona.java | 40 +-
.../applib/mixins/Object_impersonateWithRoles.java | 17 +-
199 files changed, 6349 insertions(+), 7128 deletions(-)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature => api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom}/ApplicationFeatureChoices.java (78%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature => api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom}/ApplicationFeatureViewModel.java (70%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature => api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom}/ApplicationFeatureViewModels.java (94%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature => api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom}/ApplicationNamespace.java (72%)
create mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom/ApplicationNamespace.layout.fallback.xml
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature => api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom}/ApplicationType.java (62%)
create mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom/ApplicationType.layout.fallback.xml
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature => api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom}/ApplicationTypeAction.java (61%)
create mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom/ApplicationTypeAction.layout.fallback.xml
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature => api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom}/ApplicationTypeCollection.java (58%)
create mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom/ApplicationTypeCollection.layout.fallback.xml
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature => api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom}/ApplicationTypeMember.java (73%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature => api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom}/ApplicationTypeProperty.java (57%)
create mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom/ApplicationTypeProperty.layout.fallback.xml
delete mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java
delete mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.layout.fallback.xml
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission => api/src/main/java/org/apache/isis/extensions/secman/api/permission/app}/ApplicationOrphanedPermissionManager.java (58%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission => api/src/main/java/org/apache/isis/extensions/secman/api/permission/app/mixins}/ApplicationOrphanedPermissionManager_relocateSelected.java (74%)
create mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/ApplicationPermission.java
rename extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/{ => dom}/ApplicationPermissionMode.java (97%)
rename extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/{ => dom}/ApplicationPermissionRepository.java (63%)
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java => api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/ApplicationPermissionRepositoryAbstract.java} (77%)
rename extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/{ => dom}/ApplicationPermissionRule.java (96%)
rename extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/{ => dom}/ApplicationPermissionValue.java (99%)
rename extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/{ => dom}/ApplicationPermissionValueSet.java (97%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission => api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins}/ApplicationPermission_allow.java (61%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission => api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins}/ApplicationPermission_changing.java (61%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission => api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins}/ApplicationPermission_delete.java (63%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission => api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins}/ApplicationPermission_feature.java (82%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission => api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins}/ApplicationPermission_updateRole.java (59%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission => api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins}/ApplicationPermission_veto.java (61%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission => api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins}/ApplicationPermission_viewing.java (61%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission => api/src/main/java/org/apache/isis/extensions/secman/api/permission/menu}/ApplicationPermissionMenu.java (88%)
rename extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/{ => spi}/PermissionsEvaluationService.java (73%)
rename extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/{ => spi}/PermissionsEvaluationServiceAbstract.java (87%)
rename extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/{ => spi}/PermissionsEvaluationServiceAllowBeatsVeto.java (79%)
rename extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/{ => spi}/PermissionsEvaluationServiceVetoBeatsAllow.java (79%)
delete mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/ApplicationRole.java
create mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/ApplicationRole.java
rename extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/{ => dom}/ApplicationRoleRepository.java (65%)
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleRepository.java => api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/ApplicationRoleRepositoryAbstract.java} (65%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/role => api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins}/ApplicationRole_addPermission.java (69%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/role => api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins}/ApplicationRole_addUser.java (64%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/role => api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins}/ApplicationRole_delete.java (64%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/role => api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins}/ApplicationRole_removePermissions.java (70%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/role => api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins}/ApplicationRole_removeUsers.java (65%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/role => api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins}/ApplicationRole_updateDescription.java (65%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/role => api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins}/ApplicationRole_updateName.java (63%)
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts => api/src/main/java/org/apache/isis/extensions/secman/api/role/fixtures}/AbstractRoleAndPermissionsFixtureScript.java (81%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/role => api/src/main/java/org/apache/isis/extensions/secman/api/role/menu}/ApplicationRoleMenu.java (82%)
delete mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/ApplicationTenancy.java
create mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/ApplicationTenancy.java
rename extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/{ => dom}/ApplicationTenancyRepository.java (66%)
create mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/ApplicationTenancyRepositoryAbstract.java
rename extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/{ => dom}/HasAtPath.java (90%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/tenancy => api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins}/ApplicationTenancy_addChild.java (61%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/tenancy => api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins}/ApplicationTenancy_addUser.java (63%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/tenancy => api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins}/ApplicationTenancy_delete.java (63%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/tenancy => api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins}/ApplicationTenancy_removeChild.java (66%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/tenancy => api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins}/ApplicationTenancy_removeUser.java (60%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/tenancy => api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins}/ApplicationTenancy_updateName.java (65%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/tenancy => api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins}/ApplicationTenancy_users.java (62%)
rename extensions/security/secman/{persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts => api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/fixtures}/AbstractTenancyFixtureScript.java (80%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/tenancy => api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/menu}/ApplicationTenancyMenu.java (89%)
rename extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/{ => spi}/ApplicationTenancyEvaluator.java (93%)
delete mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/ApplicationUser.java
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/app}/ApplicationUserManager.java (85%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/app}/ApplicationUserManager.layout.fallback.xml (93%)
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/app/mixins}/ApplicationUserManager_allUsers.java (70%)
create mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/app/mixins/ApplicationUserManager_newDelegateUser.java
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/app/mixins}/ApplicationUserManager_newLocalUser.java (50%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUserManager_allUsers.java => api/src/main/java/org/apache/isis/extensions/secman/api/user/app/mixins/ApplicationUserManager_newLocalUserAbstract.java} (56%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/contributions}/HasUsername_open.java (86%)
copy extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/{ => dom}/AccountType.java (94%)
create mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/ApplicationUser.java
rename extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/{ => dom}/ApplicationUserRepository.java (66%)
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserRepository.java => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/ApplicationUserRepositoryAbstract.java} (68%)
copy extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/{ => dom}/ApplicationUserStatus.java (96%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins}/ApplicationUser_addRole.java (66%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins}/ApplicationUser_delete.java (66%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins}/ApplicationUser_duplicate.java (61%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins}/ApplicationUser_lock.java (66%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins}/ApplicationUser_removeRoles.java (64%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins}/ApplicationUser_resetPassword.java (67%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins}/ApplicationUser_unlock.java (68%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins}/ApplicationUser_updateAccountType.java (62%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins}/ApplicationUser_updateAtPath.java (66%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins}/ApplicationUser_updateEmailAddress.java (67%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins}/ApplicationUser_updateFaxNumber.java (64%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins}/ApplicationUser_updateName.java (74%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins}/ApplicationUser_updatePassword.java (75%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins}/ApplicationUser_updatePhoneNumber.java (67%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins}/ApplicationUser_updateUsername.java (64%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/perms}/ApplicationUser_filterPermissions.java (82%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/perms}/ApplicationUser_permissions.java (75%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/perms}/UserPermissionViewModel.java (71%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationNamespace.layout.fallback.xml => api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/perms/UserPermissionViewModel.layout.fallback.xml} (50%)
rename extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/{ => user}/events/UserCreatedEvent.java (89%)
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts => api/src/main/java/org/apache/isis/extensions/secman/api/user/fixtures}/AbstractUserAndRolesFixtureScript.java (83%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/menu}/ApplicationUserMenu.java (93%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/user => api/src/main/java/org/apache/isis/extensions/secman/api/user/menu}/MeService.java (89%)
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationFeatureConstants.java => api/src/main/java/org/apache/isis/extensions/secman/api/util/RegexReplacer.java} (70%)
delete mode 100644 extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeAction.layout.fallback.xml
delete mode 100644 extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeCollection.layout.fallback.xml
delete mode 100644 extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeProperty.layout.fallback.xml
delete mode 100644 extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/tenancy/ApplicationTenancy_updateParent.java
delete mode 100644 extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUserManager_newDelegateUser.java
delete mode 100644 extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUserManager_newLocalUser.java
delete mode 100644 extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/UserPermissionViewModel.layout.fallback.xml
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo => model/src/main/java/org/apache/isis/extensions/secman/model}/seed/SeedSecurityModuleService.java (93%)
copy extensions/security/secman/{persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa => model/src/main/java/org/apache/isis/extensions/secman/model}/seed/scripts/GlobalTenancy.java (89%)
rename extensions/security/secman/{persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa => model/src/main/java/org/apache/isis/extensions/secman/model}/seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.java (80%)
rename extensions/security/secman/{persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa => model/src/main/java/org/apache/isis/extensions/secman/model}/seed/scripts/IsisExtSecmanAdminRoleAndPermissions.java (84%)
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo => model/src/main/java/org/apache/isis/extensions/secman/model}/seed/scripts/IsisExtSecmanAdminUser.java (86%)
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo => model/src/main/java/org/apache/isis/extensions/secman/model}/seed/scripts/IsisExtSecmanFixtureRoleAndPermissions.java (83%)
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo => model/src/main/java/org/apache/isis/extensions/secman/model}/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.java (88%)
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed => model/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts}/SeedUsersAndRolesFixtureScript.java (71%)
rename extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/{menu => spiimpl}/ImpersonateMenuAdvisorForSecman.java (73%)
rename extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/spiimpl/{TableColumnHidingService.java => TableColumnVisibilityServiceForSecman.java} (77%)
rename extensions/security/secman/{persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa => model/src/main/java/org/apache/isis/extensions/secman/model}/userreg/SecurityModuleAppUserRegistrationServiceAbstract.java (90%)
delete mode 100644 extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/package.jdo
delete mode 100644 extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java
delete mode 100644 extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.layout.fallback.xml
delete mode 100644 extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyRepository.java
delete mode 100644 extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
delete mode 100644 extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserManager_newDelegateUser.java
create mode 100644 extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/permission/dom/ApplicationPermission.java
rename extensions/security/secman/{model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationType.layout.fallback.xml => persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/permission/dom/ApplicationPermission.layout.fallback.xml} (50%)
rename extensions/security/secman/{persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/GlobalTenancy.java => persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/permission/dom/ApplicationPermissionRepository.java} (61%)
rename extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/{dom/role => role/dom}/ApplicationRole.java (53%)
rename extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/{dom/role => role/dom}/ApplicationRole.layout.fallback.xml (58%)
copy extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/{seed/scripts/GlobalTenancy.java => role/dom/ApplicationRoleRepository.java} (62%)
delete mode 100644 extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractTenancyFixtureScript.java
delete mode 100644 extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.java
delete mode 100644 extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisExtSecmanAdminRoleAndPermissions.java
rename extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/{dom/tenancy => tenancy/dom}/ApplicationTenancy.java (55%)
rename extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/{dom/tenancy => tenancy/dom}/ApplicationTenancy.layout.fallback.xml (58%)
copy api/applib/src/main/java/org/apache/isis/applib/types/DescriptionType.java => extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/tenancy/dom/ApplicationTenancyRepository.java (62%)
create mode 100644 extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/user/dom/ApplicationUser.java
rename extensions/security/secman/{persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user => persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/user/dom}/ApplicationUser.layout.fallback.xml (55%)
copy api/applib/src/main/java/org/apache/isis/applib/types/DescriptionType.java => extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/user/dom/ApplicationUserRepository.java (63%)
delete mode 100644 extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/userreg/SecurityModuleAppUserRegistrationServiceAbstract.java
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api/user/ApplicationUserStatus.java => persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/util/RegexReplacer.java} (57%)
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/constants/NamedQueryNames.java
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.java
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermissionRepository.java
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRoleRepository.java
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancyRepository.java
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUserManager_allUsers.java
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUserManager_newDelegateUser.java
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUserManager_newLocalUser.java
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUserRepository.java
create mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/permission/dom/ApplicationPermission.java
rename extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/{dom/permission => permission/dom}/ApplicationPermission.layout.fallback.xml (100%)
create mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository.java
rename extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/{dom/role => role/dom}/ApplicationRole.java (58%)
rename extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/{dom/role => role/dom}/ApplicationRole.layout.fallback.xml (100%)
copy api/applib/src/main/java/org/apache/isis/applib/types/DescriptionType.java => extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/role/dom/ApplicationRoleRepository.java (63%)
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedSecurityModuleService.java
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.java
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/AbstractUserAndRolesFixtureScript.java
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisExtSecmanAdminUser.java
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisExtSecmanFixtureRoleAndPermissions.java
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.java
rename extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/{dom/tenancy => tenancy/dom}/ApplicationTenancy.java (52%)
rename extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/{dom/tenancy => tenancy/dom}/ApplicationTenancy.layout.fallback.xml (100%)
copy api/applib/src/main/java/org/apache/isis/applib/types/DescriptionType.java => extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/tenancy/dom/ApplicationTenancyRepository.java (62%)
create mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/user/dom/ApplicationUser.java
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user => persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/user/dom}/ApplicationUser.layout.fallback.xml (91%)
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/GlobalTenancy.java => persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/user/dom/ApplicationUserRepository.java} (60%)
rename extensions/security/secman/{api/src/main/java/org/apache/isis/extensions/secman/api/user/AccountType.java => persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/util/RegexReplacer.java} (55%)
[isis] 01/01: Merge pull request #526 from apache/ISIS-2619
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 a4143cb700207da13632283e0ac2c534b2fe93e4
Merge: f9a1b26 3ece158
Author: Dan Haywood <da...@apache.org>
AuthorDate: Wed May 12 20:40:04 2021 +0100
Merge pull request #526 from apache/ISIS-2619
Isis 2619 : tidying up secman
.asciidoctorconfig | 2 +-
.../modules/fun/pages/overview/events.adoc | 2 +-
.../mixins/metamodel/Object_objectIdentifier.java | 20 +-
.../applib/mixins/metamodel/Object_objectType.java | 13 +-
.../isis/applib/services/user/ImpersonateMenu.java | 34 +-
.../apache/isis/applib/types/DescriptionType.java | 1 -
.../modules/config/pages/sections/isis.applib.adoc | 2 +-
.../main/java/demoapp/dom/DemoModuleCommon.java | 4 +-
.../src/main/java/demoapp/dom/menubars.layout.xml | 9 -
.../ApplicationTenancyEvaluatorForDemo.java | 4 +-
extensions/security/secman/api/pom.xml | 14 +-
.../secman/api/IsisModuleExtSecmanApi.java | 145 ++++++
.../secman/api/authorizor/AuthorizorSecman.java | 8 +-
.../feature/dom}/ApplicationFeatureChoices.java | 79 ++--
.../feature/dom}/ApplicationFeatureViewModel.java | 185 +++++---
.../feature/dom}/ApplicationFeatureViewModels.java | 12 +-
.../api/feature/dom}/ApplicationNamespace.java | 33 +-
.../dom/ApplicationNamespace.layout.fallback.xml | 131 ++++++
.../secman/api/feature/dom}/ApplicationType.java | 73 +--
.../dom/ApplicationType.layout.fallback.xml | 131 ++++++
.../api/feature/dom}/ApplicationTypeAction.java | 59 ++-
.../dom/ApplicationTypeAction.layout.fallback.xml | 131 ++++++
.../feature/dom}/ApplicationTypeCollection.java | 55 ++-
.../ApplicationTypeCollection.layout.fallback.xml | 131 ++++++
.../api/feature/dom}/ApplicationTypeMember.java | 32 +-
.../api/feature/dom}/ApplicationTypeProperty.java | 106 +++--
.../ApplicationTypeProperty.layout.fallback.xml | 131 ++++++
.../api/permission/ApplicationPermission.java | 184 --------
.../ApplicationPermission.layout.fallback.xml | 56 ---
.../app}/ApplicationOrphanedPermissionManager.java | 36 +-
...OrphanedPermissionManager_relocateSelected.java | 41 +-
.../api/permission/dom/ApplicationPermission.java | 334 +++++++++++++
.../{ => dom}/ApplicationPermissionMode.java | 2 +-
.../{ => dom}/ApplicationPermissionRepository.java | 38 +-
.../ApplicationPermissionRepositoryAbstract.java} | 114 ++---
.../{ => dom}/ApplicationPermissionRule.java | 2 +-
.../{ => dom}/ApplicationPermissionValue.java | 2 +-
.../{ => dom}/ApplicationPermissionValueSet.java | 5 +-
.../dom/mixins}/ApplicationPermission_allow.java | 24 +-
.../mixins}/ApplicationPermission_changing.java | 27 +-
.../dom/mixins}/ApplicationPermission_delete.java | 25 +-
.../dom/mixins}/ApplicationPermission_feature.java | 18 +-
.../mixins}/ApplicationPermission_updateRole.java | 35 +-
.../dom/mixins}/ApplicationPermission_veto.java | 25 +-
.../dom/mixins}/ApplicationPermission_viewing.java | 29 +-
.../menu}/ApplicationPermissionMenu.java | 9 +-
.../{ => spi}/PermissionsEvaluationService.java | 11 +-
.../PermissionsEvaluationServiceAbstract.java | 5 +-
...PermissionsEvaluationServiceAllowBeatsVeto.java | 9 +-
...PermissionsEvaluationServiceVetoBeatsAllow.java | 10 +-
.../secman/api/role/ApplicationRole.java | 66 ---
.../secman/api/role/dom/ApplicationRole.java | 173 +++++++
.../role/{ => dom}/ApplicationRoleRepository.java | 24 +-
.../dom/ApplicationRoleRepositoryAbstract.java} | 68 +--
.../dom/mixins}/ApplicationRole_addPermission.java | 59 ++-
.../role/dom/mixins}/ApplicationRole_addUser.java | 37 +-
.../role/dom/mixins}/ApplicationRole_delete.java | 33 +-
.../mixins}/ApplicationRole_removePermissions.java | 40 +-
.../dom/mixins}/ApplicationRole_removeUsers.java | 47 +-
.../mixins}/ApplicationRole_updateDescription.java | 38 +-
.../dom/mixins}/ApplicationRole_updateName.java | 32 +-
.../AbstractRoleAndPermissionsFixtureScript.java | 17 +-
.../secman/api/role/menu}/ApplicationRoleMenu.java | 21 +-
.../secman/api/tenancy/ApplicationTenancy.java | 60 ---
.../secman/api/tenancy/dom/ApplicationTenancy.java | 158 +++++++
.../{ => dom}/ApplicationTenancyRepository.java | 21 +-
.../dom/ApplicationTenancyRepositoryAbstract.java | 201 ++++++++
.../secman/api/tenancy/{ => dom}/HasAtPath.java | 14 +-
.../dom/mixins}/ApplicationTenancy_addChild.java | 31 +-
.../dom/mixins}/ApplicationTenancy_addUser.java | 37 +-
.../dom/mixins}/ApplicationTenancy_delete.java | 39 +-
.../mixins}/ApplicationTenancy_removeChild.java | 33 +-
.../dom/mixins}/ApplicationTenancy_removeUser.java | 42 +-
.../dom/mixins}/ApplicationTenancy_updateName.java | 29 +-
.../dom/mixins}/ApplicationTenancy_users.java | 26 +-
.../fixtures}/AbstractTenancyFixtureScript.java | 12 +-
.../api/tenancy/menu}/ApplicationTenancyMenu.java | 14 +-
.../{ => spi}/ApplicationTenancyEvaluator.java | 4 +-
.../secman/api/user/ApplicationUser.java | 127 -----
.../api/user/app}/ApplicationUserManager.java | 10 +-
.../ApplicationUserManager.layout.fallback.xml | 20 +-
.../mixins}/ApplicationUserManager_allUsers.java | 20 +-
.../ApplicationUserManager_newDelegateUser.java | 110 +++++
.../ApplicationUserManager_newLocalUser.java | 87 +++-
...plicationUserManager_newLocalUserAbstract.java} | 35 +-
.../api/user/contributions}/HasUsername_open.java | 10 +-
.../secman/api/user/{ => dom}/AccountType.java | 4 +-
.../secman/api/user/dom/ApplicationUser.java | 521 +++++++++++++++++++++
.../user/{ => dom}/ApplicationUserRepository.java | 39 +-
.../dom/ApplicationUserRepositoryAbstract.java} | 122 ++---
.../api/user/{ => dom}/ApplicationUserStatus.java | 2 +-
.../user/dom/mixins}/ApplicationUser_addRole.java | 32 +-
.../user/dom/mixins}/ApplicationUser_delete.java | 32 +-
.../dom/mixins}/ApplicationUser_duplicate.java | 46 +-
.../api/user/dom/mixins}/ApplicationUser_lock.java | 35 +-
.../dom/mixins}/ApplicationUser_removeRoles.java | 49 +-
.../dom/mixins}/ApplicationUser_resetPassword.java | 43 +-
.../user/dom/mixins}/ApplicationUser_unlock.java | 27 +-
.../mixins}/ApplicationUser_updateAccountType.java | 37 +-
.../dom/mixins}/ApplicationUser_updateAtPath.java | 28 +-
.../ApplicationUser_updateEmailAddress.java | 28 +-
.../mixins}/ApplicationUser_updateFaxNumber.java | 33 +-
.../dom/mixins}/ApplicationUser_updateName.java | 35 +-
.../mixins}/ApplicationUser_updatePassword.java | 46 +-
.../mixins}/ApplicationUser_updatePhoneNumber.java | 32 +-
.../mixins}/ApplicationUser_updateUsername.java | 29 +-
.../perms}/ApplicationUser_filterPermissions.java | 32 +-
.../mixins/perms}/ApplicationUser_permissions.java | 23 +-
.../dom/mixins/perms}/UserPermissionViewModel.java | 227 +++++----
.../UserPermissionViewModel.layout.fallback.xml} | 62 ++-
.../api/{ => user}/events/UserCreatedEvent.java | 6 +-
.../AbstractUserAndRolesFixtureScript.java | 34 +-
.../secman/api/user/menu}/ApplicationUserMenu.java | 27 +-
.../secman/api/user/menu}/MeService.java | 14 +-
.../extensions/secman/api/util/RegexReplacer.java} | 17 +-
.../secman/model/IsisModuleExtSecmanModel.java | 145 +-----
.../ApplicationTypeAction.layout.fallback.xml | 63 ---
.../ApplicationTypeCollection.layout.fallback.xml | 63 ---
.../ApplicationTypeProperty.layout.fallback.xml | 65 ---
.../tenancy/ApplicationTenancy_updateParent.java | 58 ---
.../ApplicationUserManager_newDelegateUser.java | 88 ----
.../user/ApplicationUserManager_newLocalUser.java | 99 ----
.../UserPermissionViewModel.layout.fallback.xml | 53 ---
.../facets/TenantedAuthorizationFacetDefault.java | 10 +-
.../facets/TenantedAuthorizationPostProcessor.java | 7 +-
.../model}/seed/SeedSecurityModuleService.java | 3 +-
.../secman/model}/seed/scripts/GlobalTenancy.java | 3 +-
...xtFixturesFixtureResultsRoleAndPermissions.java | 11 +-
.../IsisExtSecmanAdminRoleAndPermissions.java | 7 +-
.../seed/scripts/IsisExtSecmanAdminUser.java | 5 +-
.../IsisExtSecmanFixtureRoleAndPermissions.java | 9 +-
...IsisExtSecmanRegularUserRoleAndPermissions.java | 20 +-
.../scripts}/SeedUsersAndRolesFixtureScript.java | 13 +-
.../ImpersonateMenuAdvisorForSecman.java | 22 +-
... => TableColumnVisibilityServiceForSecman.java} | 10 +-
...tyModuleAppUserRegistrationServiceAbstract.java | 12 +-
.../jdo/IsisModuleExtSecmanPersistenceJdo.java | 31 +-
.../isis/extensions/secman/jdo/dom/package.jdo | 142 ------
.../jdo/dom/permission/ApplicationPermission.java | 306 ------------
.../ApplicationPermission.layout.fallback.xml | 56 ---
.../dom/tenancy/ApplicationTenancyRepository.java | 219 ---------
.../secman/jdo/dom/user/ApplicationUser.java | 452 ------------------
.../ApplicationUserManager_newDelegateUser.java | 73 ---
.../jdo/permission/dom/ApplicationPermission.java | 230 +++++++++
.../dom/ApplicationPermission.layout.fallback.xml} | 64 ++-
.../dom/ApplicationPermissionRepository.java} | 23 +-
.../{dom/role => role/dom}/ApplicationRole.java | 146 +++---
.../dom}/ApplicationRole.layout.fallback.xml | 40 +-
.../dom/ApplicationRoleRepository.java} | 22 +-
.../seed/scripts/AbstractTenancyFixtureScript.java | 53 ---
...xtFixturesFixtureResultsRoleAndPermissions.java | 47 --
.../IsisExtSecmanAdminRoleAndPermissions.java | 50 --
.../dom}/ApplicationTenancy.java | 164 +++----
.../dom}/ApplicationTenancy.layout.fallback.xml | 44 +-
.../tenancy/dom/ApplicationTenancyRepository.java | 22 +-
.../secman/jdo/user/dom/ApplicationUser.java | 416 ++++++++++++++++
.../user/dom}/ApplicationUser.layout.fallback.xml | 80 ++--
.../jdo/user/dom/ApplicationUserRepository.java | 24 +-
...tyModuleAppUserRegistrationServiceAbstract.java | 103 ----
.../extensions/secman/jdo/util/RegexReplacer.java} | 34 +-
.../jpa/IsisModuleExtSecmanPersistenceJpa.java | 48 +-
.../secman/jpa/dom/constants/NamedQueryNames.java | 41 --
.../jpa/dom/permission/ApplicationPermission.java | 320 -------------
.../ApplicationPermissionRepository.java | 357 --------------
.../jpa/dom/role/ApplicationRoleRepository.java | 174 -------
.../dom/tenancy/ApplicationTenancyRepository.java | 207 --------
.../secman/jpa/dom/user/ApplicationUser.java | 460 ------------------
.../dom/user/ApplicationUserManager_allUsers.java | 41 --
.../ApplicationUserManager_newDelegateUser.java | 73 ---
.../user/ApplicationUserManager_newLocalUser.java | 89 ----
.../jpa/dom/user/ApplicationUserRepository.java | 244 ----------
.../jpa/permission/dom/ApplicationPermission.java | 236 ++++++++++
.../dom}/ApplicationPermission.layout.fallback.xml | 0
.../dom/ApplicationPermissionRepository.java | 65 +++
.../{dom/role => role/dom}/ApplicationRole.java | 126 ++---
.../dom}/ApplicationRole.layout.fallback.xml | 0
.../jpa/role/dom/ApplicationRoleRepository.java | 22 +-
.../secman/jpa/seed/SeedSecurityModuleService.java | 67 ---
.../jpa/seed/SeedUsersAndRolesFixtureScript.java | 65 ---
.../AbstractRoleAndPermissionsFixtureScript.java | 90 ----
.../scripts/AbstractUserAndRolesFixtureScript.java | 119 -----
.../jpa/seed/scripts/IsisExtSecmanAdminUser.java | 39 --
.../IsisExtSecmanFixtureRoleAndPermissions.java | 46 --
...IsisExtSecmanRegularUserRoleAndPermissions.java | 87 ----
.../dom}/ApplicationTenancy.java | 146 +++---
.../dom}/ApplicationTenancy.layout.fallback.xml | 0
.../tenancy/dom/ApplicationTenancyRepository.java | 22 +-
.../secman/jpa/user/dom/ApplicationUser.java | 414 ++++++++++++++++
.../user/dom}/ApplicationUser.layout.fallback.xml | 10 +-
.../jpa/user/dom/ApplicationUserRepository.java} | 25 +-
.../extensions/secman/jpa/util/RegexReplacer.java} | 35 +-
.../shiro/IsisModuleExtSecmanShiroRealm.java | 10 +-
.../secman/shiro/PermissionForMember.java | 2 +-
.../secman/shiro/PrincipalForApplicationUser.java | 38 +-
.../snapshots/demo2_0_0/RESTFUL_DOMAIN_TYPES.kt | 6 +-
.../conf/Configuration_usingJdoAndShiro.java | 4 +-
.../isis/testdomain/jdo/JdoTestDomainPersona.java | 40 +-
.../isis/testdomain/jpa/JpaTestDomainPersona.java | 40 +-
.../applib/mixins/Object_impersonateWithRoles.java | 17 +-
199 files changed, 6349 insertions(+), 7128 deletions(-)