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/05/28 16:49:36 UTC
[isis] branch master updated: ISIS-2706: remove ApplicationTenancy
workaround
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 ca1785e ISIS-2706: remove ApplicationTenancy workaround
ca1785e is described below
commit ca1785ec38b50560679efb6b4533e9c8c3f48638
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri May 28 18:49:24 2021 +0200
ISIS-2706: remove ApplicationTenancy workaround
---
.../extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java
index 719f56d..247b46c 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/tenancy/dom/ApplicationTenancy.java
@@ -24,7 +24,6 @@ import java.util.TreeSet;
import javax.persistence.Column;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
@@ -80,11 +79,6 @@ public class ApplicationTenancy
extends org.apache.isis.extensions.secman.applib.tenancy.dom.ApplicationTenancy {
- // TODO: ISIS-2706: revert this (and make atPath the @Id instead)
- @Id
- @GeneratedValue
- private Long id;
-
@Version
private Long version;
@@ -107,7 +101,7 @@ public class ApplicationTenancy
// -- PATH
-// @Id
+ @Id
@Column(nullable = false, length = Path.MAX_LENGTH)
private String path;