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/24 21:45:22 UTC
[isis] branch master updated (6727ce6 -> 6e02e7e)
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 6727ce6 ISIS-2665: associateWith on @Action has been deprecated
add 0f76a63 ISIS-2614: updates docs for secman
add fbe2ed5 ISIS-2614: sync'ing the layout.xml for jdo and jpa versions of secman entities
add 6017ac1 ISIS-2690: uses non-overloaded variant of ApplicationFeatureId
add 7c750b7 ISIS-2691: adds @MemberSupport to mixins.
add 45b3ccc ISIS-2614: adds docs for setting up schema for SecMan entities
add 29c8063 ISIS-2614: enhances the impersonate mixins so that they default the userame if the mixee implements HasUsername.
add ab6ee68 ISIS-2614: adds sudo and conf as default namespaces for secman admin
add dc72c02 ISIS-2614: vetoes viewing of their permissions for regular user
add d83a432 ISIS-2614: ApplicationUser is now an abstract class rather than an interface
add 7c5f742 ISIS-2691: adds missing import (from rebase)
add d93dbc5 ISIS-2614: moves ApplicationUser's layout up to superclass
add 1a82af0 ISIS-2692: renames ApplicationUserStatus enums (ENABLED -> UNLOCKED, DISABLED -> LOCKED)
add b3b6f69 ISIS-2614: converts api.ApplicationRole from interface to an abstract class
add e900d54 ISIS-2614: converts api.ApplicationPermission from interface to an abstract class
add 75f6f13 ISIS-2614: converts api.ApplicationTenancy from interface to an abstract class
add 66c99ca ISIS-2692: updates .png file names also for icons
add 96c4cbe ISIS-2614:FixtureScript now logs an error if it fails for any reason.
add 7f5016f ISIS-2672: moves appfeature vms from secman and into applib.
add 13ffdc5 ISIS-2609: PrincipalForApplicationUser now uses ApplicationUser#username rather than ApplocationUser#name
add 8ae0871 ISIS-2692: updates regression tests also
new 6e02e7e Merge pull request #556 from apache/ISIS-2614
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:
.../org/apache/isis/applib/IsisModuleApplib.java | 20 +-
.../mixins/layout/Object_downloadLayoutXml.java | 6 +-
.../metamodel/Object_downloadMetamodelXml.java | 3 +-
.../mixins/metamodel/Object_objectIdentifier.java | 3 +-
.../applib/mixins/metamodel/Object_objectType.java | 3 +-
.../services/appfeat/ApplicationFeatureId.java | 87 ++++----
.../services/appfeatui/ApplicationFeatureMenu.java | 29 ++-
.../appfeatui}/ApplicationFeatureViewModel.java | 40 +---
...ApplicationFeatureViewModel.layout.fallback.xml | 32 +--
.../services/appfeatui}/ApplicationNamespace.java | 10 +-
.../services/appfeatui}/ApplicationType.java | 9 +-
.../services/appfeatui}/ApplicationTypeAction.java | 9 +-
.../appfeatui}/ApplicationTypeCollection.java | 9 +-
.../services/appfeatui}/ApplicationTypeMember.java | 9 +-
.../appfeatui}/ApplicationTypeProperty.java | 14 +-
.../secman/adoc/modules/secman/pages/about.adoc | 40 ++--
.../adoc/modules/secman/pages/setting-up.adoc | 228 ++++++++++++++-------
.../secman/api/IsisModuleExtSecmanApi.java | 24 +--
.../extensions/secman/api/SecmanConfiguration.java | 23 ++-
.../{dom => api}/ApplicationFeatureChoices.java | 2 +-
.../ApplicationFeatureViewModel_permissions.java | 55 +++++
.../dom/ApplicationNamespace.layout.fallback.xml | 131 ------------
.../dom/ApplicationType.layout.fallback.xml | 131 ------------
.../dom/ApplicationTypeAction.layout.fallback.xml | 131 ------------
.../dom/ApplicationTypeMember.layout.fallback.xml | 131 ------------
.../ApplicationTypeProperty.layout.fallback.xml | 131 ------------
.../api/permission/dom/ApplicationPermission.java | 139 +++++++------
.../dom/ApplicationPermission.layout.fallback.xml | 0
.../dom/ApplicationPermissionRepository.java | 6 +
.../dom/ApplicationPermissionValueSet.java | 9 +-
.../dom/mixins/ApplicationPermission_feature.java | 2 +-
.../secman/api/role/dom/ApplicationRole.java | 98 ++++++---
.../role/dom/ApplicationRole.layout.fallback.xml | 0
.../dom/mixins/ApplicationRole_addPermission.java | 4 +-
.../secman/api/tenancy/dom/ApplicationTenancy.java | 84 ++++++--
.../dom/ApplicationTenancy.layout.fallback.xml | 0
.../ApplicationUserManager_newDelegateUser.java | 6 +-
.../ApplicationUserManager_newLocalUser.java | 6 +-
.../secman/api/user/dom/ApplicationUser.java | 218 ++++++++++++++------
.../user/dom/ApplicationUser.layout.fallback.xml | 0
.../dom/ApplicationUserRepositoryAbstract.java | 8 +-
.../secman/api/user/dom/ApplicationUserStatus.java | 14 +-
.../user/dom/mixins/ApplicationUser_duplicate.java | 4 +-
.../api/user/dom/mixins/ApplicationUser_lock.java | 6 +-
.../user/dom/mixins/ApplicationUser_unlock.java | 4 +-
.../perms/ApplicationUser_filterPermissions.java | 4 +-
.../dom/mixins/perms/UserPermissionViewModel.java | 2 +-
.../AbstractUserAndRolesFixtureScript.java | 4 +-
....java => IsisAppFeatureRoleAndPermissions.java} | 28 ++-
...IsisExtSecmanRegularUserRoleAndPermissions.java | 1 +
.../spiimpl/ImpersonateMenuAdvisorForSecman.java | 2 +-
...tyModuleAppUserRegistrationServiceAbstract.java | 2 +-
...ser-disabled.png => ApplicationUser-locked.png} | Bin
...er-enabled.png => ApplicationUser-unlocked.png} | Bin
.../jdo/permission/dom/ApplicationPermission.java | 50 +----
.../secman/jdo/role/dom/ApplicationRole.java | 55 +----
.../secman/jdo/tenancy/dom/ApplicationTenancy.java | 43 +---
.../secman/jdo/user/dom/ApplicationUser.java | 117 +----------
.../jpa/permission/dom/ApplicationPermission.java | 54 +----
.../dom/ApplicationPermission.layout.fallback.xml | 56 -----
.../secman/jpa/role/dom/ApplicationRole.java | 67 +-----
.../role/dom/ApplicationRole.layout.fallback.xml | 47 -----
.../secman/jpa/tenancy/dom/ApplicationTenancy.java | 49 +----
.../dom/ApplicationTenancy.layout.fallback.xml | 49 -----
.../secman/jpa/user/dom/ApplicationUser.java | 109 +---------
.../user/dom/ApplicationUser.layout.fallback.xml | 89 --------
.../shiro/IsisModuleExtSecmanShiroRealm.java | 8 +-
.../secman/shiro/PrincipalForApplicationUser.java | 6 +-
.../mixins/Persistable_datanucleusVersionLong.java | 5 +-
.../Persistable_datanucleusVersionTimestamp.java | 5 +-
.../isis/testdomain/jdo/JdoTestDomainPersona.java | 2 +-
.../isis/testdomain/jpa/JpaTestDomainPersona.java | 2 +-
.../applib/fixturescripts/FixtureScript.java | 12 +-
.../common/applib/mixins/Object_impersonate.java | 11 +-
.../applib/mixins/Object_impersonateWithRoles.java | 23 ++-
.../applib/mixins/Object_stopImpersonating.java | 5 +-
76 files changed, 940 insertions(+), 1885 deletions(-)
rename extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom/ApplicationFeatureViewModels.java => api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureMenu.java (88%)
rename {extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom => api/applib/src/main/java/org/apache/isis/applib/services/appfeatui}/ApplicationFeatureViewModel.java (89%)
rename extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom/ApplicationTypeCollection.layout.fallback.xml => api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureViewModel.layout.fallback.xml (93%)
rename {extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom => api/applib/src/main/java/org/apache/isis/applib/services/appfeatui}/ApplicationNamespace.java (90%)
rename {extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom => api/applib/src/main/java/org/apache/isis/applib/services/appfeatui}/ApplicationType.java (94%)
rename {extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom => api/applib/src/main/java/org/apache/isis/applib/services/appfeatui}/ApplicationTypeAction.java (93%)
rename {extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom => api/applib/src/main/java/org/apache/isis/applib/services/appfeatui}/ApplicationTypeCollection.java (93%)
rename {extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom => api/applib/src/main/java/org/apache/isis/applib/services/appfeatui}/ApplicationTypeMember.java (91%)
rename {extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom => api/applib/src/main/java/org/apache/isis/applib/services/appfeatui}/ApplicationTypeProperty.java (94%)
rename extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/{dom => api}/ApplicationFeatureChoices.java (98%)
create mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/contributions/ApplicationFeatureViewModel_permissions.java
delete mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom/ApplicationNamespace.layout.fallback.xml
delete mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom/ApplicationType.layout.fallback.xml
delete mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom/ApplicationTypeAction.layout.fallback.xml
delete mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom/ApplicationTypeMember.layout.fallback.xml
delete mode 100644 extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/feature/dom/ApplicationTypeProperty.layout.fallback.xml
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo => api/src/main/java/org/apache/isis/extensions/secman/api}/permission/dom/ApplicationPermission.layout.fallback.xml (100%)
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo => api/src/main/java/org/apache/isis/extensions/secman/api}/role/dom/ApplicationRole.layout.fallback.xml (100%)
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo => api/src/main/java/org/apache/isis/extensions/secman/api}/tenancy/dom/ApplicationTenancy.layout.fallback.xml (100%)
rename extensions/security/secman/{persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo => api/src/main/java/org/apache/isis/extensions/secman/api}/user/dom/ApplicationUser.layout.fallback.xml (100%)
copy extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/seed/scripts/other/{IsisConfigurationRoleAndPermissions.java => IsisAppFeatureRoleAndPermissions.java} (54%)
rename extensions/security/secman/model/src/main/resources/images/{ApplicationUser-disabled.png => ApplicationUser-locked.png} (100%)
rename extensions/security/secman/model/src/main/resources/images/{ApplicationUser-enabled.png => ApplicationUser-unlocked.png} (100%)
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/permission/dom/ApplicationPermission.layout.fallback.xml
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/role/dom/ApplicationRole.layout.fallback.xml
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.layout.fallback.xml
delete mode 100644 extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/user/dom/ApplicationUser.layout.fallback.xml
[isis] 01/01: Merge pull request #556 from apache/ISIS-2614
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 6e02e7e5e19a8d3d763f8e49dd3794e687af7365
Merge: 6727ce6 8ae0871
Author: Dan Haywood <da...@apache.org>
AuthorDate: Mon May 24 22:44:47 2021 +0100
Merge pull request #556 from apache/ISIS-2614
Isis 2614
.../org/apache/isis/applib/IsisModuleApplib.java | 20 +-
.../mixins/layout/Object_downloadLayoutXml.java | 6 +-
.../metamodel/Object_downloadMetamodelXml.java | 3 +-
.../mixins/metamodel/Object_objectIdentifier.java | 3 +-
.../applib/mixins/metamodel/Object_objectType.java | 3 +-
.../services/appfeat/ApplicationFeatureId.java | 87 ++++----
.../services/appfeatui/ApplicationFeatureMenu.java | 29 ++-
.../appfeatui}/ApplicationFeatureViewModel.java | 40 +---
...ApplicationFeatureViewModel.layout.fallback.xml | 32 +--
.../services/appfeatui}/ApplicationNamespace.java | 10 +-
.../services/appfeatui}/ApplicationType.java | 9 +-
.../services/appfeatui}/ApplicationTypeAction.java | 9 +-
.../appfeatui}/ApplicationTypeCollection.java | 9 +-
.../services/appfeatui}/ApplicationTypeMember.java | 9 +-
.../appfeatui}/ApplicationTypeProperty.java | 14 +-
.../secman/adoc/modules/secman/pages/about.adoc | 40 ++--
.../adoc/modules/secman/pages/setting-up.adoc | 228 ++++++++++++++-------
.../secman/api/IsisModuleExtSecmanApi.java | 24 +--
.../extensions/secman/api/SecmanConfiguration.java | 23 ++-
.../{dom => api}/ApplicationFeatureChoices.java | 2 +-
.../ApplicationFeatureViewModel_permissions.java | 55 +++++
.../dom/ApplicationNamespace.layout.fallback.xml | 131 ------------
.../dom/ApplicationType.layout.fallback.xml | 131 ------------
.../dom/ApplicationTypeAction.layout.fallback.xml | 131 ------------
.../dom/ApplicationTypeMember.layout.fallback.xml | 131 ------------
.../ApplicationTypeProperty.layout.fallback.xml | 131 ------------
.../api/permission/dom/ApplicationPermission.java | 139 +++++++------
.../dom/ApplicationPermission.layout.fallback.xml | 0
.../dom/ApplicationPermissionRepository.java | 6 +
.../dom/ApplicationPermissionValueSet.java | 9 +-
.../dom/mixins/ApplicationPermission_feature.java | 2 +-
.../secman/api/role/dom/ApplicationRole.java | 98 ++++++---
.../role/dom/ApplicationRole.layout.fallback.xml | 0
.../dom/mixins/ApplicationRole_addPermission.java | 4 +-
.../secman/api/tenancy/dom/ApplicationTenancy.java | 84 ++++++--
.../dom/ApplicationTenancy.layout.fallback.xml | 0
.../ApplicationUserManager_newDelegateUser.java | 6 +-
.../ApplicationUserManager_newLocalUser.java | 6 +-
.../secman/api/user/dom/ApplicationUser.java | 218 ++++++++++++++------
.../user/dom/ApplicationUser.layout.fallback.xml | 0
.../dom/ApplicationUserRepositoryAbstract.java | 8 +-
.../secman/api/user/dom/ApplicationUserStatus.java | 14 +-
.../user/dom/mixins/ApplicationUser_duplicate.java | 4 +-
.../api/user/dom/mixins/ApplicationUser_lock.java | 6 +-
.../user/dom/mixins/ApplicationUser_unlock.java | 4 +-
.../perms/ApplicationUser_filterPermissions.java | 4 +-
.../dom/mixins/perms/UserPermissionViewModel.java | 2 +-
.../AbstractUserAndRolesFixtureScript.java | 4 +-
.../other/IsisAppFeatureRoleAndPermissions.java | 67 ++++++
...IsisExtSecmanRegularUserRoleAndPermissions.java | 1 +
.../spiimpl/ImpersonateMenuAdvisorForSecman.java | 2 +-
...tyModuleAppUserRegistrationServiceAbstract.java | 2 +-
...ser-disabled.png => ApplicationUser-locked.png} | Bin
...er-enabled.png => ApplicationUser-unlocked.png} | Bin
.../jdo/permission/dom/ApplicationPermission.java | 50 +----
.../secman/jdo/role/dom/ApplicationRole.java | 55 +----
.../secman/jdo/tenancy/dom/ApplicationTenancy.java | 43 +---
.../secman/jdo/user/dom/ApplicationUser.java | 117 +----------
.../jpa/permission/dom/ApplicationPermission.java | 54 +----
.../dom/ApplicationPermission.layout.fallback.xml | 56 -----
.../secman/jpa/role/dom/ApplicationRole.java | 67 +-----
.../role/dom/ApplicationRole.layout.fallback.xml | 47 -----
.../secman/jpa/tenancy/dom/ApplicationTenancy.java | 49 +----
.../dom/ApplicationTenancy.layout.fallback.xml | 49 -----
.../secman/jpa/user/dom/ApplicationUser.java | 109 +---------
.../user/dom/ApplicationUser.layout.fallback.xml | 89 --------
.../shiro/IsisModuleExtSecmanShiroRealm.java | 8 +-
.../secman/shiro/PrincipalForApplicationUser.java | 6 +-
.../mixins/Persistable_datanucleusVersionLong.java | 5 +-
.../Persistable_datanucleusVersionTimestamp.java | 5 +-
.../isis/testdomain/jdo/JdoTestDomainPersona.java | 2 +-
.../isis/testdomain/jpa/JpaTestDomainPersona.java | 2 +-
.../applib/fixturescripts/FixtureScript.java | 12 +-
.../common/applib/mixins/Object_impersonate.java | 11 +-
.../applib/mixins/Object_impersonateWithRoles.java | 23 ++-
.../applib/mixins/Object_stopImpersonating.java | 5 +-
76 files changed, 987 insertions(+), 1877 deletions(-)