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/12/04 18:45:16 UTC
[isis] 01/02: ISIS-2213: moves o.a.isis.security to
o.a.isis.security.api
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit a116af1d0040182a358ecfdffa0f06e50c53f0b2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 17:49:04 2019 +0000
ISIS-2213: moves o.a.isis.security to o.a.isis.security.api
---
.../apache/isis/metamodel/MetaModelContext.java | 8 +++---
.../isis/metamodel/MetaModelContext_usingIoc.java | 6 ++---
.../standard/AuthorizationFacetAbstract.java | 2 +-
.../metamodel/interactions/InteractionContext.java | 3 +--
.../services/user/UserServiceDefault.java | 4 +--
.../isis/metamodel/spec/ObjectSpecification.java | 2 +-
.../specimpl/ObjectSpecificationAbstract.java | 2 +-
.../metamodel/MetaModelContext_forTesting.java | 8 +++---
.../facets/AbstractFacetFactoryJUnit4TestCase.java | 2 +-
.../metamodel/facets/AbstractFacetFactoryTest.java | 4 +--
.../actions/ActionMethodsFacetFactoryTest.java | 2 +-
.../action/ActionAnnotationFacetFactoryTest.java | 2 +-
.../TitleAnnotationFacetFactoryTest.java | 4 +--
.../NavigableParentAnnotationFacetFactoryTest.java | 4 +--
.../parseable/ParseableFacetUsingParserTest.java | 2 +-
.../ValueSemanticsProviderAbstractTestCase.java | 2 +-
.../SpecificationLoaderTestAbstract.java | 2 +-
.../testspec/ObjectSpecificationStub.java | 2 +-
.../jdo/objectadapter/ObjectAdapterContext.java | 2 +-
.../persistence/IsisPersistenceSessionJdoBase.java | 2 +-
.../IsisPlatformTransactionManagerForJdo.java | 2 +-
.../isis/jdo/persistence/PersistenceSession5.java | 2 +-
.../persistence/PersistenceSessionFactory5.java | 3 +--
.../adapterfactory/pojo/PojoAdapterTest.java | 2 +-
.../WrapperFactoryDefaultTest_wrappedObject.java | 5 ++--
...FactoryDefaultTest_wrappedObject_transient.java | 5 ++--
.../runtime/system/ObjectMemberAbstractTest.java | 4 +--
.../auth/AuthenticationSessionProviderDefault.java | 6 ++---
.../auth/AuthorizationManagerStandard.java | 6 ++---
.../services/message/MessageServiceDefault.java | 2 +-
.../userprof/UserProfileServiceDefault.java | 2 +-
.../services/wrapper/WrapperFactoryDefault.java | 2 +-
.../handlers/DomainObjectInvocationHandler.java | 2 +-
.../AbstractIsisSessionTemplate.java | 2 +-
.../isis/runtime/system/context/IsisContext.java | 2 +-
.../system/context/session/RuntimeContext.java | 2 +-
.../system/context/session/RuntimeContextBase.java | 4 +--
.../system/internal/InitialisationSession.java | 2 +-
.../persistence/PersistenceSessionFactory.java | 2 +-
.../runtime/system/session/IsisRequestCycle.java | 2 +-
.../isis/runtime/system/session/IsisSession.java | 4 +--
.../runtime/system/session/IsisSessionFactory.java | 2 +-
.../system/session/IsisSessionFactoryDefault.java | 6 ++---
.../system/ObjectActionLayoutXmlDefaultTest.java | 2 +-
.../system/OneToManyAssociationDefaultTest.java | 2 +-
core/security/api/pom.xml | 4 +--
.../authentication/AuthenticationRequest.java | 2 +-
.../AuthenticationRequestAbstract.java | 2 +-
.../AuthenticationRequestPassword.java | 2 +-
.../authentication/AuthenticationSession.java | 9 ++++---
.../AuthenticationSessionAbstract.java | 2 +-
.../AuthenticationSessionProvider.java | 2 +-
.../{ => api}/authentication/MessageBroker.java | 2 +-
.../AuthenticationRequestLogonFixture.java | 6 ++---
.../authentication/health/HealthAuthSession.java | 4 +--
.../manager/AuthenticationManager.java | 6 ++---
.../manager/RegistrationDetails.java | 2 +-
.../AuthenticationRequestSingleUser.java | 4 +--
.../singleuser/SingleUserSession.java | 4 +--
.../standard/AuthenticationManagerStandard.java | 10 ++++----
.../authentication/standard/Authenticator.java | 6 ++---
.../standard/AuthenticatorAbstract.java | 6 ++---
.../standard/AuthenticatorDefault.java | 2 +-
.../standard/NoAuthenticatorException.java | 2 +-
.../PasswordRequestAuthenticatorAbstract.java | 6 ++---
.../standard/RandomCodeGenerator.java | 2 +-
.../standard/RandomCodeGenerator10Chars.java | 2 +-
.../standard/RandomCodeGeneratorUUID.java | 2 +-
.../authentication/standard/Registrar.java | 4 +--
.../standard/RegistrationDetailsPassword.java | 4 +--
.../authentication/standard/SimpleSession.java | 5 ++--
.../manager/AuthorizationManager.java | 4 +--
.../standard/AuthorizationConstants.java | 2 +-
.../authorization/standard/Authorizor.java | 2 +-
.../isis/security/authentication/package-info.java | 30 ----------------------
.../isis/security/EncodabilityContractTest.java | 2 +-
.../standard/AuthenticatorDefaultTest.java | 3 ++-
.../SimpleSessionEncodabilityNoRolesTest.java | 1 +
.../SimpleSessionEncodabilityTestAbstract.java | 1 +
.../SimpleSessionEncodabilityWithRolesTest.java | 1 +
...rdAuthenticationManager_AuthenticationTest.java | 9 ++++---
...rdAuthenticationManager_AuthenticatorsTest.java | 5 +++-
.../security/bypass/IsisBootSecurityBypass.java | 6 ++---
.../bypass/authentication/AuthenticatorBypass.java | 4 +--
.../bypass/authorization/AuthorizorBypass.java | 2 +-
.../keycloak/IsisBootSecurityKeycloak.java | 6 ++---
.../isis/security/keycloak/KeycloakFilter.java | 4 +--
.../isis/security/keycloak/WebModuleKeycloak.java | 1 -
.../authentication/KeycloakAuthenticator.java | 7 +++--
.../keycloak/authorization/KeycloakAuthorizor.java | 2 +-
.../isis/security/shiro/IsisBootSecurityShiro.java | 6 ++---
.../isis/security/shiro/ShiroSecurityContext.java | 4 +--
.../shiro/authentication/ShiroAuthenticator.java | 12 ++++-----
.../shiro/authorization/ShiroAuthorizor.java | 4 +--
...AuthenticatorOrAuthorizorTest_authenticate.java | 6 ++---
...ticatorOrAuthorizorTest_isVisibleInAnyRole.java | 4 +--
.../components/AuthenticationManagerNull.java | 8 +++---
.../components/AuthorizationManagerAllowAll.java | 4 +--
.../restfulobjects/rendering/IResourceContext.java | 2 +-
.../server/auth/AuthenticationSessionStrategy.java | 4 +--
.../AuthenticationSessionStrategyAbstract.java | 2 +-
.../AuthenticationSessionStrategyBasicAuth.java | 4 +--
.../auth/AuthenticationSessionStrategyDefault.java | 2 +-
.../server/resources/HealthResourceServerside.java | 2 +-
.../server/resources/HomePageReprRenderer.java | 2 +-
.../server/resources/UserReprRenderer.java | 2 +-
.../server/ResourceContextTest_getArg.java | 2 +-
..._ensureCompatibleAcceptHeader_ContractTest.java | 2 +-
.../wicket/AnonymousWebSessionForIsis.java | 2 +-
.../wicket/AuthenticatedWebSessionForIsis.java | 8 +++---
.../integration/wicket/WebRequestCycleForIsis.java | 4 +--
...uthenticatedWebSessionForIsis_Authenticate.java | 2 +-
.../AuthenticatedWebSessionForIsis_SignIn.java | 2 +-
...uthenticatedWebSessionForIsis_TestAbstract.java | 2 +-
.../viewer/wicket/model/models/ScalarModel.java | 2 +-
.../actionmenu/serviceactions/CssMenuItem.java | 2 +-
.../serviceactions/TertiaryActionsPanel.java | 2 +-
.../widgets/breadcrumbs/BreadcrumbPanel.java | 2 +-
.../viewer/wicket/ui/errors/JGrowlBehaviour.java | 2 +-
.../isis/viewer/wicket/ui/errors/JGrowlUtil.java | 2 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../isis/viewer/wicket/ui/panels/FormAbstract.java | 2 +-
.../wicket/ui/panels/FormExecutorDefault.java | 4 +--
.../isis/viewer/wicket/ui/panels/PanelBase.java | 2 +-
.../wormhole/AuthenticationSessionWormhole.java | 2 +-
.../testdomain/bootstrapping/builtin-IsisBoot.list | 2 +-
.../bootstrapping/builtin-singleton.list | 2 +-
.../secman/shiro/IsisModuleSecurityRealm.java | 3 ++-
128 files changed, 216 insertions(+), 241 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext.java
index 3c5aaf6..e022f54 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext.java
@@ -34,10 +34,10 @@ import org.apache.isis.metamodel.services.homepage.HomePageAction;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.authorization.manager.AuthorizationManager;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
/**
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_usingIoc.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_usingIoc.java
index 8909290..6dca88b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_usingIoc.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/MetaModelContext_usingIoc.java
@@ -42,9 +42,9 @@ import org.apache.isis.metamodel.services.homepage.HomePageAction;
import org.apache.isis.metamodel.services.homepage.HomePageResolverService;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.authorization.manager.AuthorizationManager;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
import lombok.Getter;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/authorization/standard/AuthorizationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/authorization/standard/AuthorizationFacetAbstract.java
index 5984726..641ad6f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/authorization/standard/AuthorizationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/authorization/standard/AuthorizationFacetAbstract.java
@@ -26,7 +26,7 @@ import org.apache.isis.metamodel.facetapi.FacetAbstract;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.interactions.UsabilityContext;
import org.apache.isis.metamodel.interactions.VisibilityContext;
-import org.apache.isis.security.authorization.manager.AuthorizationManager;
+import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java
index be820e5..efad49d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/interactions/InteractionContext.java
@@ -24,12 +24,11 @@ import javax.annotation.Nullable;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
import org.apache.isis.commons.internal.base._Tuples;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.consent.InteractionContextType;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.spec.ManagedObject;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
/**
* Represents an interaction between the framework and (a {@link Facet} of) the
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/user/UserServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/user/UserServiceDefault.java
index 604ede0..cb5151c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/user/UserServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/user/UserServiceDefault.java
@@ -33,8 +33,8 @@ import org.apache.isis.applib.security.RoleMemento;
import org.apache.isis.applib.security.UserMemento;
import org.apache.isis.applib.services.sudo.SudoService;
import org.apache.isis.applib.services.user.UserService;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
@Service
public class UserServiceDefault implements UserService {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecification.java
index 4b06c42..5d58c63 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/spec/ObjectSpecification.java
@@ -59,7 +59,7 @@ import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.services.classsubstitutor.ClassSubstitutor;
import org.apache.isis.metamodel.specloader.specimpl.IntrospectionState;
import org.apache.isis.metamodel.specloader.specimpl.MixedInMember;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index a06daa0..4738f87 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -86,7 +86,7 @@ import org.apache.isis.metamodel.spec.feature.ObjectMember;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.facetprocessor.FacetProcessor;
import org.apache.isis.metamodel.specloader.postprocessor.PostProcessor;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.EqualsAndHashCode;
import lombok.Getter;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
index d9d2881..267deea 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/MetaModelContext_forTesting.java
@@ -45,10 +45,10 @@ import org.apache.isis.metamodel.services.homepage.HomePageAction;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.SpecificationLoaderDefault;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.authorization.manager.AuthorizationManager;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.unittestsupport.config.internal._Config;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
index c254847..975c309 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
@@ -48,7 +48,7 @@ import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.metamodel.spec.feature.OneToOneActionParameter;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java
index 6c411f2..eaa4fd2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/AbstractFacetFactoryTest.java
@@ -36,8 +36,8 @@ import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import junit.framework.TestCase;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
index 3ed7c32..193b5ba 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
@@ -51,7 +51,7 @@ import org.apache.isis.metamodel.facets.param.defaults.methodnum.ActionParameter
import org.apache.isis.metamodel.facets.param.defaults.methodnum.ActionParameterDefaultsFacetViaMethodFactory;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.testspec.ObjectSpecificationStub;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.jmock.Expectations;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
index 7c3f838..ef6fd0a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
@@ -33,7 +33,7 @@ import org.apache.isis.config.metamodel.facets.CommandActionsConfiguration;
import org.apache.isis.config.metamodel.facets.PublishActionsConfiguration;
import org.apache.isis.metamodel.facets.object.domainobject.domainevents.ActionDomainEventDefaultFacetForDomainObjectAnnotation;
import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
index 14e1899..7e431f3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
@@ -41,8 +41,8 @@ import org.apache.isis.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.metamodel.facets.object.title.annotation.TitleAnnotationFacetFactory;
import org.apache.isis.metamodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation;
import org.apache.isis.metamodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation.TitleComponent;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
index 253896d..d1f8845 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
@@ -36,8 +36,8 @@ import org.apache.isis.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.metamodel.facets.object.navparent.NavigableParentFacet;
import org.apache.isis.metamodel.facets.object.navparent.annotation.NavigableParentTestSamples.DomainObjectA;
import org.apache.isis.metamodel.facets.object.navparent.method.NavigableParentFacetMethod;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
public class NavigableParentAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
index 10afb11c..32a0ceb 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
@@ -36,7 +36,7 @@ import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser;
import org.apache.isis.metamodel.facets.object.value.ValueFacet;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index 2ae8a78..526cf1c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -38,7 +38,7 @@ import org.apache.isis.metamodel.facets.object.encodeable.encoder.EncodableFacet
import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser;
import org.apache.isis.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.unittestsupport.config.internal._Config;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
index b2d533e..3b30b70 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
@@ -45,7 +45,7 @@ import org.apache.isis.metamodel.progmodel.ProgrammingModelAbstract;
import org.apache.isis.metamodel.progmodel.ProgrammingModelInitFilterDefault;
import org.apache.isis.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/testspec/ObjectSpecificationStub.java
index aff4fa6..0602073 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/testspec/ObjectSpecificationStub.java
@@ -46,7 +46,7 @@ import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.metamodel.spec.feature.ObjectMember;
import org.apache.isis.metamodel.specloader.specimpl.IntrospectionState;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSpecification {
diff --git a/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext.java b/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext.java
index 213eecc..8b89095 100644
--- a/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext.java
+++ b/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/objectadapter/ObjectAdapterContext.java
@@ -40,7 +40,7 @@ import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.system.context.session.RuntimeContextBase;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.Getter;
import lombok.val;
diff --git a/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisPersistenceSessionJdoBase.java b/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisPersistenceSessionJdoBase.java
index 9c39f98..951e56c 100644
--- a/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisPersistenceSessionJdoBase.java
+++ b/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisPersistenceSessionJdoBase.java
@@ -44,7 +44,7 @@ import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.persistence.FixturesInstalledStateHolder;
import org.apache.isis.runtime.system.persistence.PersistenceQueryFactory;
import org.apache.isis.runtime.system.transaction.ChangedObjectsServiceInternal;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.Getter;
import lombok.val;
diff --git a/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java b/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java
index 23ac79f..2b5d664 100644
--- a/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java
+++ b/core/persistence/jdo/common/src/main/java/org/apache/isis/jdo/persistence/IsisPlatformTransactionManagerForJdo.java
@@ -34,7 +34,7 @@ import org.apache.isis.runtime.system.session.IsisSession;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
import org.apache.isis.runtime.system.transaction.IsisTransactionAspectSupport;
import org.apache.isis.runtime.system.transaction.IsisTransactionObject;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java
index 6ff2792..fe0669d 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java
@@ -92,7 +92,7 @@ import org.apache.isis.runtime.persistence.query.PersistenceQueryFindUsingApplib
import org.apache.isis.runtime.services.RequestScopedService;
import org.apache.isis.runtime.system.persistence.PersistenceQuery;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import static java.util.Objects.requireNonNull;
import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
diff --git a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactory5.java b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactory5.java
index cf1150d..0c1f529 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactory5.java
+++ b/core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionFactory5.java
@@ -22,7 +22,6 @@ package org.apache.isis.jdo.persistence;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -45,7 +44,7 @@ import org.apache.isis.runtime.persistence.FixturesInstalledState;
import org.apache.isis.runtime.persistence.FixturesInstalledStateHolder;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtime.system.persistence.PersistenceSessionFactory;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.Getter;
import lombok.Setter;
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index 35f611e..30e8ce4 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.metamodel.spec.ObjectSpecId;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index d591c1a..cfb20af 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -23,7 +23,6 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.runtime.services.wrapper.WrapperFactoryDefault;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
@@ -66,8 +65,8 @@ import org.apache.isis.runtime.services.wrapper.dom.employees.EmployeeRepository
import org.apache.isis.runtime.services.wrapper.dom.employees.EmployeeRepositoryImpl;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
import org.apache.isis.schema.cmd.v1.CommandDto;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.security.authentication.standard.SimpleSession;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.standard.SimpleSession;
import org.apache.isis.unittestsupport.config.internal._Config;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index 975614b..75ca4dc 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -24,7 +24,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.runtime.services.wrapper.WrapperFactoryDefault;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
@@ -61,8 +60,8 @@ import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.isis.runtime.services.wrapper.dom.employees.Employee;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.security.authentication.standard.SimpleSession;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.standard.SimpleSession;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
index 3e38d13..5d03d9f 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
@@ -47,8 +47,8 @@ import org.apache.isis.metamodel.specloader.specimpl.ObjectMemberAbstract;
import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.runtime.persistence.objectstore.transaction.PojoAdapterBuilder;
import org.apache.isis.runtime.persistence.objectstore.transaction.PojoAdapterBuilder.Persistence;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.datanucleus.enhancement.Persistable;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthenticationSessionProviderDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthenticationSessionProviderDefault.java
index c7aef8c..e21cbf7 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthenticationSessionProviderDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthenticationSessionProviderDefault.java
@@ -27,9 +27,9 @@ import org.springframework.stereotype.Service;
import org.apache.isis.metamodel.services.user.UserServiceDefault;
import org.apache.isis.runtime.system.session.IsisSession;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.security.authentication.standard.SimpleSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.standard.SimpleSession;
@Service
public class AuthenticationSessionProviderDefault implements AuthenticationSessionProvider {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthorizationManagerStandard.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthorizationManagerStandard.java
index 775637c..65d69ec 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthorizationManagerStandard.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthorizationManagerStandard.java
@@ -31,9 +31,9 @@ import org.apache.isis.metamodel.authorization.standard.AuthorizationFacetFactor
import org.apache.isis.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.metamodel.progmodel.ProgrammingModel.FacetProcessingOrder;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authorization.manager.AuthorizationManager;
-import org.apache.isis.security.authorization.standard.Authorizor;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
+import org.apache.isis.security.api.authorization.standard.Authorizor;
import lombok.val;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
index d1493de..81635a8 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.security.authentication.MessageBroker;
+import org.apache.isis.security.api.authentication.MessageBroker;
@Service
public class MessageServiceDefault implements MessageService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userprof/UserProfileServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userprof/UserProfileServiceDefault.java
index b61da98..c2a614d 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userprof/UserProfileServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userprof/UserProfileServiceDefault.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.userprof.UserProfileService;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
@DomainService(nature = NatureOfService.DOMAIN)
public class UserProfileServiceDefault implements UserProfileService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
index 8981630..526a548 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
@@ -60,7 +60,7 @@ import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.runtime.services.wrapper.dispatchers.InteractionEventDispatcher;
import org.apache.isis.runtime.services.wrapper.dispatchers.InteractionEventDispatcherTypeSafe;
import org.apache.isis.runtime.services.wrapper.handlers.ProxyContextHandler;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DomainObjectInvocationHandler.java b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DomainObjectInvocationHandler.java
index f5436c9..d6107a9 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -63,7 +63,7 @@ import org.apache.isis.metamodel.specloader.specimpl.ContributeeMember;
import org.apache.isis.metamodel.specloader.specimpl.ObjectActionContributee;
import org.apache.isis.metamodel.specloader.specimpl.ObjectActionMixedIn;
import org.apache.isis.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.val;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/sessiontemplate/AbstractIsisSessionTemplate.java b/core/runtime/src/main/java/org/apache/isis/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
index 660ea5d..eeb1bf3 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.runtime.system.session.IsisSession;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
public abstract class AbstractIsisSessionTemplate {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java
index 9bcca84..3242c09 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/IsisContext.java
@@ -27,7 +27,7 @@ import org.apache.isis.metamodel.specloader.validator.MetaModelInvalidException;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtime.system.session.IsisSession;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
/**
* Provides static access to current context's singletons
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContext.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContext.java
index d20e0f3..7e5bac0 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContext.java
@@ -24,7 +24,7 @@ import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.services.homepage.HomePageAction;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
/**
* TODO [2033] this was introduced when refactoring, maybe use MetaModelContext instead if possible
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContextBase.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContextBase.java
index d83b664..5dee024 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContextBase.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/context/session/RuntimeContextBase.java
@@ -29,8 +29,8 @@ import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.services.homepage.HomePageAction;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
import lombok.Getter;
import lombok.val;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/InitialisationSession.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/InitialisationSession.java
index 8471757..9de0867 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/InitialisationSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/InitialisationSession.java
@@ -22,7 +22,7 @@ package org.apache.isis.runtime.system.internal;
import java.io.IOException;
import org.apache.isis.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.security.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.security.api.authentication.AuthenticationSessionAbstract;
public final class InitialisationSession extends AuthenticationSessionAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceSessionFactory.java
index 78a156a..35b9d04 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/PersistenceSessionFactory.java
@@ -19,7 +19,7 @@
package org.apache.isis.runtime.system.persistence;
import org.apache.isis.metamodel.MetaModelContext;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
public interface PersistenceSessionFactory {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisRequestCycle.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisRequestCycle.java
index 118ae78..35b947a 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisRequestCycle.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisRequestCycle.java
@@ -22,7 +22,7 @@ import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionTemplate;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSession.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSession.java
index fad12b9..73dff34 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSession.java
@@ -29,8 +29,8 @@ import org.apache.isis.metamodel.commons.ToString;
import org.apache.isis.runtime.system.context.session.RuntimeContextBase;
import org.apache.isis.runtime.system.context.session.RuntimeEventService;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.MessageBroker;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.MessageBroker;
import lombok.Getter;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactory.java
index 404c52a..5c20028 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactory.java
@@ -25,7 +25,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.runtime.system.internal.InitialisationSession;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
/**
* Is the factory of {@link IsisSession}s, also holding a reference to the current session using
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java
index bc1d006..d14764e 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/session/IsisSessionFactoryDefault.java
@@ -43,9 +43,9 @@ import org.apache.isis.runtime.system.internal.IsisTimeZoneInitializer;
import org.apache.isis.applib.util.schema.ChangesDtoUtils;
import org.apache.isis.applib.util.schema.CommandDtoUtils;
import org.apache.isis.applib.util.schema.InteractionDtoUtils;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.authorization.manager.AuthorizationManager;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
import static org.apache.isis.commons.internal.base._With.requires;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java
index 7835adf..d762ef4 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java
@@ -33,7 +33,7 @@ import org.apache.isis.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.metamodel.facets.all.named.NamedFacetAbstract;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.specimpl.ObjectActionDefault;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java
index 591ad24..ec91418 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java
@@ -38,7 +38,7 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.specimpl.OneToManyAssociationDefault;
-import org.apache.isis.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/security/api/pom.xml b/core/security/api/pom.xml
index e511e00..5f77511 100644
--- a/core/security/api/pom.xml
+++ b/core/security/api/pom.xml
@@ -31,8 +31,8 @@
<name>Apache Isis Security - API</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.api</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/security/api</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationRequest.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequest.java
similarity index 97%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationRequest.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequest.java
index 419e830..5bba415 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationRequest.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.authentication;
+package org.apache.isis.security.api.authentication;
import java.util.Collection;
import java.util.stream.Stream;
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestAbstract.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestAbstract.java
similarity index 96%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestAbstract.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestAbstract.java
index 733cb4a..50db323 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestAbstract.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestAbstract.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.authentication;
+package org.apache.isis.security.api.authentication;
import java.util.Set;
import java.util.stream.Stream;
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestPassword.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestPassword.java
similarity index 95%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestPassword.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestPassword.java
index 7ebf80f..362d941 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestPassword.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestPassword.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.authentication;
+package org.apache.isis.security.api.authentication;
public class AuthenticationRequestPassword extends AuthenticationRequestAbstract {
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationSession.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSession.java
similarity index 89%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationSession.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSession.java
index bd3191b..c6ee9f9 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationSession.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSession.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.authentication;
+package org.apache.isis.security.api.authentication;
import java.io.Serializable;
import java.util.List;
@@ -26,7 +26,8 @@ import java.util.stream.Stream;
import org.apache.isis.applib.security.UserMemento;
import org.apache.isis.commons.internal.encoding.Encodable;
-import org.apache.isis.security.authentication.standard.AuthenticationManagerStandard;
+import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.api.authentication.standard.AuthenticationManagerStandard;
/**
* The representation within the system of an authenticated user.
@@ -103,8 +104,8 @@ public interface AuthenticationSession extends Encodable, Serializable {
/**
* Instructs the {@link AuthenticationManagerStandard} to not cache this session in its internal map of
* sessions by validation code, and therefore to ignore this aspect when considering if an
- * {@link org.apache.isis.security.authentication.AuthenticationSession} is
- * {@link org.apache.isis.security.authentication.manager.AuthenticationManager#isSessionValid(AuthenticationSession) valid} or not.
+ * {@link AuthenticationSession} is
+ * {@link AuthenticationManager#isSessionValid(AuthenticationSession) valid} or not.
*/
EXTERNAL
}
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionAbstract.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionAbstract.java
similarity index 98%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionAbstract.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionAbstract.java
index 2c8ab1a..1d14417 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionAbstract.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionAbstract.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.authentication;
+package org.apache.isis.security.api.authentication;
import java.io.IOException;
import java.io.Serializable;
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionProvider.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionProvider.java
similarity index 94%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionProvider.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionProvider.java
index fcb8eb9..1062367 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionProvider.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.security.authentication;
+package org.apache.isis.security.api.authentication;
/**
* This is implemented by an (internal) domain service
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/MessageBroker.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/MessageBroker.java
similarity index 97%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/MessageBroker.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/MessageBroker.java
index be5226e..adae1f8 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/MessageBroker.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/MessageBroker.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.authentication;
+package org.apache.isis.security.api.authentication;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/fixtures/AuthenticationRequestLogonFixture.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/fixtures/AuthenticationRequestLogonFixture.java
similarity index 87%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/fixtures/AuthenticationRequestLogonFixture.java
index 5b79952..ba95b49 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/fixtures/AuthenticationRequestLogonFixture.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.security.authentication.fixtures;
+package org.apache.isis.security.api.authentication.fixtures;
import java.util.Collection;
import java.util.Collections;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.security.authentication.AuthenticationRequestAbstract;
-import org.apache.isis.security.authentication.standard.AuthenticationManagerStandard;
+import org.apache.isis.security.api.authentication.AuthenticationRequestAbstract;
+import org.apache.isis.security.api.authentication.standard.AuthenticationManagerStandard;
/**
* For testing purposes, request corresponding to a {@link LogonFixture}.
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/health/HealthAuthSession.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/health/HealthAuthSession.java
similarity index 91%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/health/HealthAuthSession.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/health/HealthAuthSession.java
index 64e0901..f939802 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/health/HealthAuthSession.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/health/HealthAuthSession.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.isis.security.authentication.health;
+package org.apache.isis.security.api.authentication.health;
import java.io.IOException;
import java.util.stream.Stream;
import org.apache.isis.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.security.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.security.api.authentication.AuthenticationSessionAbstract;
public class HealthAuthSession extends AuthenticationSessionAbstract {
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/manager/AuthenticationManager.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java
similarity index 87%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/manager/AuthenticationManager.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java
index c0daaab..41d337b 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/manager/AuthenticationManager.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.security.authentication.manager;
+package org.apache.isis.security.api.authentication.manager;
-import org.apache.isis.security.authentication.AuthenticationRequest;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationRequest;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
public interface AuthenticationManager {
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/manager/RegistrationDetails.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/manager/RegistrationDetails.java
similarity index 93%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/manager/RegistrationDetails.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/manager/RegistrationDetails.java
index b4022eb..116dcac 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/manager/RegistrationDetails.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/manager/RegistrationDetails.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.security.authentication.manager;
+package org.apache.isis.security.api.authentication.manager;
public interface RegistrationDetails {
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/singleuser/AuthenticationRequestSingleUser.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/singleuser/AuthenticationRequestSingleUser.java
similarity index 89%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/singleuser/AuthenticationRequestSingleUser.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/singleuser/AuthenticationRequestSingleUser.java
index da7dcbe..a435d0c 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/singleuser/AuthenticationRequestSingleUser.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/singleuser/AuthenticationRequestSingleUser.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.security.authentication.singleuser;
+package org.apache.isis.security.api.authentication.singleuser;
-import org.apache.isis.security.authentication.AuthenticationRequestAbstract;
+import org.apache.isis.security.api.authentication.AuthenticationRequestAbstract;
/**
* Requests corresponding to an {@link SingleUserSession}.
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/singleuser/SingleUserSession.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/singleuser/SingleUserSession.java
similarity index 92%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/singleuser/SingleUserSession.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/singleuser/SingleUserSession.java
index 4f2035d..2172989 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/singleuser/SingleUserSession.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/singleuser/SingleUserSession.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.security.authentication.singleuser;
+package org.apache.isis.security.api.authentication.singleuser;
import java.io.IOException;
import org.apache.isis.commons.internal.encoding.DataInputExtended;
import org.apache.isis.commons.internal.encoding.DataOutputExtended;
import org.apache.isis.commons.internal.encoding.Encodable;
-import org.apache.isis.security.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.security.api.authentication.AuthenticationSessionAbstract;
public final class SingleUserSession extends AuthenticationSessionAbstract implements Encodable {
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/AuthenticationManagerStandard.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticationManagerStandard.java
similarity index 94%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/standard/AuthenticationManagerStandard.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticationManagerStandard.java
index c88076c..3249487 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/AuthenticationManagerStandard.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticationManagerStandard.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.authentication.standard;
+package org.apache.isis.security.api.authentication.standard;
import java.util.List;
import java.util.Map;
@@ -33,10 +33,10 @@ import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.security.authentication.AuthenticationRequest;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.authentication.manager.RegistrationDetails;
+import org.apache.isis.security.api.authentication.AuthenticationRequest;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.api.authentication.manager.RegistrationDetails;
import static org.apache.isis.commons.internal.base._With.requires;
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/Authenticator.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/Authenticator.java
similarity index 87%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/standard/Authenticator.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/Authenticator.java
index ebba92a..e2f5c34 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/Authenticator.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/Authenticator.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.isis.security.authentication.standard;
+package org.apache.isis.security.api.authentication.standard;
import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
-import org.apache.isis.security.authentication.AuthenticationRequest;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationRequest;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
public interface Authenticator extends ApplicationScopedComponent {
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorAbstract.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorAbstract.java
similarity index 88%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorAbstract.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorAbstract.java
index 3e5026f..999fea1 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorAbstract.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorAbstract.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.security.authentication.standard;
+package org.apache.isis.security.api.authentication.standard;
-import org.apache.isis.security.authentication.AuthenticationRequest;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationRequest;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
public abstract class AuthenticatorAbstract implements Authenticator {
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorDefault.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorDefault.java
similarity index 93%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorDefault.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorDefault.java
index 4d5c595..4e650ce 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorDefault.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.authentication.standard;
+package org.apache.isis.security.api.authentication.standard;
public abstract class AuthenticatorDefault extends AuthenticatorAbstract {
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/NoAuthenticatorException.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/NoAuthenticatorException.java
similarity index 95%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/standard/NoAuthenticatorException.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/NoAuthenticatorException.java
index f614697..35dac19 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/NoAuthenticatorException.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/NoAuthenticatorException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.authentication.standard;
+package org.apache.isis.security.api.authentication.standard;
import org.apache.isis.commons.exceptions.IsisException;
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/PasswordRequestAuthenticatorAbstract.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/PasswordRequestAuthenticatorAbstract.java
similarity index 84%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/standard/PasswordRequestAuthenticatorAbstract.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/PasswordRequestAuthenticatorAbstract.java
index 1f85b83..adabc79 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/PasswordRequestAuthenticatorAbstract.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/PasswordRequestAuthenticatorAbstract.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.security.authentication.standard;
+package org.apache.isis.security.api.authentication.standard;
-import org.apache.isis.security.authentication.AuthenticationRequest;
-import org.apache.isis.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.security.api.authentication.AuthenticationRequest;
+import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
public abstract class PasswordRequestAuthenticatorAbstract extends AuthenticatorAbstract {
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator.java
similarity index 93%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator.java
index ad0482a..f77c892 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.authentication.standard;
+package org.apache.isis.security.api.authentication.standard;
public interface RandomCodeGenerator {
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator10Chars.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator10Chars.java
similarity index 95%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator10Chars.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator10Chars.java
index 3d11bce..60e10e0 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator10Chars.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator10Chars.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.security.authentication.standard;
+package org.apache.isis.security.api.authentication.standard;
import java.util.Random;
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGeneratorUUID.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGeneratorUUID.java
similarity index 95%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGeneratorUUID.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGeneratorUUID.java
index 04a2490..2a84acf 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGeneratorUUID.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGeneratorUUID.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.authentication.standard;
+package org.apache.isis.security.api.authentication.standard;
import java.util.UUID;
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/Registrar.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/Registrar.java
similarity index 91%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/standard/Registrar.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/Registrar.java
index de0c0a2..9adc67f 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/Registrar.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/Registrar.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.isis.security.authentication.standard;
+package org.apache.isis.security.api.authentication.standard;
import java.util.function.Function;
import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
-import org.apache.isis.security.authentication.manager.RegistrationDetails;
+import org.apache.isis.security.api.authentication.manager.RegistrationDetails;
public interface Registrar extends Authenticator, ApplicationScopedComponent {
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RegistrationDetailsPassword.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RegistrationDetailsPassword.java
similarity index 89%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RegistrationDetailsPassword.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RegistrationDetailsPassword.java
index 3ca3869..2eb16b6 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/RegistrationDetailsPassword.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/RegistrationDetailsPassword.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.security.authentication.standard;
+package org.apache.isis.security.api.authentication.standard;
-import org.apache.isis.security.authentication.manager.RegistrationDetails;
+import org.apache.isis.security.api.authentication.manager.RegistrationDetails;
public class RegistrationDetailsPassword implements RegistrationDetails {
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/SimpleSession.java b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/SimpleSession.java
similarity index 94%
rename from core/security/api/src/main/java/org/apache/isis/security/authentication/standard/SimpleSession.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/SimpleSession.java
index 0a42a8b..850bd4f 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/standard/SimpleSession.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authentication/standard/SimpleSession.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.authentication.standard;
+package org.apache.isis.security.api.authentication.standard;
import lombok.Getter;
import lombok.Setter;
@@ -27,8 +27,7 @@ import java.util.List;
import java.util.stream.Stream;
import org.apache.isis.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.security.api.authentication.AuthenticationSessionAbstract;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authorization/manager/AuthorizationManager.java b/core/security/api/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java
similarity index 92%
rename from core/security/api/src/main/java/org/apache/isis/security/authorization/manager/AuthorizationManager.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java
index 0cff9b5..388b007 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authorization/manager/AuthorizationManager.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.security.authorization.manager;
+package org.apache.isis.security.api.authorization.manager;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
/**
* Authorizes the user in the current session view and use members of an object.
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authorization/standard/AuthorizationConstants.java b/core/security/api/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
similarity index 95%
rename from core/security/api/src/main/java/org/apache/isis/security/authorization/standard/AuthorizationConstants.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
index 495ca6c..48b4fb0 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authorization/standard/AuthorizationConstants.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.authorization.standard;
+package org.apache.isis.security.api.authorization.standard;
import org.apache.isis.config.ConfigurationConstants;
diff --git a/core/security/api/src/main/java/org/apache/isis/security/authorization/standard/Authorizor.java b/core/security/api/src/main/java/org/apache/isis/security/api/authorization/standard/Authorizor.java
similarity index 97%
rename from core/security/api/src/main/java/org/apache/isis/security/authorization/standard/Authorizor.java
rename to core/security/api/src/main/java/org/apache/isis/security/api/authorization/standard/Authorizor.java
index 5e9703c..747a754 100644
--- a/core/security/api/src/main/java/org/apache/isis/security/authorization/standard/Authorizor.java
+++ b/core/security/api/src/main/java/org/apache/isis/security/api/authorization/standard/Authorizor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.authorization.standard;
+package org.apache.isis.security.api.authorization.standard;
import org.apache.isis.applib.Identifier;
import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
diff --git a/core/security/api/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
deleted file mode 100644
index 991819d..0000000
--- a/core/security/api/src/main/java/org/apache/isis/security/authentication/package-info.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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 agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Defines the {@link org.apache.isis.security.authentication.AuthenticationSession}
- * interface that represent a user's session identifier once they have logged on.
- *
- * <p>
- * The {@link org.apache.isis.security.authentication.AuthenticationSession}
- * broadly corresponds to the <tt>UserMemento</tt> and <tt>RoleMemento</tt>
- * that are defined in the applib. An {@link org.apache.isis.security.authentication.AuthenticationSession}
- * is required in order to interact with the rest of the framework.
- */
-package org.apache.isis.security.authentication;
\ No newline at end of file
diff --git a/core/security/api/src/test/java/org/apache/isis/security/EncodabilityContractTest.java b/core/security/api/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
index 29ce025..e5e571c 100644
--- a/core/security/api/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
+++ b/core/security/api/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
@@ -32,7 +32,7 @@ import org.apache.isis.commons.internal.encoding.DataInputExtended;
import org.apache.isis.commons.internal.encoding.DataInputStreamExtended;
import org.apache.isis.commons.internal.encoding.DataOutputStreamExtended;
import org.apache.isis.commons.internal.encoding.Encodable;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
diff --git a/core/security/api/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
index 5e416fc..2a45496 100644
--- a/core/security/api/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
@@ -19,6 +19,7 @@
package org.apache.isis.security.authentication.standard;
+import org.apache.isis.security.api.authentication.standard.AuthenticatorAbstract;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
@@ -26,7 +27,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.security.authentication.AuthenticationRequest;
+import org.apache.isis.security.api.authentication.AuthenticationRequest;
@RunWith(JMock.class)
public class AuthenticatorDefaultTest {
diff --git a/core/security/api/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
index 796954e..29e5710 100644
--- a/core/security/api/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
@@ -19,6 +19,7 @@
package org.apache.isis.security.authentication.standard;
+import org.apache.isis.security.api.authentication.standard.SimpleSession;
import org.jmock.integration.junit4.JMock;
import org.junit.runner.RunWith;
diff --git a/core/security/api/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
index d1c5b62..4300fa1 100644
--- a/core/security/api/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
@@ -20,6 +20,7 @@
package org.apache.isis.security.authentication.standard;
import org.apache.isis.security.EncodabilityContractTest;
+import org.apache.isis.security.api.authentication.standard.SimpleSession;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
diff --git a/core/security/api/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
index a51dc33..abc7567 100644
--- a/core/security/api/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
@@ -19,6 +19,7 @@
package org.apache.isis.security.authentication.standard;
+import org.apache.isis.security.api.authentication.standard.SimpleSession;
import org.jmock.integration.junit4.JMock;
import org.junit.runner.RunWith;
diff --git a/core/security/api/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
index ad37fbf..5656222 100644
--- a/core/security/api/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
@@ -19,6 +19,9 @@
package org.apache.isis.security.authentication.standard;
+import org.apache.isis.security.api.authentication.standard.AuthenticationManagerStandard;
+import org.apache.isis.security.api.authentication.standard.Authenticator;
+import org.apache.isis.security.api.authentication.standard.RandomCodeGenerator;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
@@ -30,9 +33,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.security.authentication.AuthenticationRequest;
-import org.apache.isis.security.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationRequest;
+import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
diff --git a/core/security/api/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
index fbd16c1..439daee 100644
--- a/core/security/api/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
@@ -19,6 +19,9 @@
package org.apache.isis.security.authentication.standard;
+import org.apache.isis.security.api.authentication.standard.AuthenticationManagerStandard;
+import org.apache.isis.security.api.authentication.standard.Authenticator;
+import org.apache.isis.security.api.authentication.standard.NoAuthenticatorException;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
@@ -26,7 +29,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
diff --git a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisBootSecurityBypass.java b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisBootSecurityBypass.java
index 9cc4b3d..2c314cc 100644
--- a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisBootSecurityBypass.java
+++ b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisBootSecurityBypass.java
@@ -26,10 +26,10 @@ import org.springframework.context.annotation.Import;
import org.apache.isis.runtime.services.auth.AuthorizationManagerStandard;
import org.apache.isis.security.bypass.authentication.AuthenticatorBypass;
-import org.apache.isis.security.authentication.standard.AuthenticationManagerStandard;
-import org.apache.isis.security.authentication.standard.Authenticator;
+import org.apache.isis.security.api.authentication.standard.AuthenticationManagerStandard;
+import org.apache.isis.security.api.authentication.standard.Authenticator;
import org.apache.isis.security.bypass.authorization.AuthorizorBypass;
-import org.apache.isis.security.authorization.standard.Authorizor;
+import org.apache.isis.security.api.authorization.standard.Authorizor;
/**
* Auth/bypass for eg. Integration Testing
diff --git a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
index d55179a..5842cc5 100644
--- a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
+++ b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
@@ -19,8 +19,8 @@
package org.apache.isis.security.bypass.authentication;
-import org.apache.isis.security.authentication.AuthenticationRequest;
-import org.apache.isis.security.authentication.standard.AuthenticatorAbstract;
+import org.apache.isis.security.api.authentication.AuthenticationRequest;
+import org.apache.isis.security.api.authentication.standard.AuthenticatorAbstract;
/**
* Implementation that bypasses authentication.
diff --git a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
index 461df18..d97a4fa 100644
--- a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
+++ b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
@@ -20,7 +20,7 @@
package org.apache.isis.security.bypass.authorization;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.security.authorization.standard.Authorizor;
+import org.apache.isis.security.api.authorization.standard.Authorizor;
public class AuthorizorBypass implements Authorizor {
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisBootSecurityKeycloak.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisBootSecurityKeycloak.java
index 78d0efb..e6d5fbd 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisBootSecurityKeycloak.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisBootSecurityKeycloak.java
@@ -27,9 +27,9 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.security.authentication.standard.AuthenticationManagerStandard;
-import org.apache.isis.security.authentication.standard.Authenticator;
-import org.apache.isis.security.authorization.standard.Authorizor;
+import org.apache.isis.security.api.authentication.standard.AuthenticationManagerStandard;
+import org.apache.isis.security.api.authentication.standard.Authenticator;
+import org.apache.isis.security.api.authorization.standard.Authorizor;
/**
* Configuration Bean to support Isis Security using Shiro.
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/KeycloakFilter.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/KeycloakFilter.java
index d6ec678..9adf530 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/KeycloakFilter.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/KeycloakFilter.java
@@ -10,8 +10,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.isis.webapp.wormhole.AuthenticationSessionWormhole;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.standard.SimpleSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.standard.SimpleSession;
public class KeycloakFilter implements Filter {
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/WebModuleKeycloak.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/WebModuleKeycloak.java
index 29bc4fd..dbd272b 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/WebModuleKeycloak.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/WebModuleKeycloak.java
@@ -25,7 +25,6 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
-import org.apache.isis.security.authentication.AuthenticationSession;
import org.apache.isis.webapp.modules.WebModule;
import org.apache.isis.webapp.modules.WebModuleContext;
import org.springframework.core.Ordered;
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/KeycloakAuthenticator.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/KeycloakAuthenticator.java
index c1068bb..8192a06 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/KeycloakAuthenticator.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/KeycloakAuthenticator.java
@@ -24,10 +24,9 @@ import lombok.extern.log4j.Log4j2;
import javax.inject.Inject;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.security.authentication.AuthenticationRequest;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.standard.Authenticator;
-import org.apache.isis.security.keycloak.WebModuleKeycloak;
+import org.apache.isis.security.api.authentication.AuthenticationRequest;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.standard.Authenticator;
import org.apache.isis.webapp.wormhole.AuthenticationSessionWormhole;
@Log4j2 @NoArgsConstructor
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/KeycloakAuthorizor.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/KeycloakAuthorizor.java
index 49db1bc..a1908ae 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/KeycloakAuthorizor.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/KeycloakAuthorizor.java
@@ -20,7 +20,7 @@ package org.apache.isis.security.keycloak.authorization;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.security.authorization.standard.Authorizor;
+import org.apache.isis.security.api.authorization.standard.Authorizor;
public class KeycloakAuthorizor implements Authorizor {
diff --git a/core/security/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
index 36fcc24..2996ca4 100644
--- a/core/security/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
@@ -25,9 +25,9 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.runtime.services.auth.AuthorizationManagerStandard;
-import org.apache.isis.security.authentication.standard.AuthenticationManagerStandard;
-import org.apache.isis.security.authentication.standard.Authenticator;
-import org.apache.isis.security.authorization.standard.Authorizor;
+import org.apache.isis.security.api.authentication.standard.AuthenticationManagerStandard;
+import org.apache.isis.security.api.authentication.standard.Authenticator;
+import org.apache.isis.security.api.authorization.standard.Authorizor;
import org.apache.isis.security.shiro.authentication.ShiroAuthenticator;
import org.apache.isis.security.shiro.authorization.ShiroAuthorizor;
diff --git a/core/security/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
index bf521fe..44894c8 100644
--- a/core/security/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
@@ -23,8 +23,8 @@ import org.apache.shiro.UnavailableSecurityManagerException;
import org.apache.shiro.mgt.RealmSecurityManager;
import org.apache.shiro.mgt.SecurityManager;
-import org.apache.isis.security.authentication.standard.Authenticator;
-import org.apache.isis.security.authorization.standard.Authorizor;
+import org.apache.isis.security.api.authentication.standard.Authenticator;
+import org.apache.isis.security.api.authorization.standard.Authorizor;
/**
* @since 2.0
diff --git a/core/security/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
index 7b229b8..ea7059e 100644
--- a/core/security/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
@@ -45,12 +45,12 @@ import org.apache.shiro.subject.Subject;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.security.authentication.AuthenticationRequest;
-import org.apache.isis.security.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.standard.Authenticator;
-import org.apache.isis.security.authentication.standard.SimpleSession;
-import org.apache.isis.security.authorization.standard.Authorizor;
+import org.apache.isis.security.api.authentication.AuthenticationRequest;
+import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.standard.Authenticator;
+import org.apache.isis.security.api.authentication.standard.SimpleSession;
+import org.apache.isis.security.api.authorization.standard.Authorizor;
import org.apache.isis.security.shiro.ShiroSecurityContext;
import lombok.NoArgsConstructor;
diff --git a/core/security/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
index a4000d1..4bb3f82 100644
--- a/core/security/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
@@ -24,8 +24,8 @@ import org.apache.shiro.mgt.SecurityManager;
import org.apache.shiro.subject.Subject;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.security.authentication.standard.Authenticator;
-import org.apache.isis.security.authorization.standard.Authorizor;
+import org.apache.isis.security.api.authentication.standard.Authenticator;
+import org.apache.isis.security.api.authorization.standard.Authorizor;
import org.apache.isis.security.shiro.ShiroSecurityContext;
/**
diff --git a/core/security/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
index 236599e..451a948 100644
--- a/core/security/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
@@ -31,9 +31,9 @@ import org.junit.Test;
import org.apache.isis.applib.Identifier;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.security.authentication.AuthenticationRequest;
-import org.apache.isis.security.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationRequest;
+import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.shiro.authentication.ShiroAuthenticator;
import org.apache.isis.security.shiro.authorization.ShiroAuthorizor;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
diff --git a/core/security/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
index 7df96c5..87b9266 100644
--- a/core/security/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
@@ -32,8 +32,8 @@ import org.junit.Test;
import org.apache.isis.applib.Identifier;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.security.authentication.AuthenticationRequest;
-import org.apache.isis.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.security.api.authentication.AuthenticationRequest;
+import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.shiro.authentication.ShiroAuthenticator;
import org.apache.isis.security.shiro.authorization.ShiroAuthorizor;
import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
diff --git a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthenticationManagerNull.java b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthenticationManagerNull.java
index 2016ec9..9b684b9 100644
--- a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthenticationManagerNull.java
+++ b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthenticationManagerNull.java
@@ -19,10 +19,10 @@
package org.apache.isis.integtestsupport.components;
import org.apache.isis.commons.internal.components.Noop;
-import org.apache.isis.security.authentication.AuthenticationRequest;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.authentication.manager.RegistrationDetails;
+import org.apache.isis.security.api.authentication.AuthenticationRequest;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.api.authentication.manager.RegistrationDetails;
public class AuthenticationManagerNull implements AuthenticationManager, Noop {
diff --git a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthorizationManagerAllowAll.java b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthorizationManagerAllowAll.java
index ee1bf25..2ad73d7 100644
--- a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthorizationManagerAllowAll.java
+++ b/core/testsupport/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthorizationManagerAllowAll.java
@@ -19,8 +19,8 @@
package org.apache.isis.integtestsupport.components;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authorization.manager.AuthorizationManager;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
public class AuthorizationManagerAllowAll implements AuthorizationManager {
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
index c5661f3..de96120 100644
--- a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
@@ -29,7 +29,7 @@ import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.DomainObjectReprRenderer;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAdapterLinkTo;
import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationService;
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategy.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategy.java
index e39aaff..707a2b3 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategy.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategy.java
@@ -22,8 +22,8 @@ package org.apache.isis.viewer.restfulobjects.server.auth;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
/**
* Decouples the {@link IsisSessionFilter} from the mechanism of obtaining the
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyAbstract.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyAbstract.java
index 8bc8925..269d669 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyAbstract.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyAbstract.java
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpSession;
import org.springframework.web.context.support.WebApplicationContextUtils;
-import org.apache.isis.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
import lombok.val;
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyBasicAuth.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyBasicAuth.java
index 137a5f8..d9d35dc 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyBasicAuth.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyBasicAuth.java
@@ -28,8 +28,8 @@ import javax.servlet.http.HttpSession;
import org.apache.isis.commons.internal.base._Bytes;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.security.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.val;
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyDefault.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyDefault.java
index b32f40a..c09880e 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyDefault.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/auth/AuthenticationSessionStrategyDefault.java
@@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.val;
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthResourceServerside.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthResourceServerside.java
index eeac853..e56231e 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthResourceServerside.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthResourceServerside.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.services.health.Health;
import org.apache.isis.applib.services.health.HealthCheckService;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.runtime.sessiontemplate.AbstractIsisSessionTemplate;
-import org.apache.isis.security.authentication.health.HealthAuthSession;
+import org.apache.isis.security.api.authentication.health.HealthAuthSession;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java
index 1690b5c..bbbad4b 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java
@@ -23,7 +23,7 @@ import java.util.stream.Stream;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserReprRenderer.java b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserReprRenderer.java
index b4ba8d6..dc65c01 100644
--- a/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserReprRenderer.java
+++ b/core/viewers/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserReprRenderer.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.viewer.restfulobjects.server.resources;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git a/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java b/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
index dfc7d62..67db11c 100644
--- a/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
+++ b/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
@@ -40,7 +40,7 @@ import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtime.system.session.IsisSession;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index 1623def..1ec4076 100644
--- a/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/core/viewers/restfulobjects/server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -42,7 +42,7 @@ import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.system.persistence.PersistenceSession;
import org.apache.isis.runtime.system.session.IsisSession;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git a/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java b/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java
index f832483..90c6c72 100644
--- a/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java
+++ b/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.wicket.viewer.integration.wicket;
import org.apache.wicket.Session;
import org.apache.wicket.request.Request;
-import org.apache.isis.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
import lombok.Getter;
diff --git a/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java b/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
index 1a3546b..e8afac0 100644
--- a/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
+++ b/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
@@ -32,10 +32,10 @@ import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.webapp.wormhole.AuthenticationSessionWormhole;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.security.authentication.AuthenticationRequest;
-import org.apache.isis.security.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.api.authentication.AuthenticationRequest;
+import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
import org.apache.isis.viewer.wicket.model.models.BookmarkedPagesModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
diff --git a/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java b/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
index 1376fa4..3a359a5 100644
--- a/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
+++ b/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
@@ -56,8 +56,8 @@ import org.apache.isis.runtime.system.context.IsisContext;
import org.apache.isis.runtime.system.session.IsisRequestCycle;
import org.apache.isis.runtime.system.session.IsisSession;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.MessageBroker;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.MessageBroker;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
diff --git a/core/viewers/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java b/core/viewers/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java
index c1e7e81..48ae1f9 100644
--- a/core/viewers/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java
+++ b/core/viewers/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java
@@ -23,7 +23,7 @@ import org.jmock.Expectations;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.security.authentication.AuthenticationRequest;
+import org.apache.isis.security.api.authentication.AuthenticationRequest;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
diff --git a/core/viewers/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java b/core/viewers/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java
index 3305295..61f4252 100644
--- a/core/viewers/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java
+++ b/core/viewers/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java
@@ -23,7 +23,7 @@ import org.jmock.Expectations;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.security.authentication.AuthenticationRequest;
+import org.apache.isis.security.api.authentication.AuthenticationRequest;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
diff --git a/core/viewers/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_TestAbstract.java b/core/viewers/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_TestAbstract.java
index e8514fc..dd475ce 100644
--- a/core/viewers/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_TestAbstract.java
+++ b/core/viewers/wicket/impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_TestAbstract.java
@@ -30,7 +30,7 @@ import org.junit.Rule;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
diff --git a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 8af101e..d88883a 100644
--- a/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/core/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -50,7 +50,7 @@ import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.runtime.memento.ObjectAdapterMemento;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.links.LinksProvider;
import org.apache.isis.viewer.wicket.model.mementos.ActionParameterMemento;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
index ec49717..5e07768 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
@@ -40,7 +40,7 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.runtime.memento.ObjectAdapterMemento;
import org.apache.isis.runtime.system.context.IsisContext;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
index 343d7fd..a703ea9 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
@@ -23,7 +23,7 @@ import java.util.List;
import javax.inject.Inject;
import org.apache.isis.webapp.wormhole.AuthenticationSessionWormhole;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
import org.apache.wicket.MarkupContainer;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index 6e2a89c..0b6a2a7 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@ -36,7 +36,7 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.adapter.oid.RootOid;
import org.apache.isis.runtime.system.session.IsisSession;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.errors.JGrowlUtil;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
index a7ca57f..e431f89 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
@@ -28,7 +28,7 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.security.authentication.MessageBroker;
+import org.apache.isis.security.api.authentication.MessageBroker;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
/**
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
index 755f329..b0ecfb9 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
@@ -20,7 +20,7 @@ package org.apache.isis.viewer.wicket.ui.errors;
import org.apache.wicket.util.string.Strings;
-import org.apache.isis.security.authentication.MessageBroker;
+import org.apache.isis.security.api.authentication.MessageBroker;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index ff8b5c0..111946d 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -62,7 +62,7 @@ import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
import org.apache.isis.commons.internal.ioc.BeanSort;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
import org.apache.isis.viewer.wicket.model.hints.IsisEnvelopeEvent;
import org.apache.isis.viewer.wicket.model.hints.IsisEventLetterAbstract;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index bb4d7fd..f40d4a0 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -25,7 +25,7 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
index c0eabc7..c165004 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -51,8 +51,8 @@ import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.memento.ObjectAdapterMemento;
import org.apache.isis.runtime.system.session.IsisRequestCycle;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.security.authentication.AuthenticationSession;
-import org.apache.isis.security.authentication.MessageBroker;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.MessageBroker;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.BookmarkableModel;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
index 73afb0e..211366b 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.services.i18n.LocaleProvider;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.security.authentication.MessageBroker;
+import org.apache.isis.security.api.authentication.MessageBroker;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/wormhole/AuthenticationSessionWormhole.java b/core/webapp/src/main/java/org/apache/isis/webapp/wormhole/AuthenticationSessionWormhole.java
index fe37cf4..3ce3255 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/wormhole/AuthenticationSessionWormhole.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/wormhole/AuthenticationSessionWormhole.java
@@ -20,7 +20,7 @@ package org.apache.isis.webapp.wormhole;
import lombok.experimental.UtilityClass;
-import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.api.authentication.AuthenticationSession;
/**
* Just a mechanism to pass an {@link AuthenticationSession} from a filter (eg keycloak) to a viewer (eg Wicket).
diff --git a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-IsisBoot.list b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-IsisBoot.list
index 5c74a71..d4f4079 100644
--- a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-IsisBoot.list
+++ b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-IsisBoot.list
@@ -84,7 +84,7 @@ org.apache.isis.runtime.system.transaction.ChangedObjectsServiceInternal
org.apache.isis.runtime.system.transaction.PersistenceSessionServiceInternalDefault
org.apache.isis.security.bypass.authentication.AuthenticatorBypass
org.apache.isis.security.authentication.manager.AuthorizationManagerStandard
-org.apache.isis.security.authentication.standard.AuthenticationManagerStandard
+org.apache.isis.security.api.authentication.standard.AuthenticationManagerStandard
org.apache.isis.security.bypass.authorization.AuthorizorBypass
org.apache.isis.testdomain.jdo.InventoryResource
org.apache.isis.runtime.services.wrapper.WrapperFactoryDefault
\ No newline at end of file
diff --git a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list
index 2c9e98b..aaf422d 100644
--- a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list
+++ b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list
@@ -84,7 +84,7 @@ org.apache.isis.runtime.system.transaction.ChangedObjectsServiceInternal
org.apache.isis.runtime.system.transaction.PersistenceSessionServiceInternalDefault
#org.apache.isis.security.bypass.authentication.AuthenticatorBypass
org.apache.isis.security.authentication.manager.AuthorizationManagerStandard
-org.apache.isis.security.authentication.standard.AuthenticationManagerStandard
+org.apache.isis.security.api.authentication.standard.AuthenticationManagerStandard
#org.apache.isis.security.bypass.authorization.AuthorizorBypass
org.apache.isis.testdomain.jdo.InventoryResource
org.apache.isis.runtime.services.wrapper.WrapperFactoryDefault
\ No newline at end of file
diff --git a/extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleSecurityRealm.java b/extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleSecurityRealm.java
index d2eff19..bf7eacb 100644
--- a/extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleSecurityRealm.java
+++ b/extensions/security/secman/realm-shiro/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleSecurityRealm.java
@@ -24,6 +24,7 @@ import java.util.function.Supplier;
import javax.inject.Inject;
+import org.apache.isis.security.api.authorization.standard.Authorizor;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
@@ -63,7 +64,7 @@ public class IsisModuleSecurityRealm extends AuthorizingRealm implements Securit
/**
* Configures a {@link org.apache.shiro.authz.permission.PermissionResolver} that knows how to process the
* permission strings that are provided by Isis'
- * {@link org.apache.isis.security.authorization.standard.Authorizor} for Shiro.
+ * {@link Authorizor} for Shiro.
*/
public IsisModuleSecurityRealm() {
setPermissionResolver(new PermissionResolverForIsisShiroAuthorizor());