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 14:47:50 UTC

[isis] branch master updated: ISIS-2431: SecMan: rename object namespaces and default user and role names

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 8c0dd86  ISIS-2431: SecMan: rename object namespaces and default user and role names
8c0dd86 is described below

commit 8c0dd863bc7806d2a37e1a965f1357073f3e5279
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jan 26 15:47:30 2021 +0100

    ISIS-2431: SecMan: rename object namespaces and default user and role
    names
---
 .../modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc | 35 ++++++++++++++++++++--
 .../secman/api/SecurityModuleConfig.java           | 21 ++++---------
 .../secman/model/app/feature/ApplicationClass.java |  2 +-
 .../model/app/feature/ApplicationClassAction.java  |  2 +-
 .../app/feature/ApplicationClassCollection.java    |  2 +-
 .../model/app/feature/ApplicationClassMember.java  |  2 +-
 .../app/feature/ApplicationClassProperty.java      |  2 +-
 .../app/feature/ApplicationFeatureViewModels.java  |  2 +-
 .../model/app/feature/ApplicationPackage.java      |  2 +-
 .../secman/model/app/user/MeService.java           |  2 +-
 .../model/app/user/UserPermissionViewModel.java    |  2 +-
 .../dom/permission/ApplicationPermissionMenu.java  |  2 +-
 .../secman/model/dom/role/ApplicationRoleMenu.java |  2 +-
 .../model/dom/role/ApplicationRole_addPackage.java |  6 ++--
 .../model/dom/tenancy/ApplicationTenancyMenu.java  |  2 +-
 .../model/dom/user/ApplicationUserManager.java     |  2 +-
 .../secman/model/dom/user/ApplicationUserMenu.java |  2 +-
 .../jdo/dom/permission/ApplicationPermission.java  |  2 +-
 .../secman/jdo/dom/role/ApplicationRole.java       |  2 +-
 .../secman/jdo/dom/tenancy/ApplicationTenancy.java |  3 +-
 .../secman/jdo/dom/user/ApplicationUser.java       |  2 +-
 .../jpa/dom/permission/ApplicationPermission.java  |  2 +-
 .../secman/jpa/dom/role/ApplicationRole.java       |  2 +-
 .../secman/jpa/dom/tenancy/ApplicationTenancy.java |  2 +-
 .../secman/jpa/dom/user/ApplicationUser.java       |  2 +-
 25 files changed, 63 insertions(+), 44 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 cf4028a..8b153bb 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
@@ -261,8 +261,6 @@ Query.named(CommandJdo.class, "findByParent") +
 | UserService#getUser() : UserMemento
 | UserService#currentUser() : *Optional*<UserMemento>
 
-
-
 |===
 
 <1> These might be in use with configuration files, check yours!
@@ -278,4 +276,37 @@ Query.named(CommandJdo.class, "findByParent") +
 in a new-ed up (entity) instance is more flexible and also more error prone, eg. it allows the compiler to check
 validity of the used constructor rather than doing construction reflective at runtime
 
+== SecMan (Extension)
+
+[cols="3m,3m,3a", options="header"]
+
+|===
+
+| What
+| Old
+| New
+
+| Domain Object namespaces in SecMan scope like eg. objectType = "isissecurity.ApplicationUser"
+| isissecurity
+| secman
+
+WARNING: check menubars.layout.xml for any occurrences
+
+| Default Regular User Role Name
+| isis-module-security-regular-user 
+| secman-regular-user
+
+| Default Fixture Role Name 
+| isis-module-security-fixtures 
+| secman-fixtures
+
+| Default Admin Role Name
+| isis-module-security-admin 
+| secman-admin
+
+| Default Admin User Name
+| isis-module-security-admin 
+| secman-admin
+
+|===
 
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/SecurityModuleConfig.java
index 939190d..54971ad 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/SecurityModuleConfig.java
@@ -31,29 +31,21 @@ import lombok.Singular;
 @Builder
 public class SecurityModuleConfig {
 
-    // -- SCHEMA
-    
-    /** Logical DB schema to use for the SecMan entities. 
-     * @implNote Yet just wishful thinking, not implemented. 
-     */
-    @Getter @Builder.Default @NonNull
-    final String databaseSchema = "";
-    
     // -- ROLES
 
     @Getter @Builder.Default @NonNull
-    final String regularUserRoleName = "isis-module-security-regular-user";
+    final String regularUserRoleName = "secman-regular-user";
 
     @Getter @Builder.Default @NonNull
-    final String fixtureRoleName = "isis-module-security-fixtures";
+    final String fixtureRoleName = "secman-fixtures";
 
     @Getter @Builder.Default @NonNull
-    final String adminRoleName = "isis-module-security-admin";
+    final String adminRoleName = "secman-admin";
 
     // -- ADMIN
 
     @Getter @Builder.Default @NonNull
-    final String adminUserName = "isis-module-security-admin";
+    final String adminUserName = "secman-admin";
 
     @Getter @Builder.Default @NonNull
     final String adminPassword = "pass";
@@ -63,10 +55,7 @@ public class SecurityModuleConfig {
      */
     @Getter @Builder.Default @NonNull
     final String[] adminStickyPackagePermissions = new String[]{
-            "org.apache.isis.extensions.secman.api",
-            "org.apache.isis.extensions.secman.model",
-            "org.apache.isis.extensions.secman.jdo.dom", // either jdo or jpa is going to be orphaned
-            "org.apache.isis.extensions.secman.jpa.dom", // either jdo or jpa is going to be orphaned
+            "secman"
     };
     
     @Getter @Singular 
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 e8f45cc..8d66105 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 = "isissecurity.ApplicationClass"
+        objectType = "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 1b523ec..5e84aa8 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 = "isissecurity.ApplicationClassAction"
+        objectType = "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 66f288a..26247ca 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 = "isissecurity.ApplicationClassCollection"
+        objectType = "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 53f9a3c..3104887 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 = "isissecurity.ApplicationClassMember"
+        objectType = "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 f6e8db1..58004ab 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 = "isissecurity.ApplicationClassProperty"
+        objectType = "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 a4b9d54..36206c8 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 = "isissecurity.ApplicationFeatureViewModels"
+        objectType = "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 fcda6bd..2b85fd0 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 = "isissecurity.ApplicationPackage"
+        objectType = "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 3792279..981e051 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 = "isissecurity.MeService"
+        objectType = "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 b8b406b..ec6da23 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 = "isissecurity.UserPermissionViewModel"
+        objectType = "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 2c4f20f..d2a14d5 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 = "isissecurity.ApplicationPermissionMenu"
+        objectType = "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 b0bf3e0..491fbd1 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 = "isissecurity.ApplicationRoleMenu"
+        objectType = "secman.ApplicationRoleMenu"
         )
 @DomainServiceLayout(
         named = "Security",
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addPackage.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addPackage.java
index 96bcd1f..b915285 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addPackage.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addPackage.java
@@ -46,7 +46,8 @@ public class ApplicationRole_addPackage {
     private final ApplicationRole holder;
     
     /**
-     * Adds a {@link org.apache.isis.extensions.secman.jdo.dom.permission.ApplicationPermission permission} for this role to a
+     * Adds a {@link org.apache.isis.extensions.secman.jdo.dom.permission.ApplicationPermission permission}
+     * for this role to a
      * {@link ApplicationFeatureType#PACKAGE package}
      * {@link ApplicationFeature feature}.
      */
@@ -60,8 +61,7 @@ public class ApplicationRole_addPackage {
             final String packageFqn) {
         
         applicationPermissionRepository
-            .newPermission(
-                    holder, rule, mode, ApplicationFeatureType.PACKAGE, packageFqn);
+            .newPermission(holder, rule, mode, ApplicationFeatureType.PACKAGE, packageFqn);
         return holder;
     }
 
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 39b1b23..f1ca885 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 = "isissecurity.ApplicationTenancyMenu"
+        objectType = "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 856ee9c..ef6baee 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 = "isissecurity.ApplicationUserManager"
+        objectType = "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 fb1ece3..c637b80 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 = "isissecurity.ApplicationUserMenu"
+        objectType = "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 9332a76..0c690da 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 = "isissecurity.ApplicationPermission"
+        objectType = "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/role/ApplicationRole.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java
index 9355370..011d142 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 = "isissecurity.ApplicationRole",
+        objectType = "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/tenancy/ApplicationTenancy.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java
index 21b371c..f0900b5 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
@@ -36,7 +36,6 @@ import org.apache.isis.applib.annotation.Editing;
 import org.apache.isis.applib.annotation.MemberOrder;
 import org.apache.isis.applib.annotation.Property;
 import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.util.Equality;
 import org.apache.isis.applib.util.Hashing;
@@ -78,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 = "isissecurity.ApplicationTenancy",
+        objectType = "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/user/ApplicationUser.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
index 85d6c20..8a1d696 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 = "isissecurity.ApplicationUser",
+        objectType = "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/permission/ApplicationPermission.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.java
index 6c9106e..eed5f12 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 = "isissecurity.ApplicationPermission"
+        objectType = "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/role/ApplicationRole.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRole.java
index 94fb5ca..24897d3 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 = "isissecurity.ApplicationRole",
+        objectType = "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/tenancy/ApplicationTenancy.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancy.java
index ce658b5..777f579 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 = "isissecurity.ApplicationTenancy",
+        objectType = "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/user/ApplicationUser.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java
index 2c588f9..33156c8 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 = "isissecurity.ApplicationUser",
+        objectType = "secman.ApplicationUser",
         autoCompleteRepository = ApplicationUserRepository.class,
         autoCompleteAction = "findMatching"
         )