You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/06/25 15:36:44 UTC
[isis] branch ISIS-2767 updated (9f09ae0 -> 7aad617)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-2767
in repository https://gitbox.apache.org/repos/asf/isis.git.
discard 9f09ae0 ISIS-2767: fixes mapping for JPA users/roles (?)
add f99aeaf ISIS-1720: prepare splitting of NamedFacet into specialized facet-types
add e89ce0e ISIS-2483: adds note to mignotes re: @DomainObject(autoCompleteMethod=)
add 4499143 ISIS-2483: fixes some doc formatting
add d4f8e9e ISIS-2769: removes WithPrereqs for BuilderScripts
add dfc3ff8 Merge pull request #635 from apache/ISIS-2769
new 7aad617 ISIS-2767: fixes mapping for JPA users/roles (?)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (9f09ae0)
\
N -- N -- N refs/heads/ISIS-2767 (7aad617)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../modules/ROOT/pages/2021/2.0.0-M6/mignotes.adoc | 30 ++++++++-------
.../NamedFacetForActionLayoutAnnotation.java | 2 +-
.../actions/layout/NamedFacetForActionXml.java | 2 +-
.../facets/all/described/DescribedAsFacet.java | 4 +-
.../all/described/DescribedAsFacetAbstract.java | 10 ++---
.../HasStaticText.java} | 4 +-
.../I8nStaticFacetAbstract.java} | 12 +++---
.../facets/all/i8n/{ => staatic}/NounForm.java | 2 +-
.../facets/all/i8n/{ => staatic}/NounForms.java | 2 +-
.../metamodel/facets/all/named/NamedFacet.java | 4 +-
.../facets/all/named/NamedFacetAbstract.java | 10 ++---
.../facets/all/named/NamedFacetForMemberName.java | 2 +-
.../all/named/NamedFacetForMemberNameAbstract.java | 4 +-
.../NamedFacetForCollectionLayoutAnnotation.java | 2 +-
.../layout/NamedFacetForCollectionXml.java | 2 +-
.../facets/fallback/FallbackFacetFactory.java | 2 +-
.../fallback/NamedFacetFallbackFromMemberName.java | 2 +-
.../metamodel/facets/fallback/NamedFacetNone.java | 2 +-
.../method/DescribedAsFacetForMemberViaMethod.java | 4 +-
.../named/method/NamedFacetForMemberViaMethod.java | 4 +-
.../NamedFacetForDomainObjectLayoutAnnotation.java | 4 +-
.../NamedFacetForDomainObjectXml.java | 4 +-
...NamedFacetForDomainServiceLayoutAnnotation.java | 2 +-
.../NamedFacetForParameterLayoutAnnotation.java | 2 +-
.../NamedFacetForParameterUsingReflection.java | 2 +-
.../NamedFacetForPropertyLayoutAnnotation.java | 2 +-
.../propertylayout/NamedFacetForPropertyXml.java | 2 +-
.../core/metamodel/layout/LayoutFacetUtil.java | 16 ++++----
.../all/i18n/TranslationPostProcessor.java | 6 +--
.../core/metamodel/spec/ObjectSpecification.java | 11 +++---
.../isis/core/metamodel/spec/Specification.java | 6 ---
.../core/metamodel/spec/feature/ObjectFeature.java | 20 +++++++++-
.../specloader/specimpl/ObjectActionMixedIn.java | 2 +-
.../specimpl/ObjectActionParameterAbstract.java | 14 +++----
.../specloader/specimpl/ObjectMemberAbstract.java | 5 ++-
.../specimpl/ObjectSpecificationAbstract.java | 2 +-
.../specimpl/OneToManyAssociationMixedIn.java | 2 +-
.../specimpl/OneToOneAssociationMixedIn.java | 2 +-
.../specimpl/dflt/ObjectSpecificationDefault.java | 2 +-
...etForCollectionLayoutAnnotationFactoryTest.java | 8 ++--
.../DomainObjectLayoutFactoryTest.java | 8 ++--
...cetForParameterLayoutAnnotationFactoryTest.java | 10 ++---
.../facets/param/name/ParameterNameFacetTest.java | 8 ++--
...acetForPropertyLayoutAnnotationFactoryTest.java | 8 ++--
.../objects/ObjectActionLayoutXmlDefaultTest.java | 2 +-
.../objects/OneToManyAssociationDefaultTest.java | 6 +--
...ionParameterAbstractTest_getId_and_getName.java | 4 +-
.../menubars/bootstrap3/MenuBarsServiceBS3.java | 8 ++--
.../main/adoc/modules/webapp/pages/webmodules.adoc | 21 +++++++---
.../testdomain/interact/NewParameterModelTest.java | 4 +-
.../security/shiro/webmodule/WebModuleShiro.java | 2 +-
.../applib/fixturescripts/FixtureScript.java | 17 --------
.../applib/personas/BuilderScriptAbstract.java | 25 +-----------
.../fixtures/applib/personas/WithPrereqs.java | 45 ----------------------
.../models/EntityCollectionModelStandalone.java | 2 +-
55 files changed, 165 insertions(+), 225 deletions(-)
rename core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i8n/{HasTranslation.java => staatic/HasStaticText.java} (90%)
rename core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i8n/{I8nFacetAbstract.java => staatic/I8nStaticFacetAbstract.java} (92%)
rename core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i8n/{ => staatic}/NounForm.java (96%)
rename core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i8n/{ => staatic}/NounForms.java (98%)
delete mode 100644 testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/personas/WithPrereqs.java
[isis] 01/01: ISIS-2767: fixes mapping for JPA users/roles (?)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2767
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7aad617acb3ced9de6706753d5221dcb0dfdf211
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jun 25 09:50:55 2021 +0100
ISIS-2767: fixes mapping for JPA users/roles (?)
---
.../apache/isis/extensions/secman/jpa/role/dom/ApplicationRole.java | 5 ++++-
.../apache/isis/extensions/secman/jpa/user/dom/ApplicationUser.java | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/role/dom/ApplicationRole.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/role/dom/ApplicationRole.java
index 514a4f5..2ee2fde 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/role/dom/ApplicationRole.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/role/dom/ApplicationRole.java
@@ -21,11 +21,14 @@ package org.apache.isis.extensions.secman.jpa.role.dom;
import java.util.Set;
import java.util.TreeSet;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EntityListeners;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
@@ -118,7 +121,7 @@ public class ApplicationRole
// -- USERS
@Users
- @ManyToMany
+ @ManyToMany(mappedBy = "roles", cascade = {CascadeType.MERGE, CascadeType.PERSIST})
private Set<org.apache.isis.extensions.secman.jpa.user.dom.ApplicationUser> users = new TreeSet<>();
@Users
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/user/dom/ApplicationUser.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/user/dom/ApplicationUser.java
index 94fc23b..70ee2f3 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/user/dom/ApplicationUser.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/user/dom/ApplicationUser.java
@@ -280,8 +280,9 @@ public class ApplicationUser
// ROLES
- @ManyToMany(mappedBy = "users", cascade = {CascadeType.MERGE, CascadeType.PERSIST})
+ @ManyToMany(cascade = {CascadeType.MERGE, CascadeType.PERSIST})
@JoinTable(
+ schema = "isisExtensionsSecman",
name = "ApplicationUserRoles",
joinColumns = {@JoinColumn(name = "userId")},
inverseJoinColumns = {@JoinColumn(name = "roleId")})