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 2022/08/24 04:36:13 UTC

[isis] branch master updated: ISIS-3169: update mignotes

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 84dc9e2c18 ISIS-3169: update mignotes
84dc9e2c18 is described below

commit 84dc9e2c180a31bd0db0a9fa430cbfd8068b390a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Aug 24 06:36:10 2022 +0200

    ISIS-3169: update mignotes
    
    also fixes reg. test. incubating build
---
 .../modules/ROOT/pages/2022/2.0.0-M8/mignotes.adoc | 30 +++++++++++++++++++++-
 .../isis/testdomain/shiro/ShiroSecmanLdapTest.java |  4 +--
 .../shiro/ShiroSecmanLdap_restfulStressTest.java   |  4 +--
 .../isis/testdomain/shiro/ShiroSecmanTest.java     |  4 +--
 4 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-M8/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-M8/mignotes.adoc
index 77f779f376..91c93b277a 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-M8/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-M8/mignotes.adoc
@@ -126,6 +126,34 @@ Folder moved `/isis-parent` -> `/bom`
 <artifactId>isis-bom</artifactId>
 ----
 
+=== Extensions
+
+[source, xml]
+.secman
+----
+<!-- renamed
+	<groupId>org.apache.isis.extensions</groupId>
+	<artifactId>isis-extensions-secman-shiro-realm</artifactId>
+-->
+<!-- instead use ... -->
+<artifactId>isis-extensions-secman-delegated-shiro</artifactId>
+----
+
+Classes `IsisModuleExtSecmanShiroRealm` and 
+`AuthenticationStrategyForIsisModuleSecurityRealm` 
+were moved and renamed. (see shiro.ini)
+
+[source, ini]
+.shiro.ini
+----
+## renamed
+#authenticationStrategy=org.apache.isis.extensions.secman.shiro.AuthenticationStrategyForIsisModuleSecurityRealm
+#isisModuleSecurityRealm=org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanShiroRealm
+## instead use
+authenticationStrategy=org.apache.isis.extensions.secman.delegated.shiro.realm.AuthenticationStrategyForSecMan
+isisModuleSecurityRealm=org.apache.isis.extensions.secman.delegated.shiro.realm.IsisModuleExtSecmanShiroRealm
+----
+
 === Restclient
 
 [source, java]
@@ -252,5 +280,5 @@ import org.apache.isis.viewer.restfulobjects.client.RestfulClientConfig;
 IsisModuleValSseApplib renamed to IsisModuleExtSseApplib
 IsisModuleValSseMetaModel renamed to IsisModuleExtSseMetaModel
 IsisModuleValSseUiWkt renamed to IsisModuleExtSseWicket 
-
 ----
+
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
index 5b515fb158..71b44183d9 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
@@ -40,12 +40,12 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.core.config.presets.IsisPresets;
+import org.apache.isis.extensions.secman.delegated.shiro.realm.IsisModuleExtSecmanShiroRealm;
 import org.apache.isis.extensions.secman.encryption.spring.IsisModuleExtSecmanEncryptionSpring;
 import org.apache.isis.extensions.secman.integration.IsisModuleExtSecmanIntegration;
 import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
 import org.apache.isis.extensions.secman.jdo.role.dom.ApplicationRoleRepository;
 import org.apache.isis.extensions.secman.jdo.user.dom.ApplicationUserRepository;
-import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
 import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
 import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
 import org.apache.isis.testdomain.ldap.LdapConstants;
@@ -71,7 +71,7 @@ import lombok.val;
 
     // Security Manager Extension (secman)
     IsisModuleExtSecmanIntegration.class,
-    IsisModuleExtSecmanRealmShiro.class,
+    IsisModuleExtSecmanShiroRealm.class,
     IsisModuleExtSecmanPersistenceJdo.class,
     IsisModuleExtSecmanEncryptionSpring.class,
 })
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
index 921bb235be..01895a5640 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
@@ -38,10 +38,10 @@ import static org.junit.jupiter.api.Assertions.assertTimeout;
 
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.core.config.presets.IsisPresets;
+import org.apache.isis.extensions.secman.delegated.shiro.realm.IsisModuleExtSecmanShiroRealm;
 import org.apache.isis.extensions.secman.encryption.spring.IsisModuleExtSecmanEncryptionSpring;
 import org.apache.isis.extensions.secman.integration.IsisModuleExtSecmanIntegration;
 import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
-import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
 import org.apache.isis.security.shiro.webmodule.WebModuleShiro;
 import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
 import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
@@ -73,7 +73,7 @@ import lombok.val;
 
     // Security Manager Extension (secman)
     IsisModuleExtSecmanIntegration.class,
-    IsisModuleExtSecmanRealmShiro.class,
+    IsisModuleExtSecmanShiroRealm.class,
     IsisModuleExtSecmanPersistenceJdo.class,
     IsisModuleExtSecmanEncryptionSpring.class,
 })
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
index e0ddc4b98d..c9b4880bf7 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanTest.java
@@ -38,10 +38,10 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.core.config.presets.IsisPresets;
+import org.apache.isis.extensions.secman.delegated.shiro.realm.IsisModuleExtSecmanShiroRealm;
 import org.apache.isis.extensions.secman.encryption.spring.IsisModuleExtSecmanEncryptionSpring;
 import org.apache.isis.extensions.secman.integration.IsisModuleExtSecmanIntegration;
 import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
-import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
 import org.apache.isis.testdomain.conf.Configuration_usingJdoAndShiro;
 
 import lombok.val;
@@ -53,7 +53,7 @@ import lombok.val;
 @Import({
     // Security Manager Extension (secman)
     IsisModuleExtSecmanIntegration.class,
-    IsisModuleExtSecmanRealmShiro.class,
+    IsisModuleExtSecmanShiroRealm.class,
     IsisModuleExtSecmanPersistenceJdo.class,
     IsisModuleExtSecmanEncryptionSpring.class,
 })