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 2019/09/25 23:06:39 UTC
[isis] 02/03: ISIS-2062: factors out isis-security-bypass.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 3998aba4fb200b670d04eb29f9f6fae5c42607b2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 25 20:25:32 2019 +0100
ISIS-2062: factors out isis-security-bypass.
---
core/pom.xml | 11 +++++++++--
core/security/{ => api}/_adoc/antora.yml | 0
core/security/{plugins/shiro => api}/_adoc/examples.csv | 0
.../shiro => api}/_adoc/modules/ROOT/_attributes.adoc | 0
.../_adoc/modules/ROOT/assets/attachments}/.gitkeep | 0
.../security/security-apis-impl/security-apis-impl.pptx | Bin
.../_adoc/modules/ROOT/examples}/.gitkeep | 0
.../{plugins/shiro => api}/_adoc/modules/ROOT/nav.adoc | 0
.../_adoc/modules/ROOT/pages/_attributes.adoc | 0
.../{ => api}/_adoc/modules/ROOT/pages/about.adoc | 0
.../_adoc/modules/ROOT/pages/api-for-applications.adoc | 0
.../_adoc/modules/ROOT/pages/usage-by-isis-viewers.adoc | 0
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
.../{ => api}/_adoc/modules/ROOT/partials/nav.adoc | 8 +++++---
.../{plugins/shiro => api}/_adoc/sync_examples.sh | 0
core/security/{api-and-bypass => api}/pom.xml | 0
.../security/authentication/AuthenticationRequest.java | 0
.../authentication/AuthenticationRequestAbstract.java | 0
.../authentication/AuthenticationRequestPassword.java | 0
.../security/authentication/AuthenticationSession.java | 0
.../authentication/AuthenticationSessionAbstract.java | 0
.../authentication/AuthenticationSessionProvider.java | 0
.../isis/security/authentication/MessageBroker.java | 0
.../fixtures/AuthenticationRequestLogonFixture.java | 0
.../fixtures/LogonFixtureAuthenticator.java | 0
.../security/authentication/health/HealthAuthSession.java | 0
.../authentication/manager/AuthenticationManager.java | 0
.../manager/AuthorizationManagerStandard.java | 0
.../authentication/manager/RegistrationDetails.java | 0
.../apache/isis/security/authentication/package-info.java | 0
.../singleuser/AuthenticationRequestSingleUser.java | 0
.../authentication/singleuser/SingleUserSession.java | 0
.../standard/AuthenticationManagerStandard.java | 0
.../security/authentication/standard/Authenticator.java | 0
.../authentication/standard/AuthenticatorAbstract.java | 0
.../authentication/standard/AuthenticatorDefault.java | 0
.../authentication/standard/NoAuthenticatorException.java | 0
.../standard/PasswordRequestAuthenticatorAbstract.java | 0
.../authentication/standard/RandomCodeGenerator.java | 0
.../standard/RandomCodeGenerator10Chars.java | 0
.../authentication/standard/RandomCodeGeneratorUUID.java | 0
.../isis/security/authentication/standard/Registrar.java | 0
.../standard/RegistrationDetailsPassword.java | 0
.../security/authentication/standard/SimpleSession.java | 0
.../authorization/manager/AuthorizationManager.java | 0
.../authorization/standard/AuthorizationConstants.java | 0
.../isis/security/authorization/standard/Authorizor.java | 0
.../apache/isis/security/EncodabilityContractTest.java | 0
.../fixture/LogonFixtureAuthenticatorTest.java | 0
.../authentication/standard/AuthenticatorDefaultTest.java | 0
.../standard/SimpleSessionEncodabilityNoRolesTest.java | 0
.../standard/SimpleSessionEncodabilityTestAbstract.java | 0
.../standard/SimpleSessionEncodabilityWithRolesTest.java | 0
.../StandardAuthenticationManager_AuthenticationTest.java | 0
.../StandardAuthenticationManager_AuthenticatorsTest.java | 0
core/security/{plugins/shiro => bypass}/_adoc/antora.yml | 4 ++--
core/security/{ => bypass}/_adoc/examples.csv | 0
.../{ => bypass}/_adoc/modules/ROOT/_attributes.adoc | 0
.../_adoc/modules/ROOT/assets/attachments}/.gitkeep | 0
.../security-apis-impl/configure-isis-to-use-bypass.PNG | Bin
.../_adoc/modules/ROOT/examples}/.gitkeep | 0
core/security/{ => bypass}/_adoc/modules/ROOT/nav.adoc | 0
.../_adoc/modules/ROOT/pages/_attributes.adoc | 0
.../shiro => bypass}/_adoc/modules/ROOT/pages/about.adoc | 7 +++++--
.../ROOT/pages/configuring-isis-to-use-bypass.adoc | 0
.../_adoc/modules/ROOT/partials}/_attributes.adoc | 0
core/security/{ => bypass}/_adoc/sync_examples.sh | 0
core/security/{api-and-bypass => bypass}/pom.xml | 14 +++++---------
.../org/apache/isis/security/IsisBootSecurityBypass.java | 0
.../authentication/bypass/AuthenticatorBypass.java | 0
.../security/authorization/bypass/AuthorizorBypass.java | 0
core/security/{plugins => }/shiro/NOTICE | 0
core/security/{plugins => }/shiro/_adoc/antora.yml | 0
core/security/{plugins => }/shiro/_adoc/examples.csv | 0
.../shiro/_adoc/modules/ROOT/_attributes.adoc | 0
.../_adoc/modules/ROOT/assets/attachments}/.gitkeep | 0
.../configuring-shiro/ldap/activeds-ldap-groups.png | Bin
.../ldap/activeds-ldap-mojo-partition.png | Bin
.../ldap/activeds-ldap-mojo-root-dse.png | Bin
.../ldap/activeds-ldap-sasl-authentication.png | Bin
.../configuring-shiro/ldap/activeds-ldap-users.png | Bin
.../security-apis-impl/configure-isis-to-use-shiro.png | Bin
.../configure-shiro-to-use-custom-jdbc-realm.png | Bin
.../configure-shiro-to-use-ini-realm.PNG | Bin
.../configure-shiro-to-use-isis-ldap-realm.PNG | Bin
...isaddons-security-module-realm-with-delegate-realm.PNG | Bin
...gure-shiro-to-use-isisaddons-security-module-realm.PNG | Bin
.../shiro/_adoc/modules/ROOT/examples/.gitkeep | 0
.../{plugins => }/shiro/_adoc/modules/ROOT/nav.adoc | 0
.../shiro/_adoc/modules/ROOT/pages/_attributes.adoc | 0
.../shiro/_adoc/modules/ROOT/pages/about.adoc | 0
.../modules/ROOT/pages/configuring-isis-to-use-shiro.adoc | 0
.../shiro/_adoc/modules/ROOT/pages/run-as.adoc | 0
.../shiro/_adoc/modules/ROOT/pages/shiro-caching.adoc | 0
.../pages/shiro-isis-enhanced-wildcard-permission.adoc | 0
.../modules/ROOT/pages/shiro-realm-implementations.adoc | 6 +-----
.../pages/shiro-realm-implementations}/_attributes.adoc | 0
.../ROOT/pages/shiro-realm-implementations/ini-realm.adoc | 0
.../shiro-realm-implementations/isis-ldap-realm.adoc | 0
.../isisaddons-security-module-realm.adoc | 0
.../pages/shiro-realm-implementations/jdbc-realm.adoc | 0
.../_adoc/modules/ROOT/partials}/_attributes.adoc | 0
core/security/{plugins => }/shiro/_adoc/sync_examples.sh | 0
core/security/{plugins => }/shiro/pom.xml | 2 +-
.../src/main/appended-resources/supplemental-models.xml | 0
.../apache/isis/security/shiro/IsisBootSecurityShiro.java | 0
.../isis/security/shiro/IsisLdapContextFactory.java | 0
.../org/apache/isis/security/shiro/IsisLdapRealm.java | 0
.../apache/isis/security/shiro/ShiroSecurityContext.java | 0
.../org/apache/isis/security/shiro/WebModuleShiro.java | 0
.../security/shiro/authentication/ShiroAuthenticator.java | 0
.../isis/security/shiro/authorization/IsisPermission.java | 0
.../shiro/authorization/IsisPermissionResolver.java | 0
.../security/shiro/authorization/ShiroAuthorizor.java | 0
.../shiro/permrolemapper/PermissionToRoleMapper.java | 0
.../permrolemapper/PermissionToRoleMapperFromIni.java | 0
.../permrolemapper/PermissionToRoleMapperFromString.java | 0
.../apache/isis/security/shiro/permrolemapper/Util.java | 0
.../isis/security/shiro/IsisPermissionTest_setParts.java | 0
.../security/shiro/IsisPermissionTest_typicalUsage.java | 0
.../ShiroAuthenticatorOrAuthorizorTest_authenticate.java | 0
...oAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java | 0
.../shiro/authorization/IsisPermissionTest_equals.java | 0
.../permrolemapper/PermissionToRoleMapperFromIniTest.java | 0
.../PermissionToRoleMapperFromStringTest.java | 0
.../security/shiro/permrolemapper/UtilTest_parse.java | 0
.../org/apache/isis/security/shiro/permrolemapper/my.ini | 0
.../{plugins => }/shiro/src/test/resources/shiro.ini | 0
examples/apps/simpleapp/module-simple/pom.xml | 5 +++++
examples/smoketests/pom.xml | 5 +++++
.../apache/isis/testdomain/jdo/JdoTestDomainPersona.java | 6 +++---
.../isis/testdomain/auditing/AuditerServiceTest.java | 7 +++++--
.../bootstrapping/JdoBootstrappingTest_usingFixtures.java | 5 +++--
.../commandexecution/BackgroundExecutionTest.java | 5 +++--
.../isis/testdomain/commandexecution/WrapperTest.java | 5 +++--
.../domainmodel/DomainModelTest_usingGoodDomain.java | 2 +-
.../isis/testdomain/publishing/PublisherServiceTest.java | 5 +++--
.../apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java | 3 ++-
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 3 ++-
.../isis/testdomain/timestamping/TimestampingTest.java | 5 +++--
.../testdomain/transactions/TransactionRollbackTest.java | 7 ++++---
.../TransactionRollbackTest_withTransactional.java | 5 +++--
site.yml | 7 +++++--
143 files changed, 78 insertions(+), 49 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 89e99e8..f86a70c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1367,6 +1367,12 @@
<artifactId>isis-security</artifactId>
<version>${isis.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-security-bypass</artifactId>
+ <version>${isis.version}</version>
+ </dependency>
+
<!-- core plugins -->
@@ -2465,7 +2471,8 @@
<module>runtime-extensions</module>
<module>runtime-web</module>
- <module>security/api-and-bypass</module>
+ <module>security/api</module>
+ <module>security/bypass</module>
<module>testsupport/unittestsupport</module>
<module>testsupport/integtestsupport</module>
@@ -2482,7 +2489,7 @@
<module>plugins/jaxrs-resteasy-4</module>
<module>plugins/jdo/common</module>
<module>plugins/jdo/datanucleus-5</module>
- <module>security/plugins/shiro</module>
+ <module>security/shiro</module>
<!-- to break cyclic dependencies some tests needed to be moved to their
own modules -->
diff --git a/core/security/_adoc/antora.yml b/core/security/api/_adoc/antora.yml
similarity index 100%
rename from core/security/_adoc/antora.yml
rename to core/security/api/_adoc/antora.yml
diff --git a/core/security/plugins/shiro/_adoc/examples.csv b/core/security/api/_adoc/examples.csv
similarity index 100%
copy from core/security/plugins/shiro/_adoc/examples.csv
copy to core/security/api/_adoc/examples.csv
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/_attributes.adoc b/core/security/api/_adoc/modules/ROOT/_attributes.adoc
similarity index 100%
copy from core/security/plugins/shiro/_adoc/modules/ROOT/_attributes.adoc
copy to core/security/api/_adoc/modules/ROOT/_attributes.adoc
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/examples/.gitkeep b/core/security/api/_adoc/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
copy from core/security/plugins/shiro/_adoc/modules/ROOT/examples/.gitkeep
copy to core/security/api/_adoc/modules/ROOT/assets/attachments/.gitkeep
diff --git a/core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/security-apis-impl.pptx b/core/security/api/_adoc/modules/ROOT/assets/images/security/security-apis-impl/security-apis-impl.pptx
similarity index 100%
rename from core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/security-apis-impl.pptx
rename to core/security/api/_adoc/modules/ROOT/assets/images/security/security-apis-impl/security-apis-impl.pptx
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/assets/attachments/.gitkeep b/core/security/api/_adoc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to core/security/api/_adoc/modules/ROOT/examples/.gitkeep
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/nav.adoc b/core/security/api/_adoc/modules/ROOT/nav.adoc
similarity index 100%
copy from core/security/plugins/shiro/_adoc/modules/ROOT/nav.adoc
copy to core/security/api/_adoc/modules/ROOT/nav.adoc
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/pages/_attributes.adoc b/core/security/api/_adoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
copy from core/security/plugins/shiro/_adoc/modules/ROOT/pages/_attributes.adoc
copy to core/security/api/_adoc/modules/ROOT/pages/_attributes.adoc
diff --git a/core/security/_adoc/modules/ROOT/pages/about.adoc b/core/security/api/_adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from core/security/_adoc/modules/ROOT/pages/about.adoc
rename to core/security/api/_adoc/modules/ROOT/pages/about.adoc
diff --git a/core/security/_adoc/modules/ROOT/pages/api-for-applications.adoc b/core/security/api/_adoc/modules/ROOT/pages/api-for-applications.adoc
similarity index 100%
rename from core/security/_adoc/modules/ROOT/pages/api-for-applications.adoc
rename to core/security/api/_adoc/modules/ROOT/pages/api-for-applications.adoc
diff --git a/core/security/_adoc/modules/ROOT/pages/usage-by-isis-viewers.adoc b/core/security/api/_adoc/modules/ROOT/pages/usage-by-isis-viewers.adoc
similarity index 100%
rename from core/security/_adoc/modules/ROOT/pages/usage-by-isis-viewers.adoc
rename to core/security/api/_adoc/modules/ROOT/pages/usage-by-isis-viewers.adoc
diff --git a/core/security/_adoc/modules/ROOT/partials/_attributes.adoc b/core/security/api/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
rename from core/security/_adoc/modules/ROOT/partials/_attributes.adoc
rename to core/security/api/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/core/security/_adoc/modules/ROOT/partials/nav.adoc b/core/security/api/_adoc/modules/ROOT/partials/nav.adoc
similarity index 88%
rename from core/security/_adoc/modules/ROOT/partials/nav.adoc
rename to core/security/api/_adoc/modules/ROOT/partials/nav.adoc
index 4c0892e..4b41f61 100644
--- a/core/security/_adoc/modules/ROOT/partials/nav.adoc
+++ b/core/security/api/_adoc/modules/ROOT/partials/nav.adoc
@@ -1,9 +1,12 @@
* xref:security:ROOT:about.adoc[Security]
-** xref:security:ROOT:configuring-isis-to-use-bypass.adoc[Configuring Isis to use Bypass]
+** xref:security:ROOT:api-for-applications.adoc[API for Applications]
+
+** Bypass
+*** xref:security-bypass:ROOT:configuring-isis-to-use-bypass.adoc[Configuring to use Bypass]
** Shiro
-*** xref:security-shiro:ROOT:configuring-isis-to-use-shiro.adoc[Configuring Isis to use Shiro]
+*** xref:security-shiro:ROOT:configuring-isis-to-use-shiro.adoc[Configuring to use Shiro]
*** xref:security-shiro:ROOT:shiro-realm-implementations.adoc[Shiro Realm Implementations]
**** xref:security-shiro:ROOT:shiro-realm-implementations/ini-realm.adoc[INI Realm]
**** xref:security-shiro:ROOT:shiro-realm-implementations/isis-ldap-realm.adoc[Isis LDAP Realm]
@@ -13,7 +16,6 @@
*** xref:security-shiro:ROOT:run-as.adoc[Run As]
*** xref:security-shiro:ROOT:shiro-caching.adoc[Shiro Caching]
-** xref:security:ROOT:api-for-applications.adoc[API for Applications]
** xref:security:ROOT:usage-by-isis-viewers.adoc[Usage by Isis Viewers]
diff --git a/core/security/plugins/shiro/_adoc/sync_examples.sh b/core/security/api/_adoc/sync_examples.sh
similarity index 100%
copy from core/security/plugins/shiro/_adoc/sync_examples.sh
copy to core/security/api/_adoc/sync_examples.sh
diff --git a/core/security/api-and-bypass/pom.xml b/core/security/api/pom.xml
similarity index 100%
copy from core/security/api-and-bypass/pom.xml
copy to core/security/api/pom.xml
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationRequest.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationRequest.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationRequest.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationRequest.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestAbstract.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestAbstract.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestAbstract.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestAbstract.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestPassword.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestPassword.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestPassword.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestPassword.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationSession.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationSession.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationSession.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationSession.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionAbstract.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionAbstract.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionAbstract.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionAbstract.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionProvider.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionProvider.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionProvider.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionProvider.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/MessageBroker.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/MessageBroker.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/MessageBroker.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/MessageBroker.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/fixtures/AuthenticationRequestLogonFixture.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/fixtures/LogonFixtureAuthenticator.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/fixtures/LogonFixtureAuthenticator.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/fixtures/LogonFixtureAuthenticator.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/fixtures/LogonFixtureAuthenticator.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/health/HealthAuthSession.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/health/HealthAuthSession.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/health/HealthAuthSession.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/health/HealthAuthSession.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/manager/AuthenticationManager.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/manager/AuthenticationManager.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/manager/AuthenticationManager.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/manager/AuthenticationManager.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/manager/AuthorizationManagerStandard.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/manager/AuthorizationManagerStandard.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/manager/AuthorizationManagerStandard.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/manager/AuthorizationManagerStandard.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/manager/RegistrationDetails.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/manager/RegistrationDetails.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/manager/RegistrationDetails.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/manager/RegistrationDetails.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/package-info.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/package-info.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/package-info.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/package-info.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/singleuser/AuthenticationRequestSingleUser.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/singleuser/AuthenticationRequestSingleUser.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/singleuser/AuthenticationRequestSingleUser.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/singleuser/AuthenticationRequestSingleUser.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/singleuser/SingleUserSession.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/singleuser/SingleUserSession.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/singleuser/SingleUserSession.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/singleuser/SingleUserSession.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/AuthenticationManagerStandard.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/AuthenticationManagerStandard.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/AuthenticationManagerStandard.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/standard/AuthenticationManagerStandard.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/Authenticator.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/Authenticator.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/Authenticator.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/standard/Authenticator.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorAbstract.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorAbstract.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorAbstract.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorAbstract.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorDefault.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorDefault.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorDefault.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorDefault.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/NoAuthenticatorException.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/NoAuthenticatorException.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/NoAuthenticatorException.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/standard/NoAuthenticatorException.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/PasswordRequestAuthenticatorAbstract.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/PasswordRequestAuthenticatorAbstract.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/PasswordRequestAuthenticatorAbstract.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/standard/PasswordRequestAuthenticatorAbstract.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator10Chars.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator10Chars.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator10Chars.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator10Chars.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGeneratorUUID.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGeneratorUUID.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGeneratorUUID.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGeneratorUUID.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/Registrar.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/Registrar.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/Registrar.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/standard/Registrar.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/RegistrationDetailsPassword.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RegistrationDetailsPassword.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/RegistrationDetailsPassword.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RegistrationDetailsPassword.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/SimpleSession.java b/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/SimpleSession.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/standard/SimpleSession.java
rename to core/security/api/src/main/java/org/apache/isis/security/authentication/standard/SimpleSession.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authorization/manager/AuthorizationManager.java b/core/security/api/src/main/java/org/apache/isis/security/authorization/manager/AuthorizationManager.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authorization/manager/AuthorizationManager.java
rename to core/security/api/src/main/java/org/apache/isis/security/authorization/manager/AuthorizationManager.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authorization/standard/AuthorizationConstants.java b/core/security/api/src/main/java/org/apache/isis/security/authorization/standard/AuthorizationConstants.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authorization/standard/AuthorizationConstants.java
rename to core/security/api/src/main/java/org/apache/isis/security/authorization/standard/AuthorizationConstants.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authorization/standard/Authorizor.java b/core/security/api/src/main/java/org/apache/isis/security/authorization/standard/Authorizor.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authorization/standard/Authorizor.java
rename to core/security/api/src/main/java/org/apache/isis/security/authorization/standard/Authorizor.java
diff --git a/core/security/api-and-bypass/src/test/java/org/apache/isis/security/EncodabilityContractTest.java b/core/security/api/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
similarity index 100%
rename from core/security/api-and-bypass/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
rename to core/security/api/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
diff --git a/core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/fixture/LogonFixtureAuthenticatorTest.java b/core/security/api/src/test/java/org/apache/isis/security/authentication/fixture/LogonFixtureAuthenticatorTest.java
similarity index 100%
rename from core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/fixture/LogonFixtureAuthenticatorTest.java
rename to core/security/api/src/test/java/org/apache/isis/security/authentication/fixture/LogonFixtureAuthenticatorTest.java
diff --git a/core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java b/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
similarity index 100%
rename from core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
rename to core/security/api/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
diff --git a/core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java b/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
similarity index 100%
rename from core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
rename to core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
diff --git a/core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java b/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
similarity index 100%
rename from core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
rename to core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
diff --git a/core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java b/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
similarity index 100%
rename from core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
rename to core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
diff --git a/core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java b/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
similarity index 100%
rename from core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
rename to core/security/api/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
diff --git a/core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java b/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
similarity index 100%
rename from core/security/api-and-bypass/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
rename to core/security/api/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
diff --git a/core/security/plugins/shiro/_adoc/antora.yml b/core/security/bypass/_adoc/antora.yml
similarity index 59%
copy from core/security/plugins/shiro/_adoc/antora.yml
copy to core/security/bypass/_adoc/antora.yml
index 87adb67..9a49270 100644
--- a/core/security/plugins/shiro/_adoc/antora.yml
+++ b/core/security/bypass/_adoc/antora.yml
@@ -1,5 +1,5 @@
-name: security-shiro
-title: "Security - Shiro"
+name: security-bypass
+title: "Security - Bypass"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/core/security/_adoc/examples.csv b/core/security/bypass/_adoc/examples.csv
similarity index 100%
rename from core/security/_adoc/examples.csv
rename to core/security/bypass/_adoc/examples.csv
diff --git a/core/security/_adoc/modules/ROOT/_attributes.adoc b/core/security/bypass/_adoc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from core/security/_adoc/modules/ROOT/_attributes.adoc
rename to core/security/bypass/_adoc/modules/ROOT/_attributes.adoc
diff --git a/core/security/_adoc/modules/ROOT/examples/.gitkeep b/core/security/bypass/_adoc/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from core/security/_adoc/modules/ROOT/examples/.gitkeep
rename to core/security/bypass/_adoc/modules/ROOT/assets/attachments/.gitkeep
diff --git a/core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG b/core/security/bypass/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
similarity index 100%
rename from core/security/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
rename to core/security/bypass/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
diff --git a/core/security/_adoc/modules/ROOT/assets/attachments/.gitkeep b/core/security/bypass/_adoc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from core/security/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to core/security/bypass/_adoc/modules/ROOT/examples/.gitkeep
diff --git a/core/security/_adoc/modules/ROOT/nav.adoc b/core/security/bypass/_adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from core/security/_adoc/modules/ROOT/nav.adoc
rename to core/security/bypass/_adoc/modules/ROOT/nav.adoc
diff --git a/core/security/_adoc/modules/ROOT/pages/_attributes.adoc b/core/security/bypass/_adoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from core/security/_adoc/modules/ROOT/pages/_attributes.adoc
rename to core/security/bypass/_adoc/modules/ROOT/pages/_attributes.adoc
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/pages/about.adoc b/core/security/bypass/_adoc/modules/ROOT/pages/about.adoc
similarity index 81%
copy from core/security/plugins/shiro/_adoc/modules/ROOT/pages/about.adoc
copy to core/security/bypass/_adoc/modules/ROOT/pages/about.adoc
index 54d76c5..d72ade5 100644
--- a/core/security/plugins/shiro/_adoc/modules/ROOT/pages/about.adoc
+++ b/core/security/bypass/_adoc/modules/ROOT/pages/about.adoc
@@ -1,6 +1,9 @@
-= Shiro Security
+= Bypass
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
:page-partial:
-This guide describes the configuration of the Shiro implementation of Apache Isis' `Authenticator and `Authorizor` APIs.
+The bypass implementation, as its name suggests, allows both authentication and authorization to be bypassed.
+
+This is typically used for integration tests or for prototyping.
+
diff --git a/core/security/_adoc/modules/ROOT/pages/configuring-isis-to-use-bypass.adoc b/core/security/bypass/_adoc/modules/ROOT/pages/configuring-isis-to-use-bypass.adoc
similarity index 100%
rename from core/security/_adoc/modules/ROOT/pages/configuring-isis-to-use-bypass.adoc
rename to core/security/bypass/_adoc/modules/ROOT/pages/configuring-isis-to-use-bypass.adoc
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/pages/_attributes.adoc b/core/security/bypass/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/security/plugins/shiro/_adoc/modules/ROOT/pages/_attributes.adoc
copy to core/security/bypass/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/core/security/_adoc/sync_examples.sh b/core/security/bypass/_adoc/sync_examples.sh
similarity index 100%
rename from core/security/_adoc/sync_examples.sh
rename to core/security/bypass/_adoc/sync_examples.sh
diff --git a/core/security/api-and-bypass/pom.xml b/core/security/bypass/pom.xml
similarity index 89%
rename from core/security/api-and-bypass/pom.xml
rename to core/security/bypass/pom.xml
index 03fdb4c..0dd8869 100644
--- a/core/security/api-and-bypass/pom.xml
+++ b/core/security/bypass/pom.xml
@@ -27,22 +27,18 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-security</artifactId>
- <name>Apache Isis Security + Bypass</name>
+ <artifactId>isis-security-bypass</artifactId>
+ <name>Apache Isis Security - Bypass Implementation</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.security</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/security</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.security.bypass</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/security/bypass</git-plugin.propertiesDir>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-config</artifactId>
+ <artifactId>isis-security</artifactId>
</dependency>
</dependencies>
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java b/core/security/bypass/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java
rename to core/security/bypass/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/bypass/AuthenticatorBypass.java b/core/security/bypass/src/main/java/org/apache/isis/security/authentication/bypass/AuthenticatorBypass.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authentication/bypass/AuthenticatorBypass.java
rename to core/security/bypass/src/main/java/org/apache/isis/security/authentication/bypass/AuthenticatorBypass.java
diff --git a/core/security/api-and-bypass/src/main/java/org/apache/isis/security/authorization/bypass/AuthorizorBypass.java b/core/security/bypass/src/main/java/org/apache/isis/security/authorization/bypass/AuthorizorBypass.java
similarity index 100%
rename from core/security/api-and-bypass/src/main/java/org/apache/isis/security/authorization/bypass/AuthorizorBypass.java
rename to core/security/bypass/src/main/java/org/apache/isis/security/authorization/bypass/AuthorizorBypass.java
diff --git a/core/security/plugins/shiro/NOTICE b/core/security/shiro/NOTICE
similarity index 100%
rename from core/security/plugins/shiro/NOTICE
rename to core/security/shiro/NOTICE
diff --git a/core/security/plugins/shiro/_adoc/antora.yml b/core/security/shiro/_adoc/antora.yml
similarity index 100%
rename from core/security/plugins/shiro/_adoc/antora.yml
rename to core/security/shiro/_adoc/antora.yml
diff --git a/core/security/plugins/shiro/_adoc/examples.csv b/core/security/shiro/_adoc/examples.csv
similarity index 100%
rename from core/security/plugins/shiro/_adoc/examples.csv
rename to core/security/shiro/_adoc/examples.csv
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/_attributes.adoc b/core/security/shiro/_adoc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/_attributes.adoc
rename to core/security/shiro/_adoc/modules/ROOT/_attributes.adoc
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/examples/.gitkeep b/core/security/shiro/_adoc/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
copy from core/security/plugins/shiro/_adoc/modules/ROOT/examples/.gitkeep
copy to core/security/shiro/_adoc/modules/ROOT/assets/attachments/.gitkeep
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png b/core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
rename to core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png b/core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
rename to core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png b/core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
rename to core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png b/core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
rename to core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png b/core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
rename to core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-shiro.png b/core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-shiro.png
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-shiro.png
rename to core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-shiro.png
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png b/core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png
rename to core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG b/core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG
rename to core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG b/core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG
rename to core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG b/core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
rename to core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm.PNG b/core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm.PNG
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm.PNG
rename to core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isisaddons-security-module-realm.PNG
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/examples/.gitkeep b/core/security/shiro/_adoc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/examples/.gitkeep
rename to core/security/shiro/_adoc/modules/ROOT/examples/.gitkeep
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/nav.adoc b/core/security/shiro/_adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/nav.adoc
rename to core/security/shiro/_adoc/modules/ROOT/nav.adoc
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/pages/_attributes.adoc b/core/security/shiro/_adoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/pages/_attributes.adoc
rename to core/security/shiro/_adoc/modules/ROOT/pages/_attributes.adoc
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/pages/about.adoc b/core/security/shiro/_adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/pages/about.adoc
rename to core/security/shiro/_adoc/modules/ROOT/pages/about.adoc
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/pages/configuring-isis-to-use-shiro.adoc b/core/security/shiro/_adoc/modules/ROOT/pages/configuring-isis-to-use-shiro.adoc
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/pages/configuring-isis-to-use-shiro.adoc
rename to core/security/shiro/_adoc/modules/ROOT/pages/configuring-isis-to-use-shiro.adoc
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/pages/run-as.adoc b/core/security/shiro/_adoc/modules/ROOT/pages/run-as.adoc
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/pages/run-as.adoc
rename to core/security/shiro/_adoc/modules/ROOT/pages/run-as.adoc
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/pages/shiro-caching.adoc b/core/security/shiro/_adoc/modules/ROOT/pages/shiro-caching.adoc
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/pages/shiro-caching.adoc
rename to core/security/shiro/_adoc/modules/ROOT/pages/shiro-caching.adoc
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/pages/shiro-isis-enhanced-wildcard-permission.adoc b/core/security/shiro/_adoc/modules/ROOT/pages/shiro-isis-enhanced-wildcard-permission.adoc
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/pages/shiro-isis-enhanced-wildcard-permission.adoc
rename to core/security/shiro/_adoc/modules/ROOT/pages/shiro-isis-enhanced-wildcard-permission.adoc
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations.adoc b/core/security/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations.adoc
similarity index 92%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations.adoc
rename to core/security/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations.adoc
index 2d7d90f..704923a 100644
--- a/core/security/plugins/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations.adoc
+++ b/core/security/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations.adoc
@@ -5,8 +5,4 @@ include::_attributes.adoc[]
:page-partial:
The Shiro concept of a `Realm` allows different implementations of both the authentication and authorisation mechanism to be plugged in.
-This chapter lists some of these
-
-supports the pluggable realm implementations
-
-
+This chapter describes a number of these implementations.
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/partials/_attributes.adoc b/core/security/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/_attributes.adoc
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/partials/_attributes.adoc
rename to core/security/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/_attributes.adoc
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/ini-realm.adoc b/core/security/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/ini-realm.adoc
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/ini-realm.adoc
rename to core/security/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/ini-realm.adoc
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/isis-ldap-realm.adoc b/core/security/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/isis-ldap-realm.adoc
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/isis-ldap-realm.adoc
rename to core/security/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/isis-ldap-realm.adoc
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/isisaddons-security-module-realm.adoc b/core/security/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/isisaddons-security-module-realm.adoc
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/isisaddons-security-module-realm.adoc
rename to core/security/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/isisaddons-security-module-realm.adoc
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/jdbc-realm.adoc b/core/security/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/jdbc-realm.adoc
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/jdbc-realm.adoc
rename to core/security/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/jdbc-realm.adoc
diff --git a/core/security/plugins/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/_attributes.adoc b/core/security/shiro/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
rename from core/security/plugins/shiro/_adoc/modules/ROOT/pages/shiro-realm-implementations/_attributes.adoc
rename to core/security/shiro/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/core/security/plugins/shiro/_adoc/sync_examples.sh b/core/security/shiro/_adoc/sync_examples.sh
similarity index 100%
rename from core/security/plugins/shiro/_adoc/sync_examples.sh
rename to core/security/shiro/_adoc/sync_examples.sh
diff --git a/core/security/plugins/shiro/pom.xml b/core/security/shiro/pom.xml
similarity index 99%
rename from core/security/plugins/shiro/pom.xml
rename to core/security/shiro/pom.xml
index 933442e..f939626 100644
--- a/core/security/plugins/shiro/pom.xml
+++ b/core/security/shiro/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
<version>${revision}</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>isis-plugins-security-shiro</artifactId>
diff --git a/core/security/plugins/shiro/src/main/appended-resources/supplemental-models.xml b/core/security/shiro/src/main/appended-resources/supplemental-models.xml
similarity index 100%
rename from core/security/plugins/shiro/src/main/appended-resources/supplemental-models.xml
rename to core/security/shiro/src/main/appended-resources/supplemental-models.xml
diff --git a/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java
similarity index 100%
rename from core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java
rename to core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java
diff --git a/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapContextFactory.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapContextFactory.java
similarity index 100%
rename from core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapContextFactory.java
rename to core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapContextFactory.java
diff --git a/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java
similarity index 100%
rename from core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java
rename to core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisLdapRealm.java
diff --git a/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java
similarity index 100%
rename from core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java
rename to core/security/shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java
diff --git a/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java
similarity index 100%
rename from core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java
rename to core/security/shiro/src/main/java/org/apache/isis/security/shiro/WebModuleShiro.java
diff --git a/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java
similarity index 100%
rename from core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java
rename to core/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java
diff --git a/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
similarity index 100%
rename from core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
rename to core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
diff --git a/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java
similarity index 100%
rename from core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java
rename to core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java
diff --git a/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java
similarity index 100%
rename from core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java
rename to core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java
diff --git a/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java
similarity index 100%
rename from core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java
rename to core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java
diff --git a/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java
similarity index 100%
rename from core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java
rename to core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java
diff --git a/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java
similarity index 100%
rename from core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java
rename to core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java
diff --git a/core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java
similarity index 100%
rename from core/security/plugins/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java
rename to core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java
diff --git a/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
similarity index 100%
rename from core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
rename to core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
diff --git a/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
similarity index 100%
rename from core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
rename to core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
diff --git a/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
similarity index 100%
rename from core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
rename to core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
diff --git a/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
similarity index 100%
rename from core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
rename to core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
diff --git a/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java
similarity index 100%
rename from core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java
rename to core/security/shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java
diff --git a/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
similarity index 100%
rename from core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
rename to core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
diff --git a/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
similarity index 100%
rename from core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
rename to core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
diff --git a/core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java b/core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java
similarity index 100%
rename from core/security/plugins/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java
rename to core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java
diff --git a/core/security/plugins/shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini b/core/security/shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini
similarity index 100%
rename from core/security/plugins/shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini
rename to core/security/shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini
diff --git a/core/security/plugins/shiro/src/test/resources/shiro.ini b/core/security/shiro/src/test/resources/shiro.ini
similarity index 100%
rename from core/security/plugins/shiro/src/test/resources/shiro.ini
rename to core/security/shiro/src/test/resources/shiro.ini
diff --git a/examples/apps/simpleapp/module-simple/pom.xml b/examples/apps/simpleapp/module-simple/pom.xml
index d6dbf16..c1bbec9 100644
--- a/examples/apps/simpleapp/module-simple/pom.xml
+++ b/examples/apps/simpleapp/module-simple/pom.xml
@@ -71,6 +71,11 @@
<!-- TESTS -->
<dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-security-bypass</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
<type>pom</type>
diff --git a/examples/smoketests/pom.xml b/examples/smoketests/pom.xml
index a9f1fc3..0e939cd 100644
--- a/examples/smoketests/pom.xml
+++ b/examples/smoketests/pom.xml
@@ -39,6 +39,11 @@
<type>pom</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-security-bypass</artifactId>
+ </dependency>
+
<!-- ISIS CORE PLUGINS -->
<dependency>
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java
index 70f53f3..5e5bf6e 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java
@@ -35,11 +35,11 @@ import org.apache.isis.testdomain.ldap.LdapConstants;
import lombok.val;
public enum JdoTestDomainPersona
-implements PersonaWithBuilderScript<BuilderScriptAbstract<? extends Object>> {
+implements PersonaWithBuilderScript<BuilderScriptAbstract<?>> {
PurgeAll {
@Override
- public BuilderScriptAbstract<?> builder() {
+ public BuilderScriptWithoutResult builder() {
return new BuilderScriptWithoutResult() {
@Override
@@ -64,7 +64,7 @@ implements PersonaWithBuilderScript<BuilderScriptAbstract<? extends Object>> {
InventoryWith1Book {
@Override
- public BuilderScriptAbstract<?> builder() {
+ public BuilderScriptWithResult<Inventory> builder() {
return new BuilderScriptWithResult<Inventory>() {
@Override
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
index d27639e..20d2f1a 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
@@ -26,6 +26,9 @@ import java.util.UUID;
import javax.inject.Inject;
import javax.inject.Singleton;
+import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
+import org.apache.isis.extensions.fixtures.fixturescripts.BuilderScriptAbstract;
+import org.apache.isis.testdomain.domainmodel.DomainModelTest_usingGoodDomain;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@@ -70,10 +73,10 @@ class AuditerServiceTest {
void setUp() {
// cleanup
- fixtureScripts.runPersona(JdoTestDomainPersona.PurgeAll);
+ fixtureScripts.runPersona((PersonaWithBuilderScript) JdoTestDomainPersona.PurgeAll);
// given
- fixtureScripts.runPersona(JdoTestDomainPersona.InventoryWith1Book);
+ fixtureScripts.runPersona((PersonaWithBuilderScript) JdoTestDomainPersona.InventoryWith1Book);
}
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
index 228c93f..72efc33 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
@@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import javax.inject.Inject;
+import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@@ -55,10 +56,10 @@ class JdoBootstrappingTest_usingFixtures {
void setUp() {
// cleanup
- fixtureScripts.runPersona(JdoTestDomainPersona.PurgeAll);
+ fixtureScripts.runPersona((PersonaWithBuilderScript) JdoTestDomainPersona.PurgeAll);
// given
- fixtureScripts.runPersona(JdoTestDomainPersona.InventoryWith1Book);
+ fixtureScripts.runPersona((PersonaWithBuilderScript) JdoTestDomainPersona.InventoryWith1Book);
}
@Test
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/BackgroundExecutionTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/BackgroundExecutionTest.java
index f18bd22..c3b9539 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/BackgroundExecutionTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/BackgroundExecutionTest.java
@@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
+import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -71,10 +72,10 @@ class BackgroundExecutionTest {
@BeforeEach
void setUp() {
// cleanup
- fixtureScripts.runPersona(JdoTestDomainPersona.PurgeAll);
+ fixtureScripts.runPersona((PersonaWithBuilderScript) JdoTestDomainPersona.PurgeAll);
// given
- fixtureScripts.runPersona(JdoTestDomainPersona.InventoryWith1Book);
+ fixtureScripts.runPersona((PersonaWithBuilderScript) JdoTestDomainPersona.InventoryWith1Book);
}
@Test
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperTest.java
index 3d90d88..f86b562 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperTest.java
@@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
+import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@@ -71,10 +72,10 @@ class WrapperTest {
@BeforeEach
void setUp() {
// cleanup
- fixtureScripts.runPersona(JdoTestDomainPersona.PurgeAll);
+ fixtureScripts.runPersona((PersonaWithBuilderScript) JdoTestDomainPersona.PurgeAll);
// given
- fixtureScripts.runPersona(JdoTestDomainPersona.InventoryWith1Book);
+ fixtureScripts.runPersona((PersonaWithBuilderScript) JdoTestDomainPersona.InventoryWith1Book);
}
@Test
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index 0278d03..a4ed800 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -43,7 +43,7 @@ import lombok.val;
IsisPresets.DebugProgrammingModel,
})
-class DomainModelTest_usingGoodDomain {
+public class DomainModelTest_usingGoodDomain {
// @Inject private MetaModelService metaModelService;
// @Inject private JaxbService jaxbService;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
index a1b8fa4..3346305 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
@@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import javax.inject.Inject;
import javax.inject.Singleton;
+import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
@@ -69,10 +70,10 @@ class PublisherServiceTest {
void setUp() {
// cleanup
- fixtureScripts.runPersona(JdoTestDomainPersona.PurgeAll);
+ fixtureScripts.runPersona((PersonaWithBuilderScript)JdoTestDomainPersona.PurgeAll);
// given
- fixtureScripts.runPersona(JdoTestDomainPersona.InventoryWith1Book);
+ fixtureScripts.runPersona((PersonaWithBuilderScript)JdoTestDomainPersona.InventoryWith1Book);
}
@Test @Order(1)
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
index b7924dc..da7535a 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
@@ -26,6 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import javax.inject.Inject;
+import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.authc.CredentialsException;
@@ -99,7 +100,7 @@ class ShiroSecmanLdapTest extends AbstractShiroTest {
@BeforeEach
void setupSvenInDb() {
// given
- fixtureScripts.runPersona(JdoTestDomainPersona.SvenApplicationUser);
+ fixtureScripts.runPersona((PersonaWithBuilderScript)JdoTestDomainPersona.SvenApplicationUser);
}
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
index 86fa5b0..8c926d9 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
@@ -26,6 +26,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import javax.inject.Inject;
+import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -101,7 +102,7 @@ class ShiroSecmanLdap_restfulStressTest extends AbstractShiroTest {
@BeforeEach
void setupSvenInDb() {
// given
- fixtureScripts.runPersona(JdoTestDomainPersona.SvenApplicationUser);
+ fixtureScripts.runPersona((PersonaWithBuilderScript)JdoTestDomainPersona.SvenApplicationUser);
}
@Test
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
index 9cf9f45..bd48b9a 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
@@ -20,6 +20,7 @@ package org.apache.isis.testdomain.timestamping;
import javax.inject.Inject;
+import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@@ -54,10 +55,10 @@ class TimestampingTest {
void setUp() {
// cleanup
- fixtureScripts.runPersona(JdoTestDomainPersona.PurgeAll);
+ fixtureScripts.runPersona((PersonaWithBuilderScript)JdoTestDomainPersona.PurgeAll);
// given
- fixtureScripts.runPersona(JdoTestDomainPersona.InventoryWith1Book);
+ fixtureScripts.runPersona((PersonaWithBuilderScript)JdoTestDomainPersona.InventoryWith1Book);
}
@Test
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
index 1a9d451..e17cb24 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
@@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import javax.inject.Inject;
+import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@@ -53,7 +54,7 @@ class TransactionRollbackTest {
@BeforeEach
void setUp() {
// cleanup
- fixtureScripts.runPersona(JdoTestDomainPersona.PurgeAll);
+ fixtureScripts.runPersona((PersonaWithBuilderScript)JdoTestDomainPersona.PurgeAll);
}
@@ -65,7 +66,7 @@ class TransactionRollbackTest {
transactionService.executeWithinTransaction(()->{
- fixtureScripts.runPersona(JdoTestDomainPersona.InventoryWith1Book);
+ fixtureScripts.runPersona((PersonaWithBuilderScript)JdoTestDomainPersona.InventoryWith1Book);
});
@@ -84,7 +85,7 @@ class TransactionRollbackTest {
transactionService.executeWithinTransaction(()->{
- fixtureScripts.runPersona(JdoTestDomainPersona.InventoryWith1Book);
+ fixtureScripts.runPersona((PersonaWithBuilderScript)JdoTestDomainPersona.InventoryWith1Book);
throw _Exceptions.unrecoverable("Test: force current tx to rollback");
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_withTransactional.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_withTransactional.java
index 5fe95aa..c90e988 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_withTransactional.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_withTransactional.java
@@ -22,6 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import javax.inject.Inject;
+import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
@@ -62,12 +63,12 @@ class TransactionRollbackTest_withTransactional {
void happyCaseTx_shouldCommit() {
// cleanup just in case
- fixtureScripts.runPersona(JdoTestDomainPersona.PurgeAll);
+ fixtureScripts.runPersona((PersonaWithBuilderScript)JdoTestDomainPersona.PurgeAll);
// expected pre condition
assertEquals(0, repository.allInstances(Book.class).size());
- fixtureScripts.runPersona(JdoTestDomainPersona.InventoryWith1Book);
+ fixtureScripts.runPersona((PersonaWithBuilderScript)JdoTestDomainPersona.InventoryWith1Book);
// expected post condition
assertEquals(1, repository.allInstances(Book.class).size());
diff --git a/site.yml b/site.yml
index efc4208..a33386a 100644
--- a/site.yml
+++ b/site.yml
@@ -77,10 +77,13 @@ content:
branches: HEAD
- url: .
- start_path: core/security/_adoc
+ start_path: core/security/api/_adoc
branches: HEAD
- url: .
- start_path: core/security/plugins/shiro/_adoc
+ start_path: core/security/bypass/_adoc
+ branches: HEAD
+ - url: .
+ start_path: core/security/shiro/_adoc
branches: HEAD
- url: .
branches: HEAD