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/03/04 18:30:53 UTC

[isis] branch master updated: ISIS-2562: SecMan: harmonize model packages

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 7ac9e9d  ISIS-2562: SecMan: harmonize model packages
7ac9e9d is described below

commit 7ac9e9d585e5fb5830f36224d5231105592a524f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Mar 4 19:30:42 2021 +0100

    ISIS-2562: SecMan: harmonize model packages
---
 .../secman/model/{app/feature => dom/features}/ApplicationClass.java  | 2 +-
 .../model/{app/feature => dom/features}/ApplicationClass.layout.xml   | 0
 .../model/{app/feature => dom/features}/ApplicationClassAction.java   | 2 +-
 .../{app/feature => dom/features}/ApplicationClassAction.layout.xml   | 0
 .../{app/feature => dom/features}/ApplicationClassCollection.java     | 2 +-
 .../feature => dom/features}/ApplicationClassCollection.layout.xml    | 0
 .../model/{app/feature => dom/features}/ApplicationClassMember.java   | 2 +-
 .../model/{app/feature => dom/features}/ApplicationClassProperty.java | 2 +-
 .../{app/feature => dom/features}/ApplicationClassProperty.layout.xml | 0
 .../{app/feature => dom/features}/ApplicationFeatureViewModel.java    | 2 +-
 .../{app/feature => dom/features}/ApplicationFeatureViewModels.java   | 2 +-
 .../model/{app/feature => dom/features}/ApplicationPackage.java       | 2 +-
 .../model/{app/feature => dom/features}/ApplicationPackage.layout.xml | 0
 .../{app/feature => dom/features}/ApplicationPermission_feature.java  | 2 +-
 .../model/{app => dom}/user/ApplicationUser_filterPermissions.java    | 2 +-
 .../secman/model/{app => dom}/user/ApplicationUser_permissions.java   | 2 +-
 .../isis/extensions/secman/model/{app => dom}/user/MeService.java     | 2 +-
 .../secman/model/{app => dom}/user/UserPermissionViewModel.java       | 4 ++--
 .../secman/model/{app => dom}/user/UserPermissionViewModel.layout.xml | 0
 .../jdo/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.java  | 4 ++--
 .../jpa/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.java  | 4 ++--
 21 files changed, 18 insertions(+), 18 deletions(-)

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/dom/features/ApplicationClass.java
similarity index 98%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClass.java
index 6758fd1..8e8ecca 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/dom/features/ApplicationClass.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.app.feature;
+package org.apache.isis.extensions.secman.model.dom.features;
 
 import java.util.List;
 import java.util.SortedSet;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClass.layout.xml
similarity index 100%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClass.layout.xml
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClass.layout.xml
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/dom/features/ApplicationClassAction.java
similarity index 97%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassAction.java
index 8240238..e6be30a 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/dom/features/ApplicationClassAction.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.app.feature;
+package org.apache.isis.extensions.secman.model.dom.features;
 
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassAction.layout.xml
similarity index 100%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassAction.layout.xml
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassAction.layout.xml
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/dom/features/ApplicationClassCollection.java
similarity index 97%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassCollection.java
index c1a1cad..fbcd26c 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/dom/features/ApplicationClassCollection.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.app.feature;
+package org.apache.isis.extensions.secman.model.dom.features;
 
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassCollection.layout.xml
similarity index 100%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassCollection.layout.xml
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassCollection.layout.xml
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/dom/features/ApplicationClassMember.java
similarity index 97%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassMember.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassMember.java
index 3b3ad36..c5867f7 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/dom/features/ApplicationClassMember.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.app.feature;
+package org.apache.isis.extensions.secman.model.dom.features;
 
 import org.apache.isis.applib.annotation.BookmarkPolicy;
 import org.apache.isis.applib.annotation.DomainObject;
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/dom/features/ApplicationClassProperty.java
similarity index 98%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassProperty.java
index e4c5bf9..11f50f0 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/dom/features/ApplicationClassProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.app.feature;
+package org.apache.isis.extensions.secman.model.dom.features;
 
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassProperty.layout.xml
similarity index 100%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationClassProperty.layout.xml
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassProperty.layout.xml
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModel.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationFeatureViewModel.java
similarity index 99%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModel.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationFeatureViewModel.java
index d5d2af0..a0414e6 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModel.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationFeatureViewModel.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.app.feature;
+package org.apache.isis.extensions.secman.model.dom.features;
 
 import java.util.List;
 import java.util.SortedSet;
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/dom/features/ApplicationFeatureViewModels.java
similarity index 98%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModels.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationFeatureViewModels.java
index 3c8c8e4..dd485c4 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/dom/features/ApplicationFeatureViewModels.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.app.feature;
+package org.apache.isis.extensions.secman.model.dom.features;
 
 import java.util.Collection;
 import java.util.List;
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/dom/features/ApplicationPackage.java
similarity index 97%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationPackage.java
index fd32549..67db6ff 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/dom/features/ApplicationPackage.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.app.feature;
+package org.apache.isis.extensions.secman.model.dom.features;
 
 import java.util.List;
 import java.util.SortedSet;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationPackage.layout.xml
similarity index 100%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPackage.layout.xml
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationPackage.layout.xml
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPermission_feature.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationPermission_feature.java
similarity index 97%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPermission_feature.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationPermission_feature.java
index 304c4be..a97fba0 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationPermission_feature.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationPermission_feature.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.app.feature;
+package org.apache.isis.extensions.secman.model.dom.features;
 
 import javax.inject.Inject;
 
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/ApplicationUser_filterPermissions.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_filterPermissions.java
similarity index 98%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/ApplicationUser_filterPermissions.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_filterPermissions.java
index b6ed9b1..d9fe4af 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/ApplicationUser_filterPermissions.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_filterPermissions.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.app.user;
+package org.apache.isis.extensions.secman.model.dom.user;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/ApplicationUser_permissions.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_permissions.java
similarity index 97%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/ApplicationUser_permissions.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_permissions.java
index f357af5..e8e326d 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/ApplicationUser_permissions.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_permissions.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.app.user;
+package org.apache.isis.extensions.secman.model.dom.user;
 
 
 import java.util.List;
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/dom/user/MeService.java
similarity index 98%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/MeService.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/MeService.java
index e5c4f6d..2e0fb25 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/dom/user/MeService.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.app.user;
+package org.apache.isis.extensions.secman.model.dom.user;
 
 import java.util.concurrent.Callable;
 
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/dom/user/UserPermissionViewModel.java
similarity index 99%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/UserPermissionViewModel.java
index cf82d24..e9ab332 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/dom/user/UserPermissionViewModel.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.app.user;
+package org.apache.isis.extensions.secman.model.dom.user;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
@@ -55,7 +55,7 @@ import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionVal
 import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionValueSet;
 import org.apache.isis.extensions.secman.api.user.ApplicationUser;
 import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
-import org.apache.isis.extensions.secman.model.app.feature.ApplicationFeatureViewModel;
+import org.apache.isis.extensions.secman.model.dom.features.ApplicationFeatureViewModel;
 
 import lombok.val;
 
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/UserPermissionViewModel.layout.xml
similarity index 100%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/UserPermissionViewModel.layout.xml
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/UserPermissionViewModel.layout.xml
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.java
index 70e84f3..2e05546 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.java
@@ -24,11 +24,11 @@ import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMod
 import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRule;
 import org.apache.isis.extensions.secman.jdo.dom.role.ApplicationRole;
 import org.apache.isis.extensions.secman.jdo.dom.user.ApplicationUser;
-import org.apache.isis.extensions.secman.model.app.user.MeService;
+import org.apache.isis.extensions.secman.model.dom.user.MeService;
 
 /**
  * Role for regular users of the security module, providing the ability to lookup their user account using the
- * {@link org.apache.isis.extensions.secman.model.app.user.MeService}, and for viewing and maintaining their user details.
+ * {@link org.apache.isis.extensions.secman.model.dom.user.MeService}, and for viewing and maintaining their user details.
  *
  * @since 2.0 {@index}
  */
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.java
index d9a12f5..f25cdda 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/scripts/IsisExtSecmanRegularUserRoleAndPermissions.java
@@ -24,11 +24,11 @@ import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMod
 import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRule;
 import org.apache.isis.extensions.secman.jpa.dom.role.ApplicationRole;
 import org.apache.isis.extensions.secman.jpa.dom.user.ApplicationUser;
-import org.apache.isis.extensions.secman.model.app.user.MeService;
+import org.apache.isis.extensions.secman.model.dom.user.MeService;
 
 /**
  * Role for regular users of the security module, providing the ability to lookup their user account using the
- * {@link org.apache.isis.extensions.secman.model.app.user.MeService}, and for viewing and maintaining their user details.
+ * {@link org.apache.isis.extensions.secman.model.dom.user.MeService}, and for viewing and maintaining their user details.
  *
  * @since 2.0 {@index}
  */