[isis] branch master updated: ISIS-2614: explicitly register MeService

[ah...@apache.org]

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 c9ae3d3  ISIS-2614: explicitly register MeService
c9ae3d3 is described below

commit c9ae3d3e94789b3ba4a7c520effe3af60db5693a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Apr 22 17:06:14 2021 +0200

    ISIS-2614: explicitly register MeService
---
 .../isis/extensions/secman/model/IsisModuleExtSecmanModel.java     | 6 +++++-
 .../secman/model/menu}/ImpersonateMenuAdvisorForSecman.java        | 7 +++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisModuleExtSecmanModel.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisModuleExtSecmanModel.java
index e7f9dc1..5701aa7 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisModuleExtSecmanModel.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/IsisModuleExtSecmanModel.java
@@ -18,7 +18,6 @@
  */
 package org.apache.isis.extensions.secman.model;
 
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
@@ -29,7 +28,9 @@ import org.apache.isis.extensions.secman.model.dom.permission.ApplicationPermiss
 import org.apache.isis.extensions.secman.model.dom.role.ApplicationRoleMenu;
 import org.apache.isis.extensions.secman.model.dom.tenancy.ApplicationTenancyMenu;
 import org.apache.isis.extensions.secman.model.dom.user.ApplicationUserMenu;
+import org.apache.isis.extensions.secman.model.dom.user.MeService;
 import org.apache.isis.extensions.secman.model.facets.TenantedAuthorizationFacetFactory;
+import org.apache.isis.extensions.secman.model.menu.ImpersonateMenuAdvisorForSecman;
 
 /**
  * @since 2.0 {@index}
@@ -46,6 +47,9 @@ import org.apache.isis.extensions.secman.model.facets.TenantedAuthorizationFacet
         ApplicationRoleMenu.class,
         ApplicationTenancyMenu.class,
         ApplicationUserMenu.class,
+        
+        //ImpersonateMenuAdvisorForSecman.class, //not activated by default yet
+        MeService.class,
 
         // @Component
         TenantedAuthorizationFacetFactory.Register.class,
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/core/runtimeservices/user/ImpersonateMenuAdvisorForSecman.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/menu/ImpersonateMenuAdvisorForSecman.java
similarity index 93%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/core/runtimeservices/user/ImpersonateMenuAdvisorForSecman.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/menu/ImpersonateMenuAdvisorForSecman.java
index 667bcc7..f7c6d22 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/core/runtimeservices/user/ImpersonateMenuAdvisorForSecman.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/menu/ImpersonateMenuAdvisorForSecman.java
@@ -1,4 +1,4 @@
-package org.apache.isis.core.runtimeservices.user;
+package org.apache.isis.extensions.secman.model.menu;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -7,14 +7,13 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Primary;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 
 import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.applib.services.user.UserService;
 import org.apache.isis.applib.services.user.ImpersonateMenuAdvisor;
+import org.apache.isis.applib.services.user.UserService;
 import org.apache.isis.extensions.secman.api.role.ApplicationRole;
 import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
 import org.apache.isis.extensions.secman.api.user.ApplicationUser;
@@ -25,7 +24,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.val;
 
 @Service
-@Named("isis.runtimeservices.ImpersonateMenuAdvisorDefault")
+@Named("isis.ext.secman.ImpersonateMenuAdvisorForSecman")
 @Order(OrderPrecedence.MIDPOINT)
 @Qualifier("Default")
 @RequiredArgsConstructor(onConstructor_ = {@Inject})