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/04/22 10:49:15 UTC

[isis] branch master updated: ISIS-2614: fix provisioning issues

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 a3044b5  ISIS-2614: fix provisioning issues
a3044b5 is described below

commit a3044b560a513aaae4166a241e9cd175cfc44430
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Apr 22 12:48:50 2021 +0200

    ISIS-2614: fix provisioning issues
---
 .../jdo/IsisModuleExtSecmanPersistenceJdo.java     | 27 +++++++++++++---------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisModuleExtSecmanPersistenceJdo.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisModuleExtSecmanPersistenceJdo.java
index 856cdc3..9dba5b5 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisModuleExtSecmanPersistenceJdo.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/IsisModuleExtSecmanPersistenceJdo.java
@@ -21,10 +21,14 @@ package org.apache.isis.extensions.secman.jdo;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRepository;
-import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
-import org.apache.isis.extensions.secman.api.tenancy.ApplicationTenancyRepository;
-import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
+import org.apache.isis.extensions.secman.jdo.dom.permission.ApplicationPermission;
+import org.apache.isis.extensions.secman.jdo.dom.permission.ApplicationPermissionRepository;
+import org.apache.isis.extensions.secman.jdo.dom.role.ApplicationRole;
+import org.apache.isis.extensions.secman.jdo.dom.role.ApplicationRoleRepository;
+import org.apache.isis.extensions.secman.jdo.dom.tenancy.ApplicationTenancy;
+import org.apache.isis.extensions.secman.jdo.dom.tenancy.ApplicationTenancyRepository;
+import org.apache.isis.extensions.secman.jdo.dom.user.ApplicationUser;
+import org.apache.isis.extensions.secman.jdo.dom.user.ApplicationUserRepository;
 import org.apache.isis.extensions.secman.jdo.seed.SeedSecurityModuleService;
 import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
 
@@ -43,13 +47,14 @@ import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
         ApplicationUserRepository.class,
         SeedSecurityModuleService.class,
 
-        // pretty sure we don't need to import/register these view models
-//        ApplicationPermission.class,
-//        ApplicationRole.class,
-//        ApplicationTenancy.class,
-//        ApplicationUser.class,
-
-
+        // JDO entities
+        // required to be listed in order for Spring to pick them up, 
+        // such that as a side-effect these get eagerly introspected by the framework;
+        // whereas the JPA counterpart makes use of the @EntityScan annotation instead
+        ApplicationPermission.class,
+        ApplicationRole.class,
+        ApplicationTenancy.class,
+        ApplicationUser.class,
 })
 public class IsisModuleExtSecmanPersistenceJdo {