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/17 11:31:24 UTC

[isis] branch master updated: ISIS-2480: SecMan/JPA: activates separate schema for SecMan entities

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 1ab9285  ISIS-2480: SecMan/JPA: activates separate schema for SecMan entities
1ab9285 is described below

commit 1ab9285d7d3f80913bf6e6180158e6431da60e08
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jan 17 12:31:10 2021 +0100

    ISIS-2480: SecMan/JPA: activates separate schema for SecMan entities
---
 examples/demo/web/src/main/java/demoapp/web/DemoAppManifest.java      | 2 +-
 .../isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java    | 2 +-
 .../extensions/secman/jpa/dom/permission/ApplicationPermission.java   | 2 +-
 .../apache/isis/extensions/secman/jpa/dom/role/ApplicationRole.java   | 2 +-
 .../isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancy.java    | 2 +-
 .../apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java   | 2 +-
 .../isis/extensions/secman/jpa/seed/SeedSecurityModuleService.java    | 2 +-
 .../extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.java    | 4 ++--
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifest.java b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifest.java
index 2456ca9..639691b 100644
--- a/examples/demo/web/src/main/java/demoapp/web/DemoAppManifest.java
+++ b/examples/demo/web/src/main/java/demoapp/web/DemoAppManifest.java
@@ -75,7 +75,7 @@ import demoapp.web.security.PrototypeActionsVisibilityAdvisor;
     // CORS
     IsisModuleExtCorsImpl.class,
     
-    IsisModuleTestingH2ConsoleUi.class,
+    IsisModuleTestingH2ConsoleUi.class, // enables the H2 console menu item
     IsisModuleExtExcelDownloadUi.class, // allows for collection download as excel
 
     // services
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 d72d2c1..b566cac 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
@@ -52,7 +52,7 @@ public class SeedSecurityModuleService {
         log.debug("received app lifecycle event {}", event);
 
         if (event.isPostMetamodel()) {
-        	log.info("SEED security fixtures JDO");
+        	log.info("SEED security fixtures (JDO)");
 
             fixtureScripts.run(new SeedUsersAndRolesFixtureScript());
         }
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 4b98680..241cac3 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
@@ -66,7 +66,7 @@ import lombok.experimental.UtilityClass;
 
 @Entity
 @Table(
-//        schema = "isisExtensionsSecman",
+        schema = "isisExtensionsSecman",
         name = "ApplicationPermission", 
         uniqueConstraints=
             @UniqueConstraint(
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 1e7ab5e..3ca6266 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
@@ -63,7 +63,7 @@ import lombok.Setter;
 
 @Entity
 @Table(
-//        schema = "isisExtensionsSecman",
+        schema = "isisExtensionsSecman",
         name = "ApplicationRole", 
         uniqueConstraints =
             @UniqueConstraint(
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 51c460c..faf99e7 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
@@ -52,7 +52,7 @@ import lombok.Setter;
 
 @Entity
 @Table(
-//        schema = "isisExtensionsSecman",
+        schema = "isisExtensionsSecman",
         name = "ApplicationTenancy", 
         uniqueConstraints =
             @UniqueConstraint(
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 9ec2069..d369f21 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
@@ -73,7 +73,7 @@ import lombok.val;
 
 @Entity
 @Table(
-//        schema = "isisExtensionsSecman",
+        schema = "isisExtensionsSecman",
         name = "ApplicationUser", 
         uniqueConstraints =
             @UniqueConstraint(
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 a784383..3d9a521 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
@@ -52,7 +52,7 @@ public class SeedSecurityModuleService {
         log.debug("received app lifecycle event {}", event);
 
         if (event.isPostMetamodel()) {
-        	log.info("SEED security fixtures JPA");
+        	log.info("SEED security fixtures (JPA)");
 
             fixtureScripts.run(new SeedUsersAndRolesFixtureScript());
         }
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.java
index 5a4e335..9f601fb 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/seed/SeedUsersAndRolesFixtureScript.java
@@ -31,9 +31,9 @@ import org.apache.isis.extensions.secman.jpa.seed.scripts.IsisModuleSecurityRegu
 
 /**
  * This fixture script will be run automatically on start-up by virtue of the fact that the
- * {@link org.apache.isis.extensions.secman.SeedSecurityModuleService.seed.SeedSecurityModuleService} is a
+ * {@link org.apache.isis.extensions.secman.jpa.seed.SeedSecurityModuleService} is a
  * {@link org.apache.isis.applib.annotation.DomainService} and calls the setup during its
- * {@link org.apache.isis.extensions.secman.SeedSecurityModuleService.seed.SeedSecurityModuleService#init() init} 
+ * {@link org.apache.isis.extensions.secman.jpa.seed.SeedSecurityModuleService#init() init} 
  * ({@link javax.annotation.PostConstruct}) method.
  */
 public class SeedUsersAndRolesFixtureScript extends FixtureScript {