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 2020/09/28 17:38:55 UTC

[isis] branch master updated: ISIS-2438: SecMan: don't enforce 'isissecurity' schema creation

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 8278f22  ISIS-2438: SecMan: don't enforce 'isissecurity' schema creation
8278f22 is described below

commit 8278f22988df76f7a6843be634a882bffac6babc
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Sep 28 19:38:41 2020 +0200

    ISIS-2438: SecMan: don't enforce 'isissecurity' schema creation
---
 .../main/java/org/apache/isis/commons/internal/context/_Context.java    | 2 --
 .../extensions/secman/jdo/dom/permission/ApplicationPermission.java     | 1 -
 .../org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java | 1 -
 .../isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java      | 1 -
 .../org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java | 1 -
 5 files changed, 6 deletions(-)

diff --git a/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java b/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
index 079c649..782b69e 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
@@ -32,8 +32,6 @@ import org.apache.isis.commons.internal.base._NullSafe;
 import org.apache.isis.commons.internal.base._With;
 import org.apache.isis.commons.internal.collections._Lists;
 
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
 /**
  * <h1>- internal use only -</h1>
  * <p>
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 ad24fbc..319edbc 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
@@ -86,7 +86,6 @@ import lombok.experimental.UtilityClass;
  */
 @javax.jdo.annotations.PersistenceCapable(
         identityType = IdentityType.DATASTORE,
-        schema = "isissecurity",
         table = "ApplicationPermission")
 @javax.jdo.annotations.Inheritance(
         strategy = InheritanceStrategy.NEW_TABLE)
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 182cbf3..2aba23c 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
@@ -55,7 +55,6 @@ import lombok.Setter;
 
 @javax.jdo.annotations.PersistenceCapable(
         identityType = IdentityType.DATASTORE,
-        schema = "isissecurity",
         table = "ApplicationRole")
 @javax.jdo.annotations.Inheritance(
         strategy = InheritanceStrategy.NEW_TABLE)
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 fd60f3b..058c142 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
@@ -48,7 +48,6 @@ import lombok.Setter;
 
 @javax.jdo.annotations.PersistenceCapable(
         identityType = IdentityType.APPLICATION,
-        schema = "isissecurity",
         table = "ApplicationTenancy")
 @javax.jdo.annotations.Inheritance(
         strategy = InheritanceStrategy.NEW_TABLE)
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 0e0daca..ad27e1e 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
@@ -64,7 +64,6 @@ import lombok.val;
 
 @javax.jdo.annotations.PersistenceCapable(
         identityType = IdentityType.DATASTORE,
-        schema = "isissecurity",
         table = "ApplicationUser")
 @javax.jdo.annotations.Inheritance(
         strategy = InheritanceStrategy.NEW_TABLE)