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 2020/01/10 15:22:20 UTC
[isis] 06/21: ISIS-2259: moves security modules up a level,
renames isis-security-api to isis-core-security
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c2e1e8de549803db9c68b93d75b7cbc076bf30fb
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 13:26:54 2020 +0000
ISIS-2259: moves security modules up a level, renames isis-security-api to isis-core-security
---
antora/playbooks/site.yml | 8 ++++----
core/metamodel/pom.xml | 2 +-
core/pom.xml | 10 +++++-----
core/security/{api => }/pom.xml | 4 ++--
core/security/{shiro => }/src/main/doc/antora.yml | 0
.../security-apis-impl/configure-isis-to-use-bypass.PNG | Bin
.../doc/modules/shiro => src/main/doc/modules/api}/nav.adoc | 0
.../{api => }/src/main/doc/modules/api/pages/about.adoc | 0
.../src/main/doc/modules/api/partials/module-nav.adoc | 0
.../org/apache/isis/security/api/IsisModuleSecurityApi.java | 0
.../security/api/authentication/AuthenticationRequest.java | 0
.../api/authentication/AuthenticationRequestAbstract.java | 0
.../api/authentication/AuthenticationRequestPassword.java | 0
.../security/api/authentication/AuthenticationSession.java | 0
.../api/authentication/AuthenticationSessionAbstract.java | 0
.../api/authentication/AuthenticationSessionProvider.java | 0
.../isis/security/api/authentication/MessageBroker.java | 0
.../fixtures/AuthenticationRequestLogonFixture.java | 0
.../api/authentication/health/HealthAuthSession.java | 0
.../api/authentication/manager/AuthenticationManager.java | 0
.../api/authentication/manager/RegistrationDetails.java | 0
.../singleuser/AuthenticationRequestSingleUser.java | 0
.../api/authentication/singleuser/SingleUserSession.java | 0
.../security/api/authentication/standard/Authenticator.java | 0
.../api/authentication/standard/AuthenticatorAbstract.java | 0
.../authentication/standard/NoAuthenticatorException.java | 0
.../api/authentication/standard/RandomCodeGenerator.java | 0
.../authentication/standard/RandomCodeGeneratorDefault.java | 0
.../security/api/authentication/standard/Registrar.java | 0
.../standard/RegistrationDetailsPassword.java | 0
.../security/api/authentication/standard/SimpleSession.java | 0
.../api/authorization/manager/AuthorizationManager.java | 0
.../api/authorization/standard/AuthorizationConstants.java | 0
.../security/api/authorization/standard/Authorizor.java | 0
.../org/apache/isis/security/EncodabilityContractTest.java | 0
.../standard/AuthenticationManager_authenticators_Test.java | 0
.../authentication/standard/AuthenticatorDefaultTest.java | 0
.../standard/SimpleSessionEncodabilityNoRolesTest.java | 0
.../standard/SimpleSessionEncodabilityTestAbstract.java | 0
.../standard/SimpleSessionEncodabilityWithRolesTest.java | 0
.../StandardAuthenticationManager_AuthenticationTest.java | 0
core/testsupport/integtestsupport/pom.xml | 2 +-
extensions/security/secman/pom.xml | 2 +-
legacy/testing/mavenplugin/pom.xml | 2 +-
mavendeps/webapp/pom.xml | 2 +-
{core/security => security}/bypass/pom.xml | 2 +-
.../keycloak => security/bypass}/src/main/doc/antora.yml | 0
.../security-apis-impl/configure-isis-to-use-bypass.PNG | Bin
.../bypass/src/main/doc/modules/bypass}/nav.adoc | 0
.../bypass/src/main/doc/modules/bypass/pages/about.adoc | 0
.../src/main/doc/modules/bypass/partials/module-nav.adoc | 0
.../isis/security/bypass/IsisModuleSecurityBypass.java | 0
.../security/bypass/authentication/AuthenticatorBypass.java | 0
.../security/bypass/authorization/AuthorizorBypass.java | 0
{core/security/shiro => security/keycloak}/NOTICE | 0
{core/security => security}/keycloak/pom.xml | 2 +-
.../bypass => security/keycloak}/src/main/doc/antora.yml | 0
.../keycloak/src/main/doc/modules/keycloak}/nav.adoc | 0
.../keycloak/src/main/doc/modules/keycloak/pages/about.adoc | 0
.../src/main/doc/modules/keycloak/partials/module-nav.adoc | 0
.../isis/security/keycloak/IsisModuleSecurityKeycloak.java | 0
.../keycloak/authentication/AuthenticatorKeycloak.java | 0
.../security/keycloak/authorization/AuthorizorKeycloak.java | 0
.../isis/security/keycloak/webmodule/KeycloakFilter.java | 0
.../isis/security/keycloak/webmodule/WebModuleKeycloak.java | 0
{core/security/keycloak => security/shiro}/NOTICE | 0
{core/security => security}/shiro/pom.xml | 2 +-
.../security/api => security/shiro}/src/main/doc/antora.yml | 0
.../images/configuration/configure-isis-to-use-shiro.png | Bin
.../ini/configure-shiro-to-use-ini-realm.png | Bin
.../jdbc/configure-shiro-to-use-custom-jdbc-realm.png | Bin
.../configuring-shiro/ldap/activeds-ldap-groups.png | Bin
.../configuring-shiro/ldap/activeds-ldap-mojo-partition.png | Bin
.../configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png | Bin
.../ldap/activeds-ldap-sasl-authentication.png | Bin
.../configuring-shiro/ldap/activeds-ldap-users.png | Bin
.../ldap/configure-shiro-to-use-isis-ldap-realm.png | Bin
.../shiro/src/main/doc/modules/shiro}/nav.adoc | 0
.../shiro/src/main/doc/modules/shiro/pages/about.adoc | 0
.../shiro/pages/about/configuring-isis-to-use-shiro.adoc | 0
.../shiro/pages/about/enhanced-wildcard-permission.adoc | 0
.../src/main/doc/modules/shiro/pages/about/ini-realm.adoc | 0
.../src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc | 0
.../src/main/doc/modules/shiro/pages/about/ldap-realm.adoc | 0
.../src/main/doc/modules/shiro/pages/about/run-as.adoc | 0
.../main/doc/modules/shiro/pages/about/shiro-caching.adoc | 0
.../src/main/doc/modules/shiro/partials/module-nav.adoc | 0
.../apache/isis/security/shiro/IsisModuleSecurityShiro.java | 0
.../security/shiro/authentication/AuthenticatorShiro.java | 0
.../isis/security/shiro/authorization/AuthorizorShiro.java | 0
.../isis/security/shiro/authorization/IsisPermission.java | 0
.../shiro/authorization/IsisPermissionResolver.java | 0
.../isis/security/shiro/context/ShiroSecurityContext.java | 0
.../shiro/permrolemapper/PermissionToRoleMapper.java | 0
.../shiro/permrolemapper/PermissionToRoleMapperFromIni.java | 0
.../permrolemapper/PermissionToRoleMapperFromString.java | 0
.../org/apache/isis/security/shiro/permrolemapper/Util.java | 0
.../isis/security/shiro/webmodule/WebModuleShiro.java | 0
.../isis/security/shiro/IsisPermissionTest_setParts.java | 0
.../security/shiro/IsisPermissionTest_typicalUsage.java | 0
.../ShiroAuthenticatorOrAuthorizorTest_authenticate.java | 0
...iroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java | 0
.../shiro/authorization/IsisPermissionTest_equals.java | 0
.../permrolemapper/PermissionToRoleMapperFromIniTest.java | 0
.../PermissionToRoleMapperFromStringTest.java | 0
.../isis/security/shiro/permrolemapper/UtilTest_parse.java | 0
.../org/apache/isis/security/shiro/permrolemapper/my.ini | 0
.../shiro/src/test/resources/shiro.ini | 0
.../ComparableByTitleContractTestAbstract_compareTo.java | 2 --
subdomains/excel/testing/pom.xml | 6 ++++++
.../fakedata/fixtures/IsisModuleTstFakeDataFixtures.java | 4 ++--
.../ui/components/AsciiDocPanelFactoriesForWicket.java | 2 +-
112 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 4367b42..15d28b5 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -85,16 +85,16 @@ content:
start_path: core/webapp/src/main/doc # core
branches: HEAD
- url: .
- start_path: core/security/api/src/main/doc # security
+ start_path: core/security/src/main/doc # security
branches: HEAD
- url: .
- start_path: core/security/bypass/src/main/doc # security
+ start_path: security/bypass/src/main/doc # security
branches: HEAD
- url: .
- start_path: core/security/shiro/src/main/doc # security
+ start_path: security/shiro/src/main/doc # security
branches: HEAD
- url: .
- start_path: core/security/keycloak/src/main/doc # security
+ start_path: security/keycloak/src/main/doc # security
branches: HEAD
- url: .
start_path: core/testsupport/unittestsupport/src/main/doc # testing
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 784478f..a8c428a 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-security-api</artifactId>
+ <artifactId>isis-core-security</artifactId>
</dependency>
<dependency>
diff --git a/core/pom.xml b/core/pom.xml
index e8a7739..b2f20a2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -851,7 +851,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-security-api</artifactId>
+ <artifactId>isis-core-security</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
@@ -1857,10 +1857,10 @@
<module>testsupport/unittestsupport</module>
<module>testsupport/integtestsupport</module>
- <module>security/api</module>
- <module>security/bypass</module>
- <module>security/shiro</module>
- <module>security/keycloak</module>
+ <module>security</module>
+ <module>../security/bypass</module>
+ <module>../security/shiro</module>
+ <module>../security/keycloak</module>
<module>viewers/restfulobjects</module>
<module>viewers/wicket</module>
diff --git a/core/security/api/pom.xml b/core/security/pom.xml
similarity index 96%
rename from core/security/api/pom.xml
rename to core/security/pom.xml
index efc15a1..d1d356a 100644
--- a/core/security/api/pom.xml
+++ b/core/security/pom.xml
@@ -27,8 +27,8 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-security-api</artifactId>
- <name>Apache Isis Security - API</name>
+ <artifactId>isis-core-security</artifactId>
+ <name>Apache Isis Core - Security</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.security.api</jar-plugin.automaticModuleName>
diff --git a/core/security/shiro/src/main/doc/antora.yml b/core/security/src/main/doc/antora.yml
similarity index 100%
rename from core/security/shiro/src/main/doc/antora.yml
rename to core/security/src/main/doc/antora.yml
diff --git a/core/security/bypass/src/main/doc/modules/bypass/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG b/core/security/src/main/doc/modules/api/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
similarity index 100%
rename from core/security/bypass/src/main/doc/modules/bypass/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
rename to core/security/src/main/doc/modules/api/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
diff --git a/core/security/shiro/src/main/doc/modules/shiro/nav.adoc b/core/security/src/main/doc/modules/api/nav.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/nav.adoc
rename to core/security/src/main/doc/modules/api/nav.adoc
diff --git a/core/security/api/src/main/doc/modules/api/pages/about.adoc b/core/security/src/main/doc/modules/api/pages/about.adoc
similarity index 100%
rename from core/security/api/src/main/doc/modules/api/pages/about.adoc
rename to core/security/src/main/doc/modules/api/pages/about.adoc
diff --git a/core/security/api/src/main/doc/modules/api/partials/module-nav.adoc b/core/security/src/main/doc/modules/api/partials/module-nav.adoc
similarity index 100%
rename from core/security/api/src/main/doc/modules/api/partials/module-nav.adoc
rename to core/security/src/main/doc/modules/api/partials/module-nav.adoc
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/IsisModuleSecurityApi.java b/core/security/src/main/java/org/apache/isis/security/api/IsisModuleSecurityApi.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/IsisModuleSecurityApi.java
rename to core/security/src/main/java/org/apache/isis/security/api/IsisModuleSecurityApi.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequest.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequest.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequest.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequest.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestAbstract.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestAbstract.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestAbstract.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestAbstract.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestPassword.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestPassword.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestPassword.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestPassword.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSession.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSession.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSession.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSession.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionAbstract.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionAbstract.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionAbstract.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionAbstract.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionProvider.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionProvider.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionProvider.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionProvider.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/MessageBroker.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/MessageBroker.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/MessageBroker.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/MessageBroker.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/fixtures/AuthenticationRequestLogonFixture.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/fixtures/AuthenticationRequestLogonFixture.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/fixtures/AuthenticationRequestLogonFixture.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/fixtures/AuthenticationRequestLogonFixture.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/health/HealthAuthSession.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/health/HealthAuthSession.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/health/HealthAuthSession.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/health/HealthAuthSession.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/manager/RegistrationDetails.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/manager/RegistrationDetails.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/manager/RegistrationDetails.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/manager/RegistrationDetails.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/singleuser/AuthenticationRequestSingleUser.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/AuthenticationRequestSingleUser.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/singleuser/AuthenticationRequestSingleUser.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/AuthenticationRequestSingleUser.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/singleuser/SingleUserSession.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/SingleUserSession.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/singleuser/SingleUserSession.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/SingleUserSession.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/Authenticator.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Authenticator.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/Authenticator.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Authenticator.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorAbstract.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorAbstract.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorAbstract.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorAbstract.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/NoAuthenticatorException.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/NoAuthenticatorException.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/NoAuthenticatorException.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/standard/NoAuthenticatorException.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGeneratorDefault.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGeneratorDefault.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGeneratorDefault.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGeneratorDefault.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/Registrar.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Registrar.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/Registrar.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Registrar.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RegistrationDetailsPassword.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RegistrationDetailsPassword.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RegistrationDetailsPassword.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RegistrationDetailsPassword.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/SimpleSession.java b/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/SimpleSession.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/SimpleSession.java
rename to core/security/src/main/java/org/apache/isis/security/api/authentication/standard/SimpleSession.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java b/core/security/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java
rename to core/security/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java b/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
rename to core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
diff --git a/core/security/api/src/main/java/org/apache/isis/security/api/authorization/standard/Authorizor.java b/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/Authorizor.java
similarity index 100%
rename from core/security/api/src/main/java/org/apache/isis/security/api/authorization/standard/Authorizor.java
rename to core/security/src/main/java/org/apache/isis/security/api/authorization/standard/Authorizor.java
diff --git a/core/security/api/src/test/java/org/apache/isis/security/EncodabilityContractTest.java b/core/security/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
similarity index 100%
rename from core/security/api/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
rename to core/security/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
diff --git a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
similarity index 100%
rename from core/security/api/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
rename to core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
diff --git a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
similarity index 100%
rename from core/security/api/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
rename to core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
diff --git a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
similarity index 100%
rename from core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
rename to core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
diff --git a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
similarity index 100%
rename from core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
rename to core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
diff --git a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
similarity index 100%
rename from core/security/api/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
rename to core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
diff --git a/core/security/api/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
similarity index 100%
rename from core/security/api/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
rename to core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
diff --git a/core/testsupport/integtestsupport/pom.xml b/core/testsupport/integtestsupport/pom.xml
index 73f0445..af521c4 100644
--- a/core/testsupport/integtestsupport/pom.xml
+++ b/core/testsupport/integtestsupport/pom.xml
@@ -138,7 +138,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-security-api</artifactId>
+ <artifactId>isis-core-security</artifactId>
</dependency>
<dependency>
diff --git a/extensions/security/secman/pom.xml b/extensions/security/secman/pom.xml
index f6d00c0..d01ecf6 100644
--- a/extensions/security/secman/pom.xml
+++ b/extensions/security/secman/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-security-api</artifactId>
+ <artifactId>isis-core-security</artifactId>
</dependency>
</dependencies>
diff --git a/legacy/testing/mavenplugin/pom.xml b/legacy/testing/mavenplugin/pom.xml
index 6c53607..029e5e7 100644
--- a/legacy/testing/mavenplugin/pom.xml
+++ b/legacy/testing/mavenplugin/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-security-api</artifactId>
+ <artifactId>isis-core-security</artifactId>
</dependency>
<dependency>
diff --git a/mavendeps/webapp/pom.xml b/mavendeps/webapp/pom.xml
index 5c316ce..3bf1fff 100644
--- a/mavendeps/webapp/pom.xml
+++ b/mavendeps/webapp/pom.xml
@@ -112,7 +112,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-security-api</artifactId>
+ <artifactId>isis-core-security</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/security/bypass/pom.xml b/security/bypass/pom.xml
similarity index 96%
rename from core/security/bypass/pom.xml
rename to security/bypass/pom.xml
index a8c672e..4e9446f 100644
--- a/core/security/bypass/pom.xml
+++ b/security/bypass/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>isis-security-bypass</artifactId>
diff --git a/core/security/keycloak/src/main/doc/antora.yml b/security/bypass/src/main/doc/antora.yml
similarity index 100%
rename from core/security/keycloak/src/main/doc/antora.yml
rename to security/bypass/src/main/doc/antora.yml
diff --git a/core/security/api/src/main/doc/modules/api/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG b/security/bypass/src/main/doc/modules/bypass/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
similarity index 100%
rename from core/security/api/src/main/doc/modules/api/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
rename to security/bypass/src/main/doc/modules/bypass/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
diff --git a/core/security/keycloak/src/main/doc/modules/keycloak/nav.adoc b/security/bypass/src/main/doc/modules/bypass/nav.adoc
similarity index 100%
rename from core/security/keycloak/src/main/doc/modules/keycloak/nav.adoc
rename to security/bypass/src/main/doc/modules/bypass/nav.adoc
diff --git a/core/security/bypass/src/main/doc/modules/bypass/pages/about.adoc b/security/bypass/src/main/doc/modules/bypass/pages/about.adoc
similarity index 100%
rename from core/security/bypass/src/main/doc/modules/bypass/pages/about.adoc
rename to security/bypass/src/main/doc/modules/bypass/pages/about.adoc
diff --git a/core/security/bypass/src/main/doc/modules/bypass/partials/module-nav.adoc b/security/bypass/src/main/doc/modules/bypass/partials/module-nav.adoc
similarity index 100%
rename from core/security/bypass/src/main/doc/modules/bypass/partials/module-nav.adoc
rename to security/bypass/src/main/doc/modules/bypass/partials/module-nav.adoc
diff --git a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java b/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
similarity index 100%
rename from core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
rename to security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
diff --git a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java b/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
similarity index 100%
rename from core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
rename to security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
diff --git a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java b/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
similarity index 100%
rename from core/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
rename to security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
diff --git a/core/security/shiro/NOTICE b/security/keycloak/NOTICE
similarity index 100%
rename from core/security/shiro/NOTICE
rename to security/keycloak/NOTICE
diff --git a/core/security/keycloak/pom.xml b/security/keycloak/pom.xml
similarity index 98%
rename from core/security/keycloak/pom.xml
rename to security/keycloak/pom.xml
index 845ec24..0c52b6b 100644
--- a/core/security/keycloak/pom.xml
+++ b/security/keycloak/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>isis-security-keycloak</artifactId>
diff --git a/core/security/bypass/src/main/doc/antora.yml b/security/keycloak/src/main/doc/antora.yml
similarity index 100%
rename from core/security/bypass/src/main/doc/antora.yml
rename to security/keycloak/src/main/doc/antora.yml
diff --git a/core/security/bypass/src/main/doc/modules/bypass/nav.adoc b/security/keycloak/src/main/doc/modules/keycloak/nav.adoc
similarity index 100%
rename from core/security/bypass/src/main/doc/modules/bypass/nav.adoc
rename to security/keycloak/src/main/doc/modules/keycloak/nav.adoc
diff --git a/core/security/keycloak/src/main/doc/modules/keycloak/pages/about.adoc b/security/keycloak/src/main/doc/modules/keycloak/pages/about.adoc
similarity index 100%
rename from core/security/keycloak/src/main/doc/modules/keycloak/pages/about.adoc
rename to security/keycloak/src/main/doc/modules/keycloak/pages/about.adoc
diff --git a/core/security/keycloak/src/main/doc/modules/keycloak/partials/module-nav.adoc b/security/keycloak/src/main/doc/modules/keycloak/partials/module-nav.adoc
similarity index 100%
rename from core/security/keycloak/src/main/doc/modules/keycloak/partials/module-nav.adoc
rename to security/keycloak/src/main/doc/modules/keycloak/partials/module-nav.adoc
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
similarity index 100%
rename from core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
rename to security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
similarity index 100%
rename from core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
rename to security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
similarity index 100%
rename from core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
rename to security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
similarity index 100%
rename from core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
rename to security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
similarity index 100%
rename from core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
rename to security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
diff --git a/core/security/keycloak/NOTICE b/security/shiro/NOTICE
similarity index 100%
rename from core/security/keycloak/NOTICE
rename to security/shiro/NOTICE
diff --git a/core/security/shiro/pom.xml b/security/shiro/pom.xml
similarity index 98%
rename from core/security/shiro/pom.xml
rename to security/shiro/pom.xml
index 64cbb5b..a057591 100644
--- a/core/security/shiro/pom.xml
+++ b/security/shiro/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>isis-security-shiro</artifactId>
diff --git a/core/security/api/src/main/doc/antora.yml b/security/shiro/src/main/doc/antora.yml
similarity index 100%
rename from core/security/api/src/main/doc/antora.yml
rename to security/shiro/src/main/doc/antora.yml
diff --git a/core/security/shiro/src/main/doc/modules/shiro/images/configuration/configure-isis-to-use-shiro.png b/security/shiro/src/main/doc/modules/shiro/images/configuration/configure-isis-to-use-shiro.png
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/images/configuration/configure-isis-to-use-shiro.png
rename to security/shiro/src/main/doc/modules/shiro/images/configuration/configure-isis-to-use-shiro.png
diff --git a/core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ini/configure-shiro-to-use-ini-realm.png b/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ini/configure-shiro-to-use-ini-realm.png
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ini/configure-shiro-to-use-ini-realm.png
rename to security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ini/configure-shiro-to-use-ini-realm.png
diff --git a/core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/jdbc/configure-shiro-to-use-custom-jdbc-realm.png b/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/jdbc/configure-shiro-to-use-custom-jdbc-realm.png
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/jdbc/configure-shiro-to-use-custom-jdbc-realm.png
rename to security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/jdbc/configure-shiro-to-use-custom-jdbc-realm.png
diff --git a/core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png b/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
rename to security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
diff --git a/core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png b/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
rename to security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
diff --git a/core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png b/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
rename to security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
diff --git a/core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png b/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
rename to security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
diff --git a/core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png b/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
rename to security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
diff --git a/core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/configure-shiro-to-use-isis-ldap-realm.png b/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/configure-shiro-to-use-isis-ldap-realm.png
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/configure-shiro-to-use-isis-ldap-realm.png
rename to security/shiro/src/main/doc/modules/shiro/images/configuration/configuring-shiro/ldap/configure-shiro-to-use-isis-ldap-realm.png
diff --git a/core/security/api/src/main/doc/modules/api/nav.adoc b/security/shiro/src/main/doc/modules/shiro/nav.adoc
similarity index 100%
rename from core/security/api/src/main/doc/modules/api/nav.adoc
rename to security/shiro/src/main/doc/modules/shiro/nav.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about.adoc b/security/shiro/src/main/doc/modules/shiro/pages/about.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/pages/about.adoc
rename to security/shiro/src/main/doc/modules/shiro/pages/about.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc b/security/shiro/src/main/doc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc
rename to security/shiro/src/main/doc/modules/shiro/pages/about/configuring-isis-to-use-shiro.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about/enhanced-wildcard-permission.adoc b/security/shiro/src/main/doc/modules/shiro/pages/about/enhanced-wildcard-permission.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/pages/about/enhanced-wildcard-permission.adoc
rename to security/shiro/src/main/doc/modules/shiro/pages/about/enhanced-wildcard-permission.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about/ini-realm.adoc b/security/shiro/src/main/doc/modules/shiro/pages/about/ini-realm.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/pages/about/ini-realm.adoc
rename to security/shiro/src/main/doc/modules/shiro/pages/about/ini-realm.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc b/security/shiro/src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc
rename to security/shiro/src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about/ldap-realm.adoc b/security/shiro/src/main/doc/modules/shiro/pages/about/ldap-realm.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/pages/about/ldap-realm.adoc
rename to security/shiro/src/main/doc/modules/shiro/pages/about/ldap-realm.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about/run-as.adoc b/security/shiro/src/main/doc/modules/shiro/pages/about/run-as.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/pages/about/run-as.adoc
rename to security/shiro/src/main/doc/modules/shiro/pages/about/run-as.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about/shiro-caching.adoc b/security/shiro/src/main/doc/modules/shiro/pages/about/shiro-caching.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/pages/about/shiro-caching.adoc
rename to security/shiro/src/main/doc/modules/shiro/pages/about/shiro-caching.adoc
diff --git a/core/security/shiro/src/main/doc/modules/shiro/partials/module-nav.adoc b/security/shiro/src/main/doc/modules/shiro/partials/module-nav.adoc
similarity index 100%
rename from core/security/shiro/src/main/doc/modules/shiro/partials/module-nav.adoc
rename to security/shiro/src/main/doc/modules/shiro/partials/module-nav.adoc
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermission.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/IsisPermissionResolver.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/context/ShiroSecurityContext.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/context/ShiroSecurityContext.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/context/ShiroSecurityContext.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/context/ShiroSecurityContext.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapper.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIni.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromString.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/permrolemapper/Util.java
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
similarity index 100%
rename from core/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
rename to security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
similarity index 100%
rename from core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
rename to security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_setParts.java
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
similarity index 100%
rename from core/security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
rename to security/shiro/src/test/java/org/apache/isis/security/shiro/IsisPermissionTest_typicalUsage.java
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
similarity index 100%
rename from core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
rename to security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
similarity index 100%
rename from core/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
rename to security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java
similarity index 100%
rename from core/security/shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java
rename to security/shiro/src/test/java/org/apache/isis/security/shiro/authorization/IsisPermissionTest_equals.java
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
similarity index 100%
rename from core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
rename to security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromIniTest.java
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
similarity index 100%
rename from core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
rename to security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/PermissionToRoleMapperFromStringTest.java
diff --git a/core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java
similarity index 100%
rename from core/security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java
rename to security/shiro/src/test/java/org/apache/isis/security/shiro/permrolemapper/UtilTest_parse.java
diff --git a/core/security/shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini b/security/shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini
similarity index 100%
rename from core/security/shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini
rename to security/shiro/src/test/resources/org/apache/isis/security/shiro/permrolemapper/my.ini
diff --git a/core/security/shiro/src/test/resources/shiro.ini b/security/shiro/src/test/resources/shiro.ini
similarity index 100%
rename from core/security/shiro/src/test/resources/shiro.ini
rename to security/shiro/src/test/resources/shiro.ini
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTestAbstract_compareTo.java
index 69938ad..68bbc42 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTestAbstract_compareTo.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTestAbstract_compareTo.java
@@ -8,8 +8,6 @@ import com.google.common.collect.ImmutableMap;
import org.junit.Test;
import org.reflections.Reflections;
-import org.apache.isis.extensions.base.unittestsupport.dom.with.ComparableByTitleContractTester;
-
public abstract class ComparableByTitleContractTestAbstract_compareTo {
protected final String packagePrefix;
protected Map<Class<?>, Class<?>> noninstantiableSubstitutes;
diff --git a/subdomains/excel/testing/pom.xml b/subdomains/excel/testing/pom.xml
index 75890bd..27f03ac 100644
--- a/subdomains/excel/testing/pom.xml
+++ b/subdomains/excel/testing/pom.xml
@@ -33,6 +33,12 @@
<artifactId>isis-subdomains-excel-applib</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
</project>
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java
index c90ac12..e1068df 100644
--- a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java
@@ -4,14 +4,14 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.fakedata.dom.IsisModuleExtFakeData;
+import org.apache.isis.testing.fakedata.applib.IsisModuleTstFakeDataApplib;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts.FakeDataDemoObjectWithAll_tearDown;
@Configuration
@Import({
- IsisModuleExtFakeData.class
+ IsisModuleTstFakeDataApplib.class
})
@ComponentScan
public class IsisModuleTstFakeDataFixtures implements ModuleWithFixtures {
diff --git a/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
index caeec8c..e22a015 100644
--- a/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
+++ b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
@@ -21,7 +21,7 @@ package org.apache.isis.valuetypes.asciidoc.ui.components;
import org.springframework.stereotype.Component;
-import org.apache.isis.extensions.asciidoc.applib.value.AsciiDoc;
+import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupPanelFactories;