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 20:31:22 UTC
[isis] branch master updated: ISIS-2431: rationalizing extension
namespaces (2)
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 0524582 ISIS-2431: rationalizing extension namespaces (2)
0524582 is described below
commit 052458271029526890e7e78f058e08841b3dfe27
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jan 26 21:31:04 2021 +0100
ISIS-2431: rationalizing extension namespaces (2)
---
.../apache/isis/core/security/authentication/logout/LogoutMenu.java | 6 +++---
.../core/security/authentication/manager/AuthenticationManager.java | 2 +-
.../authentication/standard/RandomCodeGeneratorDefault.java | 2 +-
.../core/security/authorization/manager/AuthorizationManager.java | 2 +-
examples/demo/domain/src/main/java/demoapp/dom/DemoModule.java | 3 ++-
.../jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.java | 2 +-
.../isis/extensions/secman/model/app/feature/ApplicationClass.java | 2 +-
.../extensions/secman/model/app/feature/ApplicationClassAction.java | 2 +-
.../secman/model/app/feature/ApplicationClassCollection.java | 2 +-
.../extensions/secman/model/app/feature/ApplicationClassMember.java | 2 +-
.../secman/model/app/feature/ApplicationClassProperty.java | 2 +-
.../secman/model/app/feature/ApplicationFeatureViewModels.java | 2 +-
.../extensions/secman/model/app/feature/ApplicationPackage.java | 2 +-
.../org/apache/isis/extensions/secman/model/app/user/MeService.java | 2 +-
.../extensions/secman/model/app/user/UserPermissionViewModel.java | 2 +-
.../secman/model/dom/permission/ApplicationPermissionMenu.java | 2 +-
.../isis/extensions/secman/model/dom/role/ApplicationRoleMenu.java | 2 +-
.../extensions/secman/model/dom/tenancy/ApplicationTenancyMenu.java | 2 +-
.../extensions/secman/model/dom/user/ApplicationUserManager.java | 2 +-
.../isis/extensions/secman/model/dom/user/ApplicationUserMenu.java | 2 +-
.../extensions/secman/jdo/dom/permission/ApplicationPermission.java | 2 +-
.../secman/jdo/dom/permission/ApplicationPermissionRepository.java | 2 +-
.../apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java | 2 +-
.../extensions/secman/jdo/dom/role/ApplicationRoleRepository.java | 2 +-
.../isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java | 2 +-
.../secman/jdo/dom/tenancy/ApplicationTenancyRepository.java | 2 +-
.../apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java | 2 +-
.../extensions/secman/jdo/dom/user/ApplicationUserRepository.java | 2 +-
.../isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java | 2 +-
.../extensions/secman/jpa/dom/permission/ApplicationPermission.java | 2 +-
.../secman/jpa/dom/permission/ApplicationPermissionRepository.java | 2 +-
.../apache/isis/extensions/secman/jpa/dom/role/ApplicationRole.java | 2 +-
.../extensions/secman/jpa/dom/role/ApplicationRoleRepository.java | 2 +-
.../isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancy.java | 2 +-
.../secman/jpa/dom/tenancy/ApplicationTenancyRepository.java | 2 +-
.../apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java | 2 +-
.../extensions/secman/jpa/dom/user/ApplicationUserRepository.java | 2 +-
.../isis/extensions/secman/jpa/seed/SeedSecurityModuleService.java | 2 +-
.../isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java | 2 +-
.../secman/shiro/services/SecurityRealmServiceUsingShiro.java | 2 +-
.../isis/persistence/jdo/metamodel/menu/JdoMetamodelMenu.java | 4 ++--
.../rendering/service/swagger/internal/TaggerDefault.java | 6 ++++++
42 files changed, 51 insertions(+), 44 deletions(-)
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/logout/LogoutMenu.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/logout/LogoutMenu.java
index 1de8e63..f18983f 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/logout/LogoutMenu.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/logout/LogoutMenu.java
@@ -39,8 +39,8 @@ import org.apache.isis.core.security.authentication.AuthenticationContext;
import lombok.RequiredArgsConstructor;
-@Named("isisSecurityApi.LogoutMenu")
-@DomainService(objectType = "isisSecurityApi.LogoutMenu")
+@Named("isis.security.LogoutMenu")
+@DomainService(objectType = "isis.security.LogoutMenu")
@DomainServiceLayout(menuBar = DomainServiceLayout.MenuBar.TERTIARY)
@RequiredArgsConstructor(onConstructor_ = {@Inject})
public class LogoutMenu {
@@ -81,7 +81,7 @@ public class LogoutMenu {
nature = Nature.VIEW_MODEL, //XXX was INMEMORY_ENTITY
objectType = LoginRedirect.OBJECT_TYPE)
public static class LoginRedirect {
- public final static String OBJECT_TYPE = "isisSecurityApi.LoginRedirect";
+ public final static String OBJECT_TYPE = "isis.security.LoginRedirect";
}
}
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
index 16b06c2..77c8744 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
@@ -47,7 +47,7 @@ import lombok.Getter;
import lombok.val;
@Service
-@Named("isisSecurityApi.AuthenticationManager")
+@Named("isis.security.AuthenticationManager")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGeneratorDefault.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGeneratorDefault.java
index fb8b307..317c433 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGeneratorDefault.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGeneratorDefault.java
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Component;
import org.apache.isis.applib.annotation.OrderPrecedence;
@Component
-@Named("isisSecurityApi.RandomCodeGenerator10Chars")
+@Named("isis.security.RandomCodeGenerator10Chars")
@Order(OrderPrecedence.LATE)
@Primary
@Qualifier("Default")
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java b/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java
index dd1054c..7ff3fc7 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java
@@ -42,7 +42,7 @@ import lombok.NonNull;
* Authorizes the user in the current session view and use members of an object.
*/
@Service
-@Named("isisSecurityApi.AuthorizationManager")
+@Named("isis.security.AuthorizationManager")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
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 2930402..b439b69 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/DemoModule.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/DemoModule.java
@@ -64,7 +64,8 @@ public class DemoModule {
public SecmanConfiguration securityModuleConfigBean() {
return SecmanConfiguration.builder()
.adminUserName("sven")
- .adminAdditionalNamespacePermission("demoapp")
+ .adminAdditionalNamespacePermission("demo")
+ .adminAdditionalNamespacePermission("isis")
.adminAdditionalNamespacePermission("org.apache.isis")
.build();
}
diff --git a/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.java b/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.java
index 2b3b55f..4d81e0a 100644
--- a/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.java
+++ b/extensions/security/secman/encryption-jbcrypt/src/main/java/org/apache/isis/extensions/secman/encryption/jbcrypt/services/PasswordEncryptionServiceUsingJBcrypt.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.extensions.secman.api.encryption.PasswordEncryptionService;
@Service
-@Named("secman.PasswordEncryptionServiceUsingJBcrypt")
+@Named("isis.ext.secman.PasswordEncryptionServiceUsingJBcrypt")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("JBCrypt")
public class PasswordEncryptionServiceUsingJBcrypt implements PasswordEncryptionService {
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.java
index 8d66105..3025871 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureId;
@DomainObject(
- objectType = "secman.ApplicationClass"
+ objectType = "isis.ext.secman.ApplicationClass"
)
@DomainObjectLayout(
paged=100,
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.java
index 5e84aa8..4e0786c 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureId;
@DomainObject(
- objectType = "secman.ApplicationClassAction"
+ objectType = "isis.ext.secman.ApplicationClassAction"
)
@DomainObjectLayout(paged=100)
public class ApplicationClassAction extends ApplicationClassMember {
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.java
index 26247ca..eddfe64 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.java
@@ -25,7 +25,7 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureId;
@DomainObject(
- objectType = "secman.ApplicationClassCollection"
+ objectType = "isis.ext.secman.ApplicationClassCollection"
)
@DomainObjectLayout(paged=100)
public class ApplicationClassCollection extends ApplicationClassMember {
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassMember.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassMember.java
index 3104887..12294b9 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassMember.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassMember.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureId;
@DomainObject(
- objectType = "secman.ApplicationClassMember"
+ objectType = "isis.ext.secman.ApplicationClassMember"
)
@DomainObjectLayout(
bookmarking = BookmarkPolicy.AS_CHILD
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.java
index 58004ab..e59a407 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureId;
@DomainObject(
- objectType = "secman.ApplicationClassProperty"
+ objectType = "isis.ext.secman.ApplicationClassProperty"
)
@DomainObjectLayout(paged=100)
public class ApplicationClassProperty extends ApplicationClassMember {
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModels.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModels.java
index 36206c8..3c8c8e4 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModels.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModels.java
@@ -40,7 +40,7 @@ import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureReposit
@DomainService(
nature = NatureOfService.VIEW,
- objectType = "secman.ApplicationFeatureViewModels"
+ objectType = "isis.ext.secman.ApplicationFeatureViewModels"
)
@DomainServiceLayout(
named="Security",
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.java
index 2b85fd0..7ca2deb 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureId;
import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureType;
@DomainObject(
- objectType = "secman.ApplicationPackage"
+ objectType = "isis.ext.secman.ApplicationPackage"
)
@DomainObjectLayout(paged=100)
public class ApplicationPackage extends ApplicationFeatureViewModel {
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/MeService.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/MeService.java
index 981e051..3219ea9 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/MeService.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/MeService.java
@@ -37,7 +37,7 @@ import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
@DomainService(
nature = NatureOfService.VIEW,
- objectType = "secman.MeService"
+ objectType = "isis.ext.secman.MeService"
)
@DomainServiceLayout(
menuBar = DomainServiceLayout.MenuBar.TERTIARY
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.java
index c714053..89c4472 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.java
@@ -65,7 +65,7 @@ import lombok.val;
*/
@DomainObject(
nature = Nature.VIEW_MODEL,
- objectType = "secman.UserPermissionViewModel"
+ objectType = "isis.ext.secman.UserPermissionViewModel"
)
@DomainObjectLayout(
bookmarking = BookmarkPolicy.AS_ROOT
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission/ApplicationPermissionMenu.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission/ApplicationPermissionMenu.java
index d2a14d5..b5a7fb6 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission/ApplicationPermissionMenu.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission/ApplicationPermissionMenu.java
@@ -35,7 +35,7 @@ import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRep
@DomainService(
nature = NatureOfService.VIEW,
- objectType = "secman.ApplicationPermissionMenu"
+ objectType = "isis.ext.secman.ApplicationPermissionMenu"
)
@DomainServiceLayout(
named="Security",
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRoleMenu.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRoleMenu.java
index 491fbd1..752e25a 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRoleMenu.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRoleMenu.java
@@ -38,7 +38,7 @@ import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
@DomainService(
nature = NatureOfService.VIEW,
- objectType = "secman.ApplicationRoleMenu"
+ objectType = "isis.ext.secman.ApplicationRoleMenu"
)
@DomainServiceLayout(
named = "Security",
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/tenancy/ApplicationTenancyMenu.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/tenancy/ApplicationTenancyMenu.java
index f1ca885..0440a58 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/tenancy/ApplicationTenancyMenu.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/tenancy/ApplicationTenancyMenu.java
@@ -39,7 +39,7 @@ import org.apache.isis.extensions.secman.api.tenancy.ApplicationTenancyRepositor
@DomainService(
nature = NatureOfService.VIEW,
- objectType = "secman.ApplicationTenancyMenu"
+ objectType = "isis.ext.secman.ApplicationTenancyMenu"
)
@DomainServiceLayout(
named = "Security",
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUserManager.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUserManager.java
index ef6baee..8ae18cd 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUserManager.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUserManager.java
@@ -28,7 +28,7 @@ import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
@DomainObject(
nature = Nature.VIEW_MODEL,
- objectType = "secman.ApplicationUserManager"
+ objectType = "isis.ext.secman.ApplicationUserManager"
)
public class ApplicationUserManager {
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 453ea2c..cfd64d8 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
@@ -46,7 +46,7 @@ import lombok.val;
@DomainService(
nature = NatureOfService.VIEW,
- objectType = "secman.ApplicationUserMenu"
+ objectType = "isis.ext.secman.ApplicationUserMenu"
)
@DomainServiceLayout(
named = "Security",
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java
index 31ef44a..b711609 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java
@@ -106,7 +106,7 @@ import lombok.experimental.UtilityClass;
name = "ApplicationPermission_role_feature_rule_UNQ", members = { "role", "featureType", "featureFqn", "rule" })
})
@DomainObject(
- objectType = "secman.ApplicationPermission"
+ objectType = "isis.ext.secman.ApplicationPermission"
)
@DomainObjectLayout(
bookmarking = BookmarkPolicy.AS_CHILD
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java
index 6992147..37ba382 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermissionRepository.java
@@ -56,7 +56,7 @@ import lombok.NonNull;
import lombok.val;
@Repository
-@Named("secman.applicationPermissionRepository")
+@Named("isis.ext.secman.applicationPermissionRepository")
public class ApplicationPermissionRepository
implements org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRepository<ApplicationPermission> {
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java
index ad06953..f1b217a 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java
@@ -80,7 +80,7 @@ import lombok.Setter;
@DomainObject(
bounding = Bounding.BOUNDED,
// bounded = true,
- objectType = "secman.ApplicationRole",
+ objectType = "isis.ext.secman.ApplicationRole",
autoCompleteRepository = ApplicationRoleRepository.class,
autoCompleteAction = "findMatching"
)
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 ead61f5..6c6ee0a 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
@@ -41,7 +41,7 @@ import org.apache.isis.extensions.secman.model.dom.permission.ApplicationPermiss
import lombok.val;
@Repository
-@Named("secman.applicationRoleRepository")
+@Named("isis.ext.secman.applicationRoleRepository")
public class ApplicationRoleRepository
implements org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository<ApplicationRole> {
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java
index 635b317..7082f22 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java
@@ -77,7 +77,7 @@ import lombok.Setter;
+ "FROM org.apache.isis.extensions.secman.jdo.dom.tenancy.ApplicationTenancy "
+ "WHERE name.matches(:regex) || path.matches(:regex) ")})
@DomainObject(
- objectType = "secman.ApplicationTenancy",
+ objectType = "isis.ext.secman.ApplicationTenancy",
autoCompleteRepository = ApplicationTenancyRepository.class,
autoCompleteAction = "findMatching"
)
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyRepository.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyRepository.java
index 82f06c1..0e3147f 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyRepository.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancyRepository.java
@@ -39,7 +39,7 @@ import lombok.NonNull;
import lombok.val;
@Repository
-@Named("secman.applicationTenancyRepository")
+@Named("isis.ext.secman.applicationTenancyRepository")
public class ApplicationTenancyRepository
implements org.apache.isis.extensions.secman.api.tenancy.ApplicationTenancyRepository<ApplicationTenancy> {
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 79ef3ff..d69180d 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
@@ -112,7 +112,7 @@ import lombok.val;
+ " || emailAddress.matches(:regex)")
})
@DomainObject(
- objectType = "secman.ApplicationUser",
+ objectType = "isis.ext.secman.ApplicationUser",
autoCompleteRepository = ApplicationUserRepository.class,
autoCompleteAction = "findMatching"
)
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 a1a4740..0436316 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
@@ -52,7 +52,7 @@ import lombok.NonNull;
import lombok.val;
@Repository
-@Named("secman.applicationUserRepository")
+@Named("isis.ext.secman.applicationUserRepository")
public class ApplicationUserRepository
implements org.apache.isis.extensions.secman.api.user.ApplicationUserRepository<ApplicationUser> {
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
index 271852c..dee96ee 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
@@ -33,7 +33,7 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("secman.SeedSecurityModuleService")
+@Named("isis.ext.secman.SeedSecurityModuleService")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Default")
@Log4j2
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.java
index eed5f12..e57fe2d 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.java
@@ -110,7 +110,7 @@ import lombok.experimental.UtilityClass;
})
@EntityListeners(JpaEntityInjectionPointResolver.class)
@DomainObject(
- objectType = "secman.ApplicationPermission"
+ objectType = "isis.ext.secman.ApplicationPermission"
)
@DomainObjectLayout(
bookmarking = BookmarkPolicy.AS_CHILD
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermissionRepository.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermissionRepository.java
index 173233c..ef57353 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermissionRepository.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermissionRepository.java
@@ -59,7 +59,7 @@ import lombok.NonNull;
import lombok.val;
@Service
-@Named("secman.applicationPermissionRepository")
+@Named("isis.ext.secman.applicationPermissionRepository")
public class ApplicationPermissionRepository
implements org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRepository<ApplicationPermission> {
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRole.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRole.java
index 24897d3..0d3552a 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRole.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRole.java
@@ -85,7 +85,7 @@ import lombok.Setter;
@DomainObject(
bounding = Bounding.BOUNDED,
// bounded = true,
- objectType = "secman.ApplicationRole",
+ objectType = "isis.ext.secman.ApplicationRole",
autoCompleteRepository = ApplicationRoleRepository.class,
autoCompleteAction = "findMatching"
)
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 1cb73f4..9f42d90 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
@@ -42,7 +42,7 @@ import org.apache.isis.extensions.secman.model.dom.permission.ApplicationPermiss
import lombok.val;
@Service
-@Named("secman.applicationRoleRepository")
+@Named("isis.ext.secman.applicationRoleRepository")
public class ApplicationRoleRepository
implements org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository<ApplicationRole> {
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancy.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancy.java
index 777f579..38949a3 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancy.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancy.java
@@ -77,7 +77,7 @@ import lombok.Setter;
+ " OR t.path LIKE '%:regex%'"),
})
@DomainObject(
- objectType = "secman.ApplicationTenancy",
+ objectType = "isis.ext.secman.ApplicationTenancy",
autoCompleteRepository = ApplicationTenancyRepository.class,
autoCompleteAction = "findMatching"
)
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancyRepository.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancyRepository.java
index 152b6ec..964b5ef 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancyRepository.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancyRepository.java
@@ -40,7 +40,7 @@ import lombok.NonNull;
import lombok.val;
@Service
-@Named("secman.applicationTenancyRepository")
+@Named("isis.ext.secman.applicationTenancyRepository")
public class ApplicationTenancyRepository
implements org.apache.isis.extensions.secman.api.tenancy.ApplicationTenancyRepository<ApplicationTenancy> {
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 ca7a7ed..9d21274 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
@@ -107,7 +107,7 @@ import lombok.val;
})
@EntityListeners(JpaEntityInjectionPointResolver.class)
@DomainObject(
- objectType = "secman.ApplicationUser",
+ objectType = "isis.ext.secman.ApplicationUser",
autoCompleteRepository = ApplicationUserRepository.class,
autoCompleteAction = "findMatching"
)
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 9b6f59c..9b21874 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
@@ -53,7 +53,7 @@ import lombok.NonNull;
import lombok.val;
@Service
-@Named("secman.applicationUserRepository")
+@Named("isis.ext.secman.applicationUserRepository")
public class ApplicationUserRepository
implements org.apache.isis.extensions.secman.api.user.ApplicationUserRepository<ApplicationUser> {
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedSecurityModuleService.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedSecurityModuleService.java
index b839c38..075cca6 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedSecurityModuleService.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedSecurityModuleService.java
@@ -33,7 +33,7 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("secman.SeedSecurityModuleService")
+@Named("isis.ext.secman.SeedSecurityModuleService")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Default")
@Log4j2
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 ad3d77c..350a309 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
@@ -60,7 +60,7 @@ import lombok.val;
public class IsisModuleExtSecmanShiroRealm extends AuthorizingRealm implements SecurityRealm {
- private static final String SECMAN_ENABLE_DELEGATED_USERS = "secman.enableDelegatedUsers";
+ private static final String SECMAN_ENABLE_DELEGATED_USERS = "isis.ext.secman.enableDelegatedUsers";
@Inject protected ServiceInjector serviceInjector;
@Inject protected InteractionFactory isisInteractionFactory;
@Inject protected PlatformTransactionManager txMan;
diff --git a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java
index 05eae5d..3fe9c94 100644
--- a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java
+++ b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/services/SecurityRealmServiceUsingShiro.java
@@ -34,7 +34,7 @@ import org.apache.isis.extensions.secman.shiro.util.ShiroUtils;
import lombok.val;
@Service
-@Named("secman.SecurityRealmServiceUsingShiro")
+@Named("isis.ext.secman.SecurityRealmServiceUsingShiro")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Shiro")
public class SecurityRealmServiceUsingShiro implements SecurityRealmService {
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/menu/JdoMetamodelMenu.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/menu/JdoMetamodelMenu.java
index b0a913d..45a94fd 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/menu/JdoMetamodelMenu.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/menu/JdoMetamodelMenu.java
@@ -39,8 +39,8 @@ import org.apache.isis.persistence.jdo.provider.entities.JdoFacetContext;
import lombok.val;
-@Named("isisJdoDn.JdoMetamodelMenu")
-@DomainService(objectType = "isisJdoDn.JdoMetamodelMenu")
+@Named("isis.persistence.jdo.JdoMetamodelMenu")
+@DomainService(objectType = "isis.persistence.jdo.JdoMetamodelMenu")
@DomainServiceLayout(
named = "Prototyping",
menuBar = DomainServiceLayout.MenuBar.SECONDARY
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
index c5e0b1f..1ed0dd4 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
@@ -48,6 +48,12 @@ public class TaggerDefault implements Tagger {
if (objType.startsWith("isis.applib.")) {
return ". apache isis applib";
}
+ if (objType.startsWith("isis.persistence.")) {
+ return ". apache isis persistence - " + partsOf(objType).skip(2).limit(1).collect(Collectors.joining("."));
+ }
+ if (objType.startsWith("isis.security.")) {
+ return ". apache isis security";
+ }
if (objType.startsWith("isis.ext.")) {
return ". apache isis extensions - " + partsOf(objType).skip(2).limit(1).collect(Collectors.joining("."));
}