You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/26 15:10:06 UTC
[isis] branch master updated: ISIS-2431: rename
SecurityModuleConfig -> SecmanConfiguration
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 3aaf924 ISIS-2431: rename SecurityModuleConfig -> SecmanConfiguration
3aaf924 is described below
commit 3aaf924283c2e80ffbc6ec31549709bb0b99a43c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jan 26 16:09:51 2021 +0100
ISIS-2431: rename SecurityModuleConfig -> SecmanConfiguration
---
.../modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc | 10 ++++++++++
.../domain/src/main/java/demoapp/dom/DemoModule.java | 10 +++++-----
...ecurityModuleConfig.java => SecmanConfiguration.java} | 16 ++++++++--------
.../model/dom/role/ApplicationRole_removePermission.java | 8 ++++----
.../dom/role/ApplicationRole_removePermissions.java | 8 ++++----
.../secman/model/dom/user/ApplicationUserMenu.java | 4 ++--
.../secman/model/dom/user/ApplicationUser_lock.java | 4 ++--
.../secman/jdo/dom/role/ApplicationRoleRepository.java | 4 ++--
.../extensions/secman/jdo/dom/user/ApplicationUser.java | 4 ++--
.../secman/jdo/dom/user/ApplicationUserRepository.java | 4 ++--
.../secman/jdo/seed/SeedUsersAndRolesFixtureScript.java | 6 +++---
.../scripts/AbstractRoleAndPermissionsFixtureScript.java | 2 --
.../IsisModuleSecurityAdminRoleAndPermissions.java | 6 +++---
.../jdo/seed/scripts/IsisModuleSecurityAdminUser.java | 4 ++--
.../IsisModuleSecurityFixtureRoleAndPermissions.java | 4 ++--
.../IsisModuleSecurityRegularUserRoleAndPermissions.java | 4 ++--
.../secman/jpa/dom/role/ApplicationRoleRepository.java | 4 ++--
.../extensions/secman/jpa/dom/user/ApplicationUser.java | 4 ++--
.../secman/jpa/dom/user/ApplicationUserRepository.java | 4 ++--
.../secman/jpa/seed/SeedUsersAndRolesFixtureScript.java | 6 +++---
.../IsisModuleSecurityAdminRoleAndPermissions.java | 6 +++---
.../jpa/seed/scripts/IsisModuleSecurityAdminUser.java | 4 ++--
.../IsisModuleSecurityFixtureRoleAndPermissions.java | 4 ++--
.../IsisModuleSecurityRegularUserRoleAndPermissions.java | 4 ++--
.../secman/shiro/IsisModuleExtSecmanShiroRealm.java | 4 ++--
.../isis/testdomain/shiro/ShiroSecmanLdapTest.java | 4 ++--
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 4 ++--
.../apache/isis/testdomain/shiro/ShiroSecmanTest.java | 4 ++--
.../testdomain/conf/Configuration_usingJdoAndShiro.java | 6 +++---
.../apache/isis/testdomain/jdo/JdoTestDomainPersona.java | 4 ++--
.../apache/isis/testdomain/jpa/JpaTestDomainPersona.java | 4 ++--
31 files changed, 86 insertions(+), 78 deletions(-)
diff --git a/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc
index 8b153bb..55ca15c 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc
@@ -308,5 +308,15 @@ WARNING: check menubars.layout.xml for any occurrences
| isis-module-security-admin
| secman-admin
+| Class
+| SecurityModuleConfig
+| SecmanConfiguration
+
+| Option
+| SecurityModuleConfig#adminAdditionalPackagePermission
+| SecmanConfiguration#adminAdditionalNamespacePermission
+
+
+
|===
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/DemoModule.java b/examples/demo/domain/src/main/java/demoapp/dom/DemoModule.java
index 7dec588..2930402 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/DemoModule.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/DemoModule.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.extensions.commandlog.impl.IsisModuleExtCommandLogImpl;
import org.apache.isis.extensions.modelannotation.metamodel.IsisModuleExtModelAnnotation;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationServiceAllowBeatsVeto;
import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoDatanucleus;
@@ -61,11 +61,11 @@ import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
public class DemoModule {
@Bean
- public SecurityModuleConfig securityModuleConfigBean() {
- return SecurityModuleConfig.builder()
+ public SecmanConfiguration securityModuleConfigBean() {
+ return SecmanConfiguration.builder()
.adminUserName("sven")
- .adminAdditionalPackagePermission("demoapp")
- .adminAdditionalPackagePermission("org.apache.isis")
+ .adminAdditionalNamespacePermission("demoapp")
+ .adminAdditionalNamespacePermission("org.apache.isis")
.build();
}
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityModuleConfig.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecmanConfiguration.java
similarity index 82%
rename from extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityModuleConfig.java
rename to extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecmanConfiguration.java
index 54971ad..59cb7aa 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecurityModuleConfig.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/SecmanConfiguration.java
@@ -29,7 +29,7 @@ import lombok.NonNull;
import lombok.Singular;
@Builder
-public class SecurityModuleConfig {
+public class SecmanConfiguration {
// -- ROLES
@@ -54,12 +54,12 @@ public class SecurityModuleConfig {
* cannot be removed via user interface
*/
@Getter @Builder.Default @NonNull
- final String[] adminStickyPackagePermissions = new String[]{
+ final String[] adminStickyNamespacePermissions = new String[]{
"secman"
};
@Getter @Singular
- final Set<String> adminAdditionalPackagePermissions;
+ final Set<String> adminAdditionalNamespacePermissions;
/**
* Delegated users, on first successful logon, are auto-created but disabled (by default).
@@ -75,14 +75,14 @@ public class SecurityModuleConfig {
// -- UTILITIES
- public Stream<String> streamAdminPackagePermissions() {
+ public Stream<String> streamAdminNamespacePermissions() {
return Stream.concat(
- _NullSafe.stream(adminStickyPackagePermissions),
- _NullSafe.stream(adminAdditionalPackagePermissions));
+ _NullSafe.stream(adminStickyNamespacePermissions),
+ _NullSafe.stream(adminAdditionalNamespacePermissions));
}
- public boolean isStickyAdminPackage(String featureFqn) {
- return _NullSafe.stream(adminStickyPackagePermissions)
+ public boolean isStickyAdminNamespace(String featureFqn) {
+ return _NullSafe.stream(adminStickyNamespacePermissions)
.anyMatch(stickyPackage->stickyPackage.equals(featureFqn));
}
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_removePermission.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_removePermission.java
index e430bb4..e5a27b2 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_removePermission.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_removePermission.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeature;
import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureType;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermission;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRepository;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRule;
@@ -46,7 +46,7 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public class ApplicationRole_removePermission {
- @Inject private SecurityModuleConfig configBean;
+ @Inject private SecmanConfiguration configBean;
@Inject private RepositoryService repository;
@Inject private ApplicationRoleRepository<? extends ApplicationRole> applicationRoleRepository;
@Inject private ApplicationPermissionRepository<? extends ApplicationPermission> applicationPermissionRepository;
@@ -80,8 +80,8 @@ public class ApplicationRole_removePermission {
@ParameterLayout(named="Feature", typicalLength=ApplicationFeature.TYPICAL_LENGTH_MEMBER_NAME)
final String featureFqn) {
if(applicationRoleRepository.isAdminRole(holder)
- && configBean.isStickyAdminPackage(featureFqn)) {
- return "Cannot remove top-level package permissions for the admin role.";
+ && configBean.isStickyAdminNamespace(featureFqn)) {
+ return "Cannot remove top-level namespace permissions for the admin role.";
}
return null;
}
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_removePermissions.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_removePermissions.java
index 4a38a64..82d3da1 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_removePermissions.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_removePermissions.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermission;
import org.apache.isis.extensions.secman.api.role.ApplicationRole;
import org.apache.isis.extensions.secman.api.role.ApplicationRole.RemovePermissionDomainEvent;
@@ -47,7 +47,7 @@ import lombok.RequiredArgsConstructor;
public class ApplicationRole_removePermissions {
@Inject private MessageService messageService;
- @Inject private SecurityModuleConfig configBean;
+ @Inject private SecmanConfiguration configBean;
@Inject private RepositoryService repository;
@Inject private ApplicationRoleRepository<? extends ApplicationRole> applicationRoleRepository;
@@ -68,9 +68,9 @@ public class ApplicationRole_removePermissions {
return false;
}
if(applicationRoleRepository.isAdminRole(holder)
- && configBean.isStickyAdminPackage(permission.getFeatureFqn())) {
+ && configBean.isStickyAdminNamespace(permission.getFeatureFqn())) {
- messageService.warnUser("Cannot remove top-level package permissions for the admin role.");
+ messageService.warnUser("Cannot remove top-level namespace permissions for the admin role.");
return false;
}
return true;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUserMenu.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUserMenu.java
index c637b80..453ea2c 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUserMenu.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUserMenu.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.value.Password;
import org.apache.isis.extensions.secman.api.IsisModuleExtSecmanApi;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.SecurityRealmCharacteristic;
import org.apache.isis.extensions.secman.api.SecurityRealmService;
import org.apache.isis.extensions.secman.api.role.ApplicationRole;
@@ -54,7 +54,7 @@ import lombok.val;
)
public class ApplicationUserMenu {
- @Inject private SecurityModuleConfig configBean;
+ @Inject private SecmanConfiguration configBean;
@Inject private ApplicationRoleRepository<? extends ApplicationRole> applicationRoleRepository;
@Inject private ApplicationUserRepository<? extends ApplicationUser> applicationUserRepository;
@Inject private SecurityRealmService securityRealmService;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_lock.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_lock.java
index 1174582..55cd9df 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_lock.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_lock.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.user.ApplicationUser;
import org.apache.isis.extensions.secman.api.user.ApplicationUser.LockDomainEvent;
import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
@@ -40,7 +40,7 @@ import lombok.RequiredArgsConstructor;
public class ApplicationUser_lock {
@Inject private ApplicationUserRepository<? extends ApplicationUser> applicationUserRepository;
- @Inject private SecurityModuleConfig configBean;
+ @Inject private SecmanConfiguration configBean;
private final ApplicationUser holder;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleRepository.java
index f1911f0..4cbbcd0 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleRepository.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRoleRepository.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.jdo.dom.user.ApplicationUser;
import org.apache.isis.extensions.secman.model.dom.permission.ApplicationPermission_delete;
@@ -47,7 +47,7 @@ implements org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository<
@Inject private FactoryService factoryService;
@Inject private RepositoryService repository;
- @Inject private SecurityModuleConfig configBean;
+ @Inject private SecmanConfiguration configBean;
@Inject private javax.inject.Provider<QueryResultsCache> queryResultsCacheProvider;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
index 8a1d696..42f12ec 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
@@ -48,7 +48,7 @@ import org.apache.isis.applib.util.ObjectContracts.ObjectContract;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureId;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionValueSet;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
@@ -137,7 +137,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
* implementation.
*/
@Inject private PermissionsEvaluationService permissionsEvaluationService;
- @Inject private SecurityModuleConfig configBean;
+ @Inject private SecmanConfiguration configBean;
// -- name (derived property)
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserRepository.java
index e98e074..c44acf3 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserRepository.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUserRepository.java
@@ -39,7 +39,7 @@ import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.encryption.PasswordEncryptionService;
import org.apache.isis.extensions.secman.api.events.UserCreatedEvent;
import org.apache.isis.extensions.secman.api.user.AccountType;
@@ -58,7 +58,7 @@ implements org.apache.isis.extensions.secman.api.user.ApplicationUserRepository<
@Inject private FactoryService factoryService;
@Inject private RepositoryService repository;
- @Inject private SecurityModuleConfig configBean;
+ @Inject private SecmanConfiguration configBean;
@Inject private Optional<PasswordEncryptionService> passwordEncryptionService; // empty if no candidate is available
@Inject protected IsisConfiguration isisConfiguration;
@Inject private EventBusService eventBusService;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java
index f592e20..d249c15 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java
@@ -20,14 +20,14 @@ package org.apache.isis.extensions.secman.jdo.seed;
import javax.inject.Inject;
-import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.jdo.seed.scripts.GlobalTenancy;
import org.apache.isis.extensions.secman.jdo.seed.scripts.IsisExtFixturesFixtureResultsRoleAndPermissions;
import org.apache.isis.extensions.secman.jdo.seed.scripts.IsisModuleSecurityAdminRoleAndPermissions;
import org.apache.isis.extensions.secman.jdo.seed.scripts.IsisModuleSecurityAdminUser;
import org.apache.isis.extensions.secman.jdo.seed.scripts.IsisModuleSecurityFixtureRoleAndPermissions;
import org.apache.isis.extensions.secman.jdo.seed.scripts.IsisModuleSecurityRegularUserRoleAndPermissions;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
/**
* This fixture script will be run automatically on start-up by virtue of the fact that the
@@ -38,7 +38,7 @@ import org.apache.isis.extensions.secman.jdo.seed.scripts.IsisModuleSecurityRegu
*/
public class SeedUsersAndRolesFixtureScript extends FixtureScript {
- @Inject private SecurityModuleConfig configBean;
+ @Inject private SecmanConfiguration configBean;
@Override
protected void execute(ExecutionContext executionContext) {
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
index dcf4f51..f84485c 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
@@ -96,8 +96,6 @@ public abstract class AbstractRoleAndPermissionsFixtureScript extends FixtureScr
}
-
-
// -- helpers
private void newPermissions(
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityAdminRoleAndPermissions.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityAdminRoleAndPermissions.java
index 7562a38..24233d6 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityAdminRoleAndPermissions.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityAdminRoleAndPermissions.java
@@ -19,7 +19,7 @@
package org.apache.isis.extensions.secman.jdo.seed.scripts;
import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRule;
@@ -27,9 +27,9 @@ public class IsisModuleSecurityAdminRoleAndPermissions extends AbstractRoleAndPe
private String[] adminInitialPackagePermissions;
- public IsisModuleSecurityAdminRoleAndPermissions(SecurityModuleConfig configBean) {
+ public IsisModuleSecurityAdminRoleAndPermissions(SecmanConfiguration configBean) {
super(configBean.getAdminRoleName(), "Administer security");
- this.adminInitialPackagePermissions = configBean.streamAdminPackagePermissions()
+ this.adminInitialPackagePermissions = configBean.streamAdminNamespacePermissions()
.collect(_Arrays.toArray(String.class));
}
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityAdminUser.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityAdminUser.java
index 3136aad..02ff79e 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityAdminUser.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityAdminUser.java
@@ -20,12 +20,12 @@ package org.apache.isis.extensions.secman.jdo.seed.scripts;
import java.util.Arrays;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.user.AccountType;
public class IsisModuleSecurityAdminUser extends AbstractUserAndRolesFixtureScript {
- public IsisModuleSecurityAdminUser(SecurityModuleConfig configBean) {
+ public IsisModuleSecurityAdminUser(SecmanConfiguration configBean) {
super(
configBean.getAdminUserName(),
configBean.getAdminPassword(),
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java
index c2b6cd6..d71b7a5 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.extensions.secman.jdo.seed.scripts;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRule;
@@ -27,7 +27,7 @@ import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRul
*/
public class IsisModuleSecurityFixtureRoleAndPermissions extends AbstractRoleAndPermissionsFixtureScript {
- public IsisModuleSecurityFixtureRoleAndPermissions(SecurityModuleConfig configBean) {
+ public IsisModuleSecurityFixtureRoleAndPermissions(SecmanConfiguration configBean) {
super(configBean.getFixtureRoleName(), "Security module fixtures");
}
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityRegularUserRoleAndPermissions.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityRegularUserRoleAndPermissions.java
index f0d4867..eb59567 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityRegularUserRoleAndPermissions.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityRegularUserRoleAndPermissions.java
@@ -19,7 +19,7 @@
package org.apache.isis.extensions.secman.jdo.seed.scripts;
import org.apache.isis.core.security.authentication.logout.LogoutMenu;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRule;
import org.apache.isis.extensions.secman.jdo.dom.role.ApplicationRole;
@@ -32,7 +32,7 @@ import org.apache.isis.extensions.secman.model.app.user.MeService;
*/
public class IsisModuleSecurityRegularUserRoleAndPermissions extends AbstractRoleAndPermissionsFixtureScript {
- public IsisModuleSecurityRegularUserRoleAndPermissions(SecurityModuleConfig configBean) {
+ public IsisModuleSecurityRegularUserRoleAndPermissions(SecmanConfiguration configBean) {
super(configBean.getRegularUserRoleName(), "Regular user of the security module");
}
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRoleRepository.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRoleRepository.java
index 35f3c5a..5643248 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRoleRepository.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRoleRepository.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.jpa.dom.constants.NamedQueryNames;
import org.apache.isis.extensions.secman.jpa.dom.user.ApplicationUser;
import org.apache.isis.extensions.secman.model.dom.permission.ApplicationPermission_delete;
@@ -48,7 +48,7 @@ implements org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository<
@Inject private FactoryService factoryService;
@Inject private RepositoryService repository;
- @Inject private SecurityModuleConfig configBean;
+ @Inject private SecmanConfiguration configBean;
@Inject private javax.inject.Provider<QueryResultsCache> queryResultsCacheProvider;
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java
index 33156c8..ca7a7ed 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java
@@ -55,7 +55,7 @@ import org.apache.isis.applib.util.ObjectContracts.ObjectContract;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureId;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionValueSet;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
@@ -127,7 +127,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
* implementation.
*/
@Inject private transient PermissionsEvaluationService permissionsEvaluationService;
- @Inject private transient SecurityModuleConfig configBean;
+ @Inject private transient SecmanConfiguration configBean;
@Id
@GeneratedValue
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUserRepository.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUserRepository.java
index 67a81f6..d653ac8 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUserRepository.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUserRepository.java
@@ -39,7 +39,7 @@ import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.encryption.PasswordEncryptionService;
import org.apache.isis.extensions.secman.api.events.UserCreatedEvent;
import org.apache.isis.extensions.secman.api.user.AccountType;
@@ -59,7 +59,7 @@ implements org.apache.isis.extensions.secman.api.user.ApplicationUserRepository<
@Inject private FactoryService factoryService;
@Inject private RepositoryService repository;
- @Inject private SecurityModuleConfig configBean;
+ @Inject private SecmanConfiguration configBean;
@Inject private Optional<PasswordEncryptionService> passwordEncryptionService; // empty if no candidate is available
@Inject protected IsisConfiguration isisConfiguration;
@Inject private EventBusService eventBusService;
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.java
index 9f601fb..f85a35d 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.java
@@ -20,14 +20,14 @@ package org.apache.isis.extensions.secman.jpa.seed;
import javax.inject.Inject;
-import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.jpa.seed.scripts.GlobalTenancy;
import org.apache.isis.extensions.secman.jpa.seed.scripts.IsisExtFixturesFixtureResultsRoleAndPermissions;
import org.apache.isis.extensions.secman.jpa.seed.scripts.IsisModuleSecurityAdminRoleAndPermissions;
import org.apache.isis.extensions.secman.jpa.seed.scripts.IsisModuleSecurityAdminUser;
import org.apache.isis.extensions.secman.jpa.seed.scripts.IsisModuleSecurityFixtureRoleAndPermissions;
import org.apache.isis.extensions.secman.jpa.seed.scripts.IsisModuleSecurityRegularUserRoleAndPermissions;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
/**
* This fixture script will be run automatically on start-up by virtue of the fact that the
@@ -38,7 +38,7 @@ import org.apache.isis.extensions.secman.jpa.seed.scripts.IsisModuleSecurityRegu
*/
public class SeedUsersAndRolesFixtureScript extends FixtureScript {
- @Inject private SecurityModuleConfig configBean;
+ @Inject private SecmanConfiguration configBean;
@Override
protected void execute(ExecutionContext executionContext) {
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisModuleSecurityAdminRoleAndPermissions.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisModuleSecurityAdminRoleAndPermissions.java
index 1acfd50..4b9b3a2 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisModuleSecurityAdminRoleAndPermissions.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisModuleSecurityAdminRoleAndPermissions.java
@@ -19,7 +19,7 @@
package org.apache.isis.extensions.secman.jpa.seed.scripts;
import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRule;
@@ -27,9 +27,9 @@ public class IsisModuleSecurityAdminRoleAndPermissions extends AbstractRoleAndPe
private String[] adminInitialPackagePermissions;
- public IsisModuleSecurityAdminRoleAndPermissions(SecurityModuleConfig configBean) {
+ public IsisModuleSecurityAdminRoleAndPermissions(SecmanConfiguration configBean) {
super(configBean.getAdminRoleName(), "Administer security");
- this.adminInitialPackagePermissions = configBean.streamAdminPackagePermissions()
+ this.adminInitialPackagePermissions = configBean.streamAdminNamespacePermissions()
.collect(_Arrays.toArray(String.class));
}
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisModuleSecurityAdminUser.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisModuleSecurityAdminUser.java
index efb1f3d..d3e8202 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisModuleSecurityAdminUser.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisModuleSecurityAdminUser.java
@@ -20,12 +20,12 @@ package org.apache.isis.extensions.secman.jpa.seed.scripts;
import java.util.Arrays;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.user.AccountType;
public class IsisModuleSecurityAdminUser extends AbstractUserAndRolesFixtureScript {
- public IsisModuleSecurityAdminUser(SecurityModuleConfig configBean) {
+ public IsisModuleSecurityAdminUser(SecmanConfiguration configBean) {
super(
configBean.getAdminUserName(),
configBean.getAdminPassword(),
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java
index 67de5ad..f267887 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.extensions.secman.jpa.seed.scripts;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRule;
@@ -27,7 +27,7 @@ import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRul
*/
public class IsisModuleSecurityFixtureRoleAndPermissions extends AbstractRoleAndPermissionsFixtureScript {
- public IsisModuleSecurityFixtureRoleAndPermissions(SecurityModuleConfig configBean) {
+ public IsisModuleSecurityFixtureRoleAndPermissions(SecmanConfiguration configBean) {
super(configBean.getFixtureRoleName(), "Security module fixtures");
}
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisModuleSecurityRegularUserRoleAndPermissions.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisModuleSecurityRegularUserRoleAndPermissions.java
index 280b756..946fe3b 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisModuleSecurityRegularUserRoleAndPermissions.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisModuleSecurityRegularUserRoleAndPermissions.java
@@ -19,7 +19,7 @@
package org.apache.isis.extensions.secman.jpa.seed.scripts;
import org.apache.isis.core.security.authentication.logout.LogoutMenu;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRule;
import org.apache.isis.extensions.secman.jpa.dom.role.ApplicationRole;
@@ -32,7 +32,7 @@ import org.apache.isis.extensions.secman.model.app.user.MeService;
*/
public class IsisModuleSecurityRegularUserRoleAndPermissions extends AbstractRoleAndPermissionsFixtureScript {
- public IsisModuleSecurityRegularUserRoleAndPermissions(SecurityModuleConfig configBean) {
+ public IsisModuleSecurityRegularUserRoleAndPermissions(SecmanConfiguration configBean) {
super(configBean.getRegularUserRoleName(), "Regular user of the security module");
}
diff --git a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java
index 9586654..ad3d77c 100644
--- a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java
+++ b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java
@@ -45,7 +45,7 @@ import org.apache.isis.commons.internal.collections._Arrays;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.interaction.session.InteractionFactory;
import org.apache.isis.core.security.authorization.standard.Authorizor;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.SecurityRealm;
import org.apache.isis.extensions.secman.api.SecurityRealmCharacteristic;
import org.apache.isis.extensions.secman.api.encryption.PasswordEncryptionService;
@@ -64,7 +64,7 @@ public class IsisModuleExtSecmanShiroRealm extends AuthorizingRealm implements S
@Inject protected ServiceInjector serviceInjector;
@Inject protected InteractionFactory isisInteractionFactory;
@Inject protected PlatformTransactionManager txMan;
- @Inject private SecurityModuleConfig configBean;
+ @Inject private SecmanConfiguration configBean;
@Inject protected IsisConfiguration isisConfiguration;
@Getter @Setter private AuthenticatingRealm delegateAuthenticationRealm;
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
index c3d2185..32f46e2 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
@@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.role.ApplicationRole;
import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
import org.apache.isis.extensions.secman.api.user.ApplicationUser;
@@ -82,7 +82,7 @@ class ShiroSecmanLdapTest extends AbstractShiroTest {
@Inject LdapServerService ldapServerService;
@Inject ApplicationUserRepository<? extends ApplicationUser> applicationUserRepository;
@Inject ApplicationRoleRepository<? extends ApplicationRole> applicationRoleRepository;
- @Inject SecurityModuleConfig securityConfig;
+ @Inject SecmanConfiguration securityConfig;
@Inject ServiceInjector serviceInjector;
@BeforeEach
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
index c273f32..38d7d7d 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanEncryptionJbcrypt;
import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
@@ -86,7 +86,7 @@ class ShiroSecmanLdap_restfulStressTest extends AbstractShiroTest {
@Inject LdapServerService ldapServerService;
// @Inject ApplicationUserRepository applicationUserRepository;
// @Inject ApplicationRoleRepository applicationRoleRepository;
- @Inject SecurityModuleConfig securityConfig;
+ @Inject SecmanConfiguration securityConfig;
@Inject ServiceInjector serviceInjector;
@BeforeAll
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
index 3b79e12..d3927be 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
@@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanEncryptionJbcrypt;
import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
@@ -61,7 +61,7 @@ import lombok.val;
@TestPropertySource(IsisPresets.UseLog4j2Test)
class ShiroSecmanTest extends AbstractShiroTest {
- @Inject SecurityModuleConfig securityConfig;
+ @Inject SecmanConfiguration securityConfig;
@Inject ServiceInjector serviceInjector;
@BeforeEach
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
index d6cf3b4..7c9ab28 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
@@ -29,7 +29,7 @@ import org.springframework.context.annotation.PropertySources;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationServiceAllowBeatsVeto;
import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoDatanucleus;
@@ -59,8 +59,8 @@ import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
public class Configuration_usingJdoAndShiro {
@Bean @Singleton
- public SecurityModuleConfig securityModuleConfigBean() {
- return SecurityModuleConfig.builder()
+ public SecmanConfiguration securityModuleConfigBean() {
+ return SecmanConfiguration.builder()
.build();
}
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java
index 18e6773..c4f8e63 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java
@@ -23,7 +23,7 @@ import java.util.HashSet;
import javax.inject.Inject;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.role.ApplicationRole;
import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
import org.apache.isis.extensions.secman.api.user.ApplicationUser;
@@ -120,7 +120,7 @@ implements PersonaWithBuilderScript<BuilderScriptAbstract<?>> {
@Inject private ApplicationUserRepository<? extends ApplicationUser> applicationUserRepository;
@Inject private ApplicationRoleRepository<? extends ApplicationRole> applicationRoleRepository;
- @Inject private SecurityModuleConfig securityConfig;
+ @Inject private SecmanConfiguration securityConfig;
};
}
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/JpaTestDomainPersona.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/JpaTestDomainPersona.java
index bcd55f9..17c77a8 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/JpaTestDomainPersona.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/JpaTestDomainPersona.java
@@ -23,7 +23,7 @@ import java.util.TreeSet;
import javax.inject.Inject;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
+import org.apache.isis.extensions.secman.api.SecmanConfiguration;
import org.apache.isis.extensions.secman.api.role.ApplicationRole;
import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
import org.apache.isis.extensions.secman.api.user.ApplicationUser;
@@ -120,7 +120,7 @@ implements PersonaWithBuilderScript<BuilderScriptAbstract<?>> {
@Inject private ApplicationUserRepository<? extends ApplicationUser> applicationUserRepository;
@Inject private ApplicationRoleRepository<? extends ApplicationRole> applicationRoleRepository;
- @Inject private SecurityModuleConfig securityConfig;
+ @Inject private SecmanConfiguration securityConfig;
};
}