You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/06/27 13:03:23 UTC
[isis] branch v2 updated: ISIS-2126 aligning pkg names for modules
'security'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new e552cae ISIS-2126 aligning pkg names for modules 'security'
e552cae is described below
commit e552caee39a60b7589c27dad7a3b5148434b7083
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jun 27 15:03:15 2019 +0200
ISIS-2126 aligning pkg names for modules 'security'
- also fixes byte-buddy SPI due to package renaming earlier
- also fixes bean-type-registry SPI due to package renaming earlier
---
...ternal.plugins.beantyperegistry.BeanTypeRegistryPlugin} | 0
.../components/AuthenticationManagerNull.java | 8 ++++----
.../components/AuthorizationManagerAllowAll.java | 4 ++--
.../spring/IsisMavenPlugin_SpringContextConfig.java | 2 +-
.../org/apache/isis/core/metamodel/MetaModelContext.java | 8 ++++----
.../isis/core/metamodel/MetaModelContext_forTesting.java | 8 ++++----
.../isis/core/metamodel/MetaModelContext_usingCDI.java | 8 ++++----
.../isis/core/metamodel/MetaModelContext_usingSpring.java | 8 ++++----
.../disabled/forsession/DisableForSessionFacet.java | 2 +-
.../disabled/forsession/DisableForSessionFacetNone.java | 2 +-
.../forsession/DisableForSessionFacetViaMethod.java | 2 +-
.../forsession/DisableForSessionFacetViaMethodFactory.java | 2 +-
.../members/hidden/forsession/HideForSessionFacet.java | 2 +-
.../members/hidden/forsession/HideForSessionFacetNone.java | 2 +-
.../hidden/forsession/HideForSessionFacetViaMethod.java | 2 +-
.../forsession/HideForSessionFacetViaMethodFactory.java | 2 +-
.../core/metamodel/interactions/InteractionContext.java | 2 +-
.../core/metamodel/services/user/UserServiceDefault.java | 4 ++--
.../isis/core/metamodel/spec/ObjectSpecification.java | 2 +-
.../specloader/specimpl/ObjectSpecificationAbstract.java | 2 +-
.../authorization/AuthorizationManagerAbstract.java | 2 +-
.../authorization/standard/AuthorizationFacetAbstract.java | 2 +-
.../core/commons/encoding/EncodabilityContractTest.java | 2 +-
.../facets/AbstractFacetFactoryJUnit4TestCase.java | 2 +-
.../core/metamodel/facets/AbstractFacetFactoryTest.java | 4 ++--
.../facets/actions/ActionMethodsFacetFactoryTest.java | 2 +-
.../actions/action/ActionAnnotationFacetFactoryTest.java | 2 +-
.../title/annotation/TitleAnnotationFacetFactoryTest.java | 4 ++--
.../NavigableParentAnnotationFacetFactoryTest.java | 4 ++--
.../object/parseable/ParseableFacetUsingParserTest.java | 2 +-
.../value/ValueSemanticsProviderAbstractTestCase.java | 2 +-
.../specloader/SpecificationLoaderTestAbstract.java | 2 +-
.../core/metamodel/testspec/ObjectSpecificationStub.java | 2 +-
.../fixture/LogonFixtureAuthenticatorTest.java | 8 ++++----
...sis.commons.internal.plugins.codegen.ProxyFactoryPlugin | 1 +
...org.apache.isis.core.plugins.codegen.ProxyFactoryPlugin | 1 -
.../runtime/system/persistence/PersistenceSessionBase.java | 2 +-
.../transaction/IsisPlatformTransactionManagerForJdo.java | 2 +-
.../runtime/system/persistence/PersistenceSession5.java | 2 +-
.../system/persistence/PersistenceSessionFactory5.java | 2 +-
.../apache/isis/core/runtime/system/persistence/Utils.java | 2 +-
.../persistence/adapterfactory/pojo/PojoAdapterTest.java | 2 +-
.../objectstore/transaction/PojoAdapterBuilder.java | 2 +-
.../isis/core/runtime/system/ObjectMemberAbstractTest.java | 4 ++--
.../wrapper/WrapperFactoryDefaultTest_wrappedObject.java | 4 ++--
.../WrapperFactoryDefaultTest_wrappedObject_transient.java | 4 ++--
.../apache/isis/security/shiro/IsisBootSecurityShiro.java | 8 ++++----
.../apache/isis/security/shiro/ShiroSecurityContext.java | 5 ++---
.../security/shiro/authentication/ShiroAuthenticator.java | 12 ++++++------
.../isis/security/shiro/authorization/ShiroAuthorizor.java | 4 ++--
.../ShiroAuthenticatorOrAuthorizorTest_authenticate.java | 6 +++---
...roAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java | 4 ++--
.../org/apache/isis/core/runtime/headless/IsisSystem.java | 6 +++---
.../headless/auth/AuthenticationRequestNameOnly.java | 2 +-
.../apache/isis/core/wrapper/WrapperFactoryDefault.java | 2 +-
.../wrapper/handlers/DomainObjectInvocationHandler.java | 4 ++--
.../authsess/AuthenticationSessionProviderDefault.java | 6 +++---
.../services/background/ForkingInvocationHandler.java | 2 +-
.../runtime/services/message/MessageServiceDefault.java | 2 +-
.../services/sessmgmt/SessionManagementServiceDefault.java | 2 +-
.../services/userprof/UserProfileServiceDefault.java | 2 +-
.../core/webapp/auth/AuthenticationSessionStrategy.java | 4 ++--
.../webapp/auth/AuthenticationSessionStrategyAbstract.java | 4 ++--
.../auth/AuthenticationSessionStrategyBasicAuth.java | 4 ++--
.../webapp/auth/AuthenticationSessionStrategyDefault.java | 4 ++--
.../webapp/auth/AuthenticationSessionStrategyHeader.java | 4 ++--
.../isis/core/runtime/persistence/adapter/PojoAdapter.java | 2 +-
.../sessiontemplate/AbstractIsisSessionTemplate.java | 2 +-
.../isis/core/runtime/system/context/IsisContext.java | 6 +++---
.../runtime/system/context/session/RuntimeContext.java | 2 +-
.../runtime/system/context/session/RuntimeContextBase.java | 2 +-
.../runtime/system/internal/InitialisationSession.java | 2 +-
.../system/persistence/PersistenceSessionFactory.java | 2 +-
.../persistence/adaptermanager/ObjectAdapterContext.java | 2 +-
.../ObjectAdapterContext_ObjectAdapterByIdProvider.java | 2 +-
.../isis/core/runtime/system/session/IsisRequestCycle.java | 2 +-
.../isis/core/runtime/system/session/IsisSession.java | 4 ++--
.../core/runtime/system/session/IsisSessionFactory.java | 4 ++--
.../runtime/system/session/IsisSessionFactoryDefault.java | 4 ++--
.../authentication/standard/AuthenticatorDefaultTest.java | 4 ++--
.../standard/SimpleSessionEncodabilityNoRolesTest.java | 2 +-
.../standard/SimpleSessionEncodabilityTestAbstract.java | 2 +-
.../standard/SimpleSessionEncodabilityWithRolesTest.java | 2 +-
.../StandardAuthenticationManager_AuthenticationTest.java | 14 +++++++-------
.../StandardAuthenticationManager_AuthenticatorsTest.java | 9 ++++-----
.../runtime/system/ObjectActionLayoutXmlDefaultTest.java | 2 +-
.../runtime/system/OneToManyAssociationDefaultTest.java | 2 +-
core/security/pom.xml | 2 +-
.../isis/{core => }/security/IsisBootSecurityBypass.java | 14 +++++++-------
.../security/authentication/AuthenticationRequest.java | 2 +-
.../authentication/AuthenticationRequestAbstract.java | 2 +-
.../authentication/AuthenticationRequestPassword.java | 2 +-
.../security/authentication/AuthenticationSession.java | 2 +-
.../authentication/AuthenticationSessionAbstract.java | 2 +-
.../authentication/AuthenticationSessionProvider.java | 2 +-
.../{core => }/security/authentication/MessageBroker.java | 2 +-
.../authentication/bypass/AuthenticatorBypass.java | 6 +++---
.../fixtures/AuthenticationRequestLogonFixture.java | 6 +++---
.../authentication/fixtures/LogonFixtureAuthenticator.java | 6 +++---
.../security/authentication/health/HealthAuthSession.java | 4 ++--
.../authentication/manager/AuthenticationManager.java | 6 +++---
.../manager/AuthorizationManagerStandard.java | 8 ++++----
.../authentication/manager/RegistrationDetails.java | 2 +-
.../{core => }/security/authentication/package-info.java | 8 ++++----
.../singleuser/AuthenticationRequestSingleUser.java | 4 ++--
.../authentication/singleuser/SingleUserSession.java | 4 ++--
.../standard/AuthenticationManagerStandard.java | 10 +++++-----
.../security/authentication/standard/Authenticator.java | 6 +++---
.../authentication/standard/AuthenticatorAbstract.java | 6 +++---
.../authentication/standard/AuthenticatorDefault.java | 2 +-
.../authentication/standard/AuthenticatorFuncs.java | 4 ++--
.../authentication/standard/NoAuthenticatorException.java | 2 +-
.../standard/PasswordRequestAuthenticatorAbstract.java | 6 +++---
.../authentication/standard/RandomCodeGenerator.java | 2 +-
.../standard/RandomCodeGenerator10Chars.java | 2 +-
.../authentication/standard/RandomCodeGeneratorUUID.java | 2 +-
.../security/authentication/standard/Registrar.java | 4 ++--
.../standard/RegistrationDetailsPassword.java | 4 ++--
.../security/authentication/standard/SimpleSession.java | 4 ++--
.../security/authorization/bypass/AuthorizorBypass.java | 4 ++--
.../authorization/manager/AuthorizationManager.java | 4 ++--
.../authorization/standard/AuthorizationConstants.java | 2 +-
.../security/authorization/standard/Authorizor.java | 2 +-
.../isis/core/specsupport/scenarios/ScenarioExecution.java | 2 +-
.../restfulobjects/IsisRestfulObjectsSessionFilter.java | 2 +-
.../server/resources/DomainResourceHelper.java | 2 +-
.../server/resources/HealthResourceServerside.java | 2 +-
.../server/resources/HomePageReprRenderer.java | 2 +-
.../restfulobjects/server/resources/UserReprRenderer.java | 2 +-
.../restfulobjects/server/ResourceContextTest_getArg.java | 2 +-
...eContext_ensureCompatibleAcceptHeader_ContractTest.java | 2 +-
.../integration/wicket/AnonymousWebSessionForIsis.java | 2 +-
.../integration/wicket/AuthenticatedWebSessionForIsis.java | 8 ++++----
.../viewer/integration/wicket/WebRequestCycleForIsis.java | 4 ++--
.../AuthenticatedWebSessionForIsis_Authenticate.java | 5 ++---
.../app/wicket/AuthenticatedWebSessionForIsis_SignIn.java | 5 ++---
.../isis/viewer/wicket/model/models/ModelAbstract.java | 2 +-
.../isis/viewer/wicket/model/models/ScalarModel.java | 4 ++--
.../components/actionmenu/serviceactions/CssMenuItem.java | 2 +-
.../wicket/ui/components/property/PropertyEditPanel.java | 2 +-
.../ui/components/widgets/breadcrumbs/BreadcrumbPanel.java | 2 +-
.../providers/ObjectAdapterMementoProviderAbstract.java | 2 +-
.../isis/viewer/wicket/ui/errors/JGrowlBehaviour.java | 2 +-
.../apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java | 3 +--
.../apache/isis/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../apache/isis/viewer/wicket/ui/panels/FormAbstract.java | 2 +-
.../isis/viewer/wicket/ui/panels/FormExecutorDefault.java | 4 ++--
.../apache/isis/viewer/wicket/ui/panels/PanelAbstract.java | 2 +-
.../apache/isis/testdomain/jdo/JdoTestDomainModule.java | 2 +-
.../org/apache/isis/testdomain/tests/builtin-IsisBoot.json | 2 +-
.../apache/isis/testdomain/tests/builtin-singleton.json | 2 +-
151 files changed, 260 insertions(+), 265 deletions(-)
diff --git a/core/config/src/main/resources/META-INF/services/org.apache.isis.core.plugins.beantyperegistry.BeanTypeRegistryPlugin b/core/config/src/main/resources/META-INF/services/org.apache.isis.commons.internal.plugins.beantyperegistry.BeanTypeRegistryPlugin
similarity index 100%
rename from core/config/src/main/resources/META-INF/services/org.apache.isis.core.plugins.beantyperegistry.BeanTypeRegistryPlugin
rename to core/config/src/main/resources/META-INF/services/org.apache.isis.commons.internal.plugins.beantyperegistry.BeanTypeRegistryPlugin
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthenticationManagerNull.java b/core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthenticationManagerNull.java
index 7309291..1b2cf0d 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthenticationManagerNull.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthenticationManagerNull.java
@@ -20,10 +20,10 @@
package org.apache.isis.integtestsupport.components;
import org.apache.isis.commons.internal.components.Noop;
-import org.apache.isis.core.security.authentication.AuthenticationRequest;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.core.security.authentication.manager.RegistrationDetails;
+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;
public class AuthenticationManagerNull implements AuthenticationManager, Noop {
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthorizationManagerAllowAll.java b/core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthorizationManagerAllowAll.java
index 503d1b6..00b8801 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthorizationManagerAllowAll.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/integtestsupport/components/AuthorizationManagerAllowAll.java
@@ -20,8 +20,8 @@
package org.apache.isis.integtestsupport.components;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authorization.manager.AuthorizationManager;
public class AuthorizationManagerAllowAll implements AuthorizationManager {
diff --git a/core/maven-plugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java b/core/maven-plugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
index 318d7a3..1e52e57 100644
--- a/core/maven-plugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
+++ b/core/maven-plugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
@@ -25,8 +25,8 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.config.beans.WebAppConfigBean;
-import org.apache.isis.core.security.IsisBootSecurityBypass;
import org.apache.isis.runtime.spring.IsisBoot;
+import org.apache.isis.security.IsisBootSecurityBypass;
/**
* @since 2.0
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContext.java
index 6d54bfc..634acea 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContext.java
@@ -34,10 +34,10 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
+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;
/**
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
index f4a8cad..dc5f477 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
@@ -38,10 +38,10 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.services.events.MetamodelEventService;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
+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 lombok.Builder;
import lombok.Getter;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContext_usingCDI.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContext_usingCDI.java
index 5013dc0..fa95d4a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContext_usingCDI.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContext_usingCDI.java
@@ -40,10 +40,10 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.services.ServiceUtil;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
+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 lombok.Getter;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContext_usingSpring.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContext_usingSpring.java
index 4eff98d..a2fc567 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContext_usingSpring.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContext_usingSpring.java
@@ -41,10 +41,10 @@ import org.apache.isis.core.metamodel.services.ServiceUtil;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
+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 lombok.Getter;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacet.java
index 1f365bd..922b47d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacet.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.members.disabled.forsession;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
/**
* Disable a property, collection or action based on the current session.
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetNone.java
index 5454b4e..67b011a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetNone.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.facets.members.disabled.forsession;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
public class DisableForSessionFacetNone extends DisableForSessionFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetViaMethod.java
index 32f3b43..2043a26 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetViaMethod.java
@@ -27,7 +27,7 @@ import java.util.Map;
import org.apache.isis.core.commons.lang.MethodExtensions;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
public class DisableForSessionFacetViaMethod extends DisableForSessionFacetAbstract implements ImperativeFacet {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetViaMethodFactory.java
index a623ee1..fd33768 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetViaMethodFactory.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
import org.apache.isis.core.metamodel.methodutils.MethodScope;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
public class DisableForSessionFacetViaMethodFactory extends MethodPrefixBasedFacetFactoryAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacet.java
index 8f0cdf8..61f5178 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacet.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.members.hidden.forsession;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
/**
* Hide a property, collection or action based on the current session.
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetNone.java
index fabf3ce..647315e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetNone.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.metamodel.facets.members.hidden.forsession;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
public class HideForSessionFacetNone extends HideForSessionFacetAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetViaMethod.java
index 2474c73..c430d14 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetViaMethod.java
@@ -27,7 +27,7 @@ import java.util.Map;
import org.apache.isis.core.commons.lang.MethodExtensions;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
public class HideForSessionFacetViaMethod extends HideForSessionFacetAbstract implements ImperativeFacet {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetViaMethodFactory.java
index 0704235..0ce5f15 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetViaMethodFactory.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
import org.apache.isis.core.metamodel.methodutils.MethodScope;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
public class HideForSessionFacetViaMethodFactory extends MethodPrefixBasedFacetFactoryAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
index 80941d4..c0e0d05 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.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/core/metamodel/services/user/UserServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
index b1ddd99..e7dcc6e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
@@ -32,8 +32,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.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
@Singleton
public class UserServiceDefault implements UserService {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
index 8e56666..dc36d66 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
@@ -58,7 +58,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
import org.apache.isis.core.metamodel.specloader.specimpl.MixedInMember;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
/**
* Represents an entity or value (cf {@link java.lang.Class}) within the
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 4cb71d3..5f3f6b3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -90,8 +90,8 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
import org.apache.isis.core.metamodel.specloader.postprocessor.PostProcessor;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
+import org.apache.isis.security.authentication.AuthenticationSession;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManagerAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManagerAbstract.java
index 08e1a09..835d821 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManagerAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManagerAbstract.java
@@ -20,7 +20,7 @@
package org.apache.isis.core.runtime.authorization;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
-import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
+import org.apache.isis.security.authorization.manager.AuthorizationManager;
public abstract class AuthorizationManagerAbstract implements AuthorizationManager, MetaModelRefiner {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationFacetAbstract.java
index 4b4ad18..22b8ced 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationFacetAbstract.java
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
+import org.apache.isis.security.authorization.manager.AuthorizationManager;
public abstract class AuthorizationFacetAbstract extends FacetAbstract implements AuthorizationFacet {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/encoding/EncodabilityContractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/encoding/EncodabilityContractTest.java
index c5fb991..1c60e0b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/encoding/EncodabilityContractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/encoding/EncodabilityContractTest.java
@@ -34,7 +34,7 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.isis.commons.internal.encoding.DataInputExtended;
import org.apache.isis.commons.internal.encoding.Encodable;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
public abstract class EncodabilityContractTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
index 53d9669..dfcc6c3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
@@ -47,9 +47,9 @@ import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
public abstract class AbstractFacetFactoryJUnit4TestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
index 99d5892..33f62d3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
@@ -37,9 +37,9 @@ import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
import junit.framework.TestCase;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
index cb8f475..cd74cdd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
@@ -59,8 +59,8 @@ import org.apache.isis.core.metamodel.facets.param.defaults.methodnum.ActionPara
import org.apache.isis.core.metamodel.facets.param.defaults.methodnum.ActionParameterDefaultsFacetViaMethodFactory;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.testspec.ObjectSpecificationStub;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.security.authentication.AuthenticationSession;
public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
index df8c254..0d601a5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
@@ -32,7 +32,7 @@ import org.apache.isis.config.internal._Config;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.object.domainobject.domainevents.ActionDomainEventDefaultFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
index 76f93db..d0910be 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
@@ -36,8 +36,8 @@ import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation.TitleComponent;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.After;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
index d635b5a..b76393c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
@@ -36,8 +36,8 @@ import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.navparent.NavigableParentFacet;
import org.apache.isis.core.metamodel.facets.object.navparent.annotation.NavigableParentTestSamples.DomainObjectA;
import org.apache.isis.core.metamodel.facets.object.navparent.method.NavigableParentFacetMethod;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
public class NavigableParentAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
index d0aea49..0a2a0ab 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
@@ -37,9 +37,9 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.core.metamodel.services.persistsession.ObjectAdapterService;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
public class ParseableFacetUsingParserTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index b7d298e..fce1468 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -41,9 +41,9 @@ import org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFa
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.core.metamodel.services.persistsession.ObjectAdapterService;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.After;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
index c5ad813..80dd20e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
@@ -40,8 +40,8 @@ import org.apache.isis.core.metamodel.metamodelvalidator.dflt.MetaModelValidator
import org.apache.isis.core.metamodel.progmodel.ProgrammingModelAbstract.DeprecatedPolicy;
import org.apache.isis.core.metamodel.services.persistsession.ObjectAdapterService;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.progmodels.dflt.ProgrammingModelFacetsJava5;
+import org.apache.isis.security.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/core/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
index bb42704..b6c1773 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
@@ -44,7 +44,7 @@ import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSpecification {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticatorTest.java b/core/metamodel/src/test/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticatorTest.java
index a585202..b91ffe1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticatorTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticatorTest.java
@@ -26,13 +26,13 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.core.security.authentication.AuthenticationRequestAbstract;
-import org.apache.isis.core.security.authentication.fixtures.AuthenticationRequestLogonFixture;
-import org.apache.isis.core.security.authentication.fixtures.LogonFixtureAuthenticator;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.security.authentication.AuthenticationRequestAbstract;
+import org.apache.isis.security.authentication.fixtures.AuthenticationRequestLogonFixture;
+import org.apache.isis.security.authentication.fixtures.LogonFixtureAuthenticator;
+
@RunWith(JMock.class)
public class LogonFixtureAuthenticatorTest {
diff --git a/core/plugins/codegen-bytebuddy/src/main/resources/META-INF/services/org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryPlugin b/core/plugins/codegen-bytebuddy/src/main/resources/META-INF/services/org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryPlugin
new file mode 100644
index 0000000..25e0269
--- /dev/null
+++ b/core/plugins/codegen-bytebuddy/src/main/resources/META-INF/services/org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryPlugin
@@ -0,0 +1 @@
+org.apache.isis.core.plugins.codegen.ProxyFactoryPluginUsingByteBuddy
\ No newline at end of file
diff --git a/core/plugins/codegen-bytebuddy/src/main/resources/META-INF/services/org.apache.isis.core.plugins.codegen.ProxyFactoryPlugin b/core/plugins/codegen-bytebuddy/src/main/resources/META-INF/services/org.apache.isis.core.plugins.codegen.ProxyFactoryPlugin
deleted file mode 100644
index f114dd5..0000000
--- a/core/plugins/codegen-bytebuddy/src/main/resources/META-INF/services/org.apache.isis.core.plugins.codegen.ProxyFactoryPlugin
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryPluginUsingByteBuddy
\ No newline at end of file
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionBase.java b/core/plugins/jdo-common/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionBase.java
index 08c6d86..da8eaee 100644
--- a/core/plugins/jdo-common/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionBase.java
+++ b/core/plugins/jdo-common/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionBase.java
@@ -39,8 +39,8 @@ import org.apache.isis.core.runtime.persistence.FixturesInstalledStateHolder;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.transaction.ChangedObjectsServiceInternal;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManagerJdoInternal;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.objectstore.jdo.datanucleus.persistence.queries.PersistenceQueryProcessor;
+import org.apache.isis.security.authentication.AuthenticationSession;
import lombok.Getter;
import lombok.extern.log4j.Log4j2;
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/transaction/IsisPlatformTransactionManagerForJdo.java b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/transaction/IsisPlatformTransactionManagerForJdo.java
index 0272c77..f724071 100644
--- a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/transaction/IsisPlatformTransactionManagerForJdo.java
+++ b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/transaction/IsisPlatformTransactionManagerForJdo.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.runtime.system.session.IsisSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionAspectSupport;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionObject;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionException;
import org.springframework.transaction.support.AbstractPlatformTransactionManager;
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java
index f8d31cb..90ed5d8 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession5.java
@@ -88,13 +88,13 @@ import org.apache.isis.core.runtime.services.RequestScopedService;
import org.apache.isis.core.runtime.system.persistence.adaptermanager.ObjectAdapterContext;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManagerJdoInternal;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.objectstore.jdo.datanucleus.persistence.commands.DataNucleusCreateObjectCommand;
import org.apache.isis.objectstore.jdo.datanucleus.persistence.commands.DataNucleusDeleteObjectCommand;
import org.apache.isis.objectstore.jdo.datanucleus.persistence.queries.PersistenceQueryFindAllInstancesProcessor;
import org.apache.isis.objectstore.jdo.datanucleus.persistence.queries.PersistenceQueryFindUsingApplibQueryProcessor;
import org.apache.isis.objectstore.jdo.datanucleus.persistence.queries.PersistenceQueryProcessor;
import org.apache.isis.objectstore.jdo.datanucleus.persistence.spi.JdoObjectIdSerializer;
+import org.apache.isis.security.authentication.AuthenticationSession;
import static java.util.Objects.requireNonNull;
import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory5.java
index de21a1e..cc1825d 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory5.java
@@ -33,9 +33,9 @@ import org.apache.isis.config.internal._Config;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.FixturesInstalledState;
import org.apache.isis.core.runtime.persistence.FixturesInstalledStateHolder;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.objectstore.jdo.datanucleus.JDOStateManagerForIsis;
import org.apache.isis.objectstore.jdo.service.JdoEntityTypeRegistry;
+import org.apache.isis.security.authentication.AuthenticationSession;
import org.datanucleus.PropertyNames;
import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/Utils.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/Utils.java
index 5e0f840..8459b22 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/Utils.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/Utils.java
@@ -25,7 +25,7 @@ import javax.jdo.listener.InstanceLifecycleEvent;
import org.datanucleus.enhancement.Persistable;
import org.apache.isis.core.metamodel.adapter.version.Version;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
public class Utils {
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index 22f81db..a5fb3b5 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -36,9 +36,9 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PojoAdapterBuilder;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession5;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.security.authentication.AuthenticationSession;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
index 20971b8..2e68de0 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession5;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
public class PojoAdapterBuilder {
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
index 394f043..f5075f9 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
@@ -57,10 +57,10 @@ import org.apache.isis.core.metamodel.specloader.specimpl.ObjectMemberAbstract;
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PojoAdapterBuilder;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PojoAdapterBuilder.Persistence;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
import org.datanucleus.enhancement.Persistable;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index 718aee9..3d926b0 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -61,14 +61,14 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.OneToOneAssociationDefault;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.security.authentication.standard.SimpleSession;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.progmodel.wrapper.dom.employees.Employee;
import org.apache.isis.progmodel.wrapper.dom.employees.EmployeeRepository;
import org.apache.isis.progmodel.wrapper.dom.employees.EmployeeRepositoryImpl;
import org.apache.isis.schema.cmd.v1.CommandDto;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.authentication.standard.SimpleSession;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index 08588a9..870624a 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -57,11 +57,11 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.security.authentication.standard.SimpleSession;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.progmodel.wrapper.dom.employees.Employee;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.authentication.standard.SimpleSession;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java
index 244a450..e1f1e1d 100644
--- a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java
+++ b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/IsisBootSecurityShiro.java
@@ -21,10 +21,10 @@ package org.apache.isis.security.shiro;
import javax.enterprise.inject.Produces;
import javax.inject.Singleton;
-import org.apache.isis.core.security.authentication.manager.AuthorizationManagerStandard;
-import org.apache.isis.core.security.authentication.standard.AuthenticationManagerStandard;
-import org.apache.isis.core.security.authentication.standard.Authenticator;
-import org.apache.isis.core.security.authorization.standard.Authorizor;
+import org.apache.isis.security.authentication.manager.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.shiro.authentication.ShiroAuthenticator;
import org.apache.isis.security.shiro.authorization.ShiroAuthorizor;
import org.springframework.context.annotation.Bean;
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java
index 8749b7d..8679fea 100644
--- a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java
+++ b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroSecurityContext.java
@@ -18,14 +18,13 @@
*/
package org.apache.isis.security.shiro;
+import org.apache.isis.security.authentication.standard.Authenticator;
+import org.apache.isis.security.authorization.standard.Authorizor;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.UnavailableSecurityManagerException;
import org.apache.shiro.mgt.RealmSecurityManager;
import org.apache.shiro.mgt.SecurityManager;
-import org.apache.isis.core.security.authentication.standard.Authenticator;
-import org.apache.isis.core.security.authorization.standard.Authorizor;
-
/**
* @since 2.0
*/
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java
index 816ca81..4933311 100644
--- a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java
+++ b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authentication/ShiroAuthenticator.java
@@ -41,12 +41,12 @@ import org.apache.shiro.subject.PrincipalCollection;
import org.apache.shiro.subject.Subject;
import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.core.security.authentication.AuthenticationRequest;
-import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.standard.Authenticator;
-import org.apache.isis.core.security.authentication.standard.SimpleSession;
-import org.apache.isis.core.security.authorization.standard.Authorizor;
+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.shiro.ShiroSecurityContext;
import static org.apache.isis.config.internal._Config.getConfiguration;
diff --git a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java b/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java
index bf51506..38f059b 100644
--- a/core/plugins/security-shiro/src/main/java/org/apache/isis/security/shiro/authorization/ShiroAuthorizor.java
+++ b/core/plugins/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.core.security.authentication.standard.Authenticator;
-import org.apache.isis.core.security.authorization.standard.Authorizor;
+import org.apache.isis.security.authentication.standard.Authenticator;
+import org.apache.isis.security.authorization.standard.Authorizor;
import org.apache.isis.security.shiro.ShiroSecurityContext;
/**
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
index 87e1f52..be4e04f 100644
--- a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
+++ b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
@@ -31,11 +31,11 @@ import org.junit.Test;
import org.apache.isis.applib.Identifier;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.security.authentication.AuthenticationRequest;
-import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+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.shiro.authentication.ShiroAuthenticator;
import org.apache.isis.security.shiro.authorization.ShiroAuthorizor;
diff --git a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index a20fbd6..1610d68 100644
--- a/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/core/plugins/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -33,10 +33,10 @@ import org.junit.Test;
import org.apache.isis.applib.Identifier;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
-import org.apache.isis.core.security.authentication.AuthenticationRequest;
-import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.security.authentication.AuthenticationRequest;
+import org.apache.isis.security.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.shiro.authentication.ShiroAuthenticator;
import org.apache.isis.security.shiro.authorization.ShiroAuthorizor;
diff --git a/core/runtime-extensions/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java b/core/runtime-extensions/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java
index 2a0a0f0..9f30e11 100644
--- a/core/runtime-extensions/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java
+++ b/core/runtime-extensions/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java
@@ -29,9 +29,9 @@ import org.apache.isis.config.internal._Config;
import org.apache.isis.core.runtime.headless.auth.AuthenticationRequestNameOnly;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.security.authentication.AuthenticationRequest;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.authentication.AuthenticationRequest;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.manager.AuthenticationManager;
import lombok.val;
diff --git a/core/runtime-extensions/src/main/java/org/apache/isis/core/runtime/headless/auth/AuthenticationRequestNameOnly.java b/core/runtime-extensions/src/main/java/org/apache/isis/core/runtime/headless/auth/AuthenticationRequestNameOnly.java
index c7f1374..d320552 100644
--- a/core/runtime-extensions/src/main/java/org/apache/isis/core/runtime/headless/auth/AuthenticationRequestNameOnly.java
+++ b/core/runtime-extensions/src/main/java/org/apache/isis/core/runtime/headless/auth/AuthenticationRequestNameOnly.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.runtime.headless.auth;
-import org.apache.isis.core.security.authentication.AuthenticationRequestAbstract;
+import org.apache.isis.security.authentication.AuthenticationRequestAbstract;
public class AuthenticationRequestNameOnly extends AuthenticationRequestAbstract {
diff --git a/core/runtime-extensions/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java b/core/runtime-extensions/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
index 38c5426..aecc0c4 100644
--- a/core/runtime-extensions/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
+++ b/core/runtime-extensions/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
@@ -53,11 +53,11 @@ import org.apache.isis.applib.services.wrapper.listeners.InteractionListener;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.wrapper.dispatchers.InteractionEventDispatcher;
import org.apache.isis.core.wrapper.dispatchers.InteractionEventDispatcherTypeSafe;
import org.apache.isis.core.wrapper.handlers.ProxyContextHandler;
import org.apache.isis.core.wrapper.proxy.ProxyCreator;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
/**
* This service provides the ability to "wrap" of a domain object such that it can
diff --git a/core/runtime-extensions/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java b/core/runtime-extensions/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
index 387c090..c70245c 100644
--- a/core/runtime-extensions/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/runtime-extensions/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -70,8 +70,8 @@ import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionMixedIn;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
import lombok.val;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
index 798e284..a8371bc 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
@@ -22,9 +22,9 @@ import javax.inject.Singleton;
import org.apache.isis.core.metamodel.services.user.UserServiceDefault;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.security.authentication.standard.SimpleSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.authentication.standard.SimpleSession;
@Singleton
public class AuthenticationSessionProviderDefault implements AuthenticationSessionProvider {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/background/ForkingInvocationHandler.java b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/background/ForkingInvocationHandler.java
index 3bb700b..5473052 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/background/ForkingInvocationHandler.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/background/ForkingInvocationHandler.java
@@ -26,7 +26,7 @@ import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.internal.InitialisationSession;
import org.apache.isis.core.runtime.system.session.IsisSession;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
import static org.apache.isis.commons.internal.base._With.requires;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/message/MessageServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/message/MessageServiceDefault.java
index 019cc4e..7bc8c0a 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/message/MessageServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/core/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.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.security.authentication.MessageBroker;
+import org.apache.isis.security.authentication.MessageBroker;
@Singleton @Primary
public class MessageServiceDefault implements MessageService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java
index 2692db8..c34fd33 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java
@@ -24,7 +24,7 @@ import javax.inject.Singleton;
import org.apache.isis.applib.services.sessmgmt.SessionManagementService;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
@Singleton
public class SessionManagementServiceDefault implements SessionManagementService {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/userprof/UserProfileServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/userprof/UserProfileServiceDefault.java
index 64f4afe..cb705ff 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/core/runtime/services/userprof/UserProfileServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/core/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.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
@DomainService(nature = NatureOfService.DOMAIN)
public class UserProfileServiceDefault implements UserProfileService {
diff --git a/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategy.java b/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategy.java
index 3378d25..c226a7c 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategy.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategy.java
@@ -22,8 +22,8 @@ package org.apache.isis.core.webapp.auth;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.manager.AuthenticationManager;
/**
* Decouples the {@link IsisSessionFilter} from the mechanism of obtaining the
diff --git a/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyAbstract.java b/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyAbstract.java
index 962efbb..fa43732 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyAbstract.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyAbstract.java
@@ -26,8 +26,8 @@ import javax.servlet.http.HttpSession;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.manager.AuthenticationManager;
public abstract class AuthenticationSessionStrategyAbstract implements AuthenticationSessionStrategy {
diff --git a/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyBasicAuth.java b/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyBasicAuth.java
index 2301cc6..fae8d63 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyBasicAuth.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyBasicAuth.java
@@ -29,8 +29,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.core.security.authentication.AuthenticationRequestPassword;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.security.authentication.AuthenticationSession;
/**
* Implements the HTTP Basic Auth protocol; does not bind the
diff --git a/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java b/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
index 1da5ea9..da19752 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
@@ -24,8 +24,8 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.isis.config.WebAppConstants;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.manager.AuthenticationManager;
/**
* Returns a valid {@link AuthenticationSession} through a number of mechanisms;
diff --git a/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyHeader.java b/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyHeader.java
index 16f4941..249e4cf 100644
--- a/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyHeader.java
+++ b/core/runtime-web/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyHeader.java
@@ -27,8 +27,8 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.standard.SimpleSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.standard.SimpleSession;
/**
* Implements a home-grown protocol, whereby the user id and roles are passed
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
index c718791..3a2f41e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
@@ -38,7 +38,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSession;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
import static org.apache.isis.commons.internal.base._With.requires;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
index 9effee0..9eabe59 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
@@ -22,7 +22,7 @@ import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManagerJdoInternal;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
public abstract class AbstractIsisSessionTemplate {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
index 49536d7..46ea710 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
@@ -43,9 +43,9 @@ import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManagerJdoInternal;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
+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.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/session/RuntimeContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/session/RuntimeContext.java
index 78e2dbb..52b95cc 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/session/RuntimeContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/session/RuntimeContext.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.memento.Data;
import org.apache.isis.core.runtime.persistence.FixturesInstalledState;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
/**
* TODO [2033] this was introduced for refactoring, use MetaModelContext instead if possible
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/session/RuntimeContextBase.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/session/RuntimeContextBase.java
index 1744832..551a881 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/session/RuntimeContextBase.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/session/RuntimeContextBase.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.runtime.memento.Data;
import org.apache.isis.core.runtime.persistence.FixturesInstalledState;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/InitialisationSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/InitialisationSession.java
index 07abf2a..858c31b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/InitialisationSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/InitialisationSession.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.system.internal;
import java.io.IOException;
import org.apache.isis.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.security.authentication.AuthenticationSessionAbstract;
public final class InitialisationSession extends AuthenticationSessionAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
index a9076bb..a95324c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
@@ -18,7 +18,7 @@ package org.apache.isis.core.runtime.system.persistence;
import org.apache.isis.core.metamodel.IsisJdoRuntimePlugin;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
public interface PersistenceSessionFactory {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java
index bb157a3..fe746ba 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext.java
@@ -39,7 +39,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.memento.Data;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterByIdProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterByIdProvider.java
index ad107ea..9a8daa8 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterByIdProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/adaptermanager/ObjectAdapterContext_ObjectAdapterByIdProvider.java
@@ -40,7 +40,7 @@ import org.apache.isis.core.runtime.persistence.PojoRecreationException;
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.core.runtime.system.context.session.RuntimeContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisRequestCycle.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisRequestCycle.java
index 564a573..03fa1bf 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisRequestCycle.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisRequestCycle.java
@@ -2,7 +2,7 @@ package org.apache.isis.core.runtime.system.session;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
import lombok.val;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java
index cad9388..b11e8f0 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java
@@ -29,8 +29,8 @@ import org.apache.isis.core.runtime.system.context.session.RuntimeEventService;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManagerJdoInternal;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.MessageBroker;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.MessageBroker;
import lombok.Getter;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
index de824b5..a6cb442 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
@@ -27,8 +27,8 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.internal.InitialisationSession;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.manager.AuthenticationManager;
/**
* 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/core/runtime/system/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java
index a4b0630..7382477 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java
@@ -60,11 +60,11 @@ import org.apache.isis.core.runtime.system.internal.IsisTimeZoneInitializer;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManagerException;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManagerJdoInternal;
import org.apache.isis.core.runtime.threadpool.ThreadPoolSupport;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import org.apache.isis.schema.utils.ChangesDtoUtils;
import org.apache.isis.schema.utils.CommandDtoUtils;
import org.apache.isis.schema.utils.InteractionDtoUtils;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.manager.AuthenticationManager;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorDefaultTest.java
index 6c91e90..d39f282 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorDefaultTest.java
@@ -27,8 +27,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.core.security.authentication.AuthenticationRequest;
-import org.apache.isis.core.security.authentication.standard.AuthenticatorAbstract;
+import org.apache.isis.security.authentication.AuthenticationRequest;
+import org.apache.isis.security.authentication.standard.AuthenticatorAbstract;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
index 32943a5..c98564f 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.authentication.standard;
import org.jmock.integration.junit4.JMock;
import org.junit.runner.RunWith;
import org.apache.isis.commons.internal.encoding.Encodable;
-import org.apache.isis.core.security.authentication.standard.SimpleSession;
+import org.apache.isis.security.authentication.standard.SimpleSession;
@RunWith(JMock.class)
public class SimpleSessionEncodabilityNoRolesTest extends SimpleSessionEncodabilityTestAbstract {
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityTestAbstract.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
index 0886aae..b004f5b 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
@@ -24,7 +24,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import org.apache.isis.core.commons.encoding.EncodabilityContractTest;
-import org.apache.isis.core.security.authentication.standard.SimpleSession;
+import org.apache.isis.security.authentication.standard.SimpleSession;
public abstract class SimpleSessionEncodabilityTestAbstract extends EncodabilityContractTest {
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
index 66a4ff6..e67b7be 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.authentication.standard;
import org.jmock.integration.junit4.JMock;
import org.junit.runner.RunWith;
import org.apache.isis.commons.internal.encoding.Encodable;
-import org.apache.isis.core.security.authentication.standard.SimpleSession;
+import org.apache.isis.security.authentication.standard.SimpleSession;
@RunWith(JMock.class)
public class SimpleSessionEncodabilityWithRolesTest extends SimpleSessionEncodabilityTestAbstract {
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
index 69ed13f..1f9d60e 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
@@ -30,16 +30,16 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.core.security.authentication.AuthenticationRequest;
-import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.standard.AuthenticationManagerStandard;
-import org.apache.isis.core.security.authentication.standard.Authenticator;
-import org.apache.isis.core.security.authentication.standard.RandomCodeGenerator;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+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.AuthenticationManagerStandard;
+import org.apache.isis.security.authentication.standard.Authenticator;
+import org.apache.isis.security.authentication.standard.RandomCodeGenerator;
+
@RunWith(JMock.class)
public class StandardAuthenticationManager_AuthenticationTest {
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
index 9410d2e..6e550f3 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
@@ -21,6 +21,10 @@ package org.apache.isis.core.runtime.authentication.standard;
import java.util.List;
+import org.apache.isis.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.security.authentication.standard.AuthenticationManagerStandard;
+import org.apache.isis.security.authentication.standard.Authenticator;
+import org.apache.isis.security.authentication.standard.NoAuthenticatorException;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
@@ -28,11 +32,6 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
-import org.apache.isis.core.security.authentication.standard.AuthenticationManagerStandard;
-import org.apache.isis.core.security.authentication.standard.Authenticator;
-import org.apache.isis.core.security.authentication.standard.NoAuthenticatorException;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertThat;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
index d020062..0fb607e 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
@@ -39,9 +39,9 @@ import org.apache.isis.core.metamodel.facets.all.named.NamedFacetAbstract;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionDefault;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
public class ObjectActionLayoutXmlDefaultTest {
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
index ce82064..c395843 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
@@ -44,9 +44,9 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.OneToManyAssociationDefault;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
public class OneToManyAssociationDefaultTest {
diff --git a/core/security/pom.xml b/core/security/pom.xml
index d5ad7dd..e1b476a 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -30,7 +30,7 @@
<name>Apache Isis Security + Bypass</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.core.security</jar-plugin.automaticModuleName>
+ <jar-plugin.automaticModuleName>org.apache.isis.security</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/core/security</git-plugin.propertiesDir>
</properties>
diff --git a/core/security/src/main/java/org/apache/isis/core/security/IsisBootSecurityBypass.java b/core/security/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java
similarity index 74%
rename from core/security/src/main/java/org/apache/isis/core/security/IsisBootSecurityBypass.java
rename to core/security/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java
index 8d214fa..52ad904 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/IsisBootSecurityBypass.java
+++ b/core/security/src/main/java/org/apache/isis/security/IsisBootSecurityBypass.java
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.security;
+package org.apache.isis.security;
import javax.enterprise.inject.Produces;
import javax.inject.Singleton;
-import org.apache.isis.core.security.authentication.bypass.AuthenticatorBypass;
-import org.apache.isis.core.security.authentication.manager.AuthorizationManagerStandard;
-import org.apache.isis.core.security.authentication.standard.AuthenticationManagerStandard;
-import org.apache.isis.core.security.authentication.standard.Authenticator;
-import org.apache.isis.core.security.authorization.bypass.AuthorizorBypass;
-import org.apache.isis.core.security.authorization.standard.Authorizor;
+import org.apache.isis.security.authentication.bypass.AuthenticatorBypass;
+import org.apache.isis.security.authentication.manager.AuthorizationManagerStandard;
+import org.apache.isis.security.authentication.standard.AuthenticationManagerStandard;
+import org.apache.isis.security.authentication.standard.Authenticator;
+import org.apache.isis.security.authorization.bypass.AuthorizorBypass;
+import org.apache.isis.security.authorization.standard.Authorizor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequest.java b/core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationRequest.java
similarity index 96%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequest.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationRequest.java
index b7bd64c..e1c2823 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequest.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationRequest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication;
+package org.apache.isis.security.authentication;
import java.util.Collection;
import java.util.stream.Stream;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequestAbstract.java b/core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestAbstract.java
similarity index 96%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequestAbstract.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestAbstract.java
index 0b62ef9..bd0d203 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequestAbstract.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestAbstract.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication;
+package org.apache.isis.security.authentication;
import java.util.Set;
import java.util.stream.Stream;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequestPassword.java b/core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestPassword.java
similarity index 95%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequestPassword.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestPassword.java
index 159bbaf..7ebf80f 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequestPassword.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationRequestPassword.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication;
+package org.apache.isis.security.authentication;
public class AuthenticationRequestPassword extends AuthenticationRequestAbstract {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSession.java b/core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationSession.java
similarity index 97%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSession.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationSession.java
index af578f3..e886b46 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSession.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationSession.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication;
+package org.apache.isis.security.authentication;
import java.io.Serializable;
import java.util.List;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionAbstract.java b/core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionAbstract.java
similarity index 98%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionAbstract.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionAbstract.java
index 03a32fa..93b4c0b 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionAbstract.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionAbstract.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication;
+package org.apache.isis.security.authentication;
import java.io.IOException;
import java.io.Serializable;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionProvider.java b/core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionProvider.java
similarity index 94%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionProvider.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionProvider.java
index 408f4ac..d0d4dac 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionProvider.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/AuthenticationSessionProvider.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.core.security.authentication;
+package org.apache.isis.security.authentication;
/**
* This is implemented by an (internal) domain service
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/MessageBroker.java b/core/security/src/main/java/org/apache/isis/security/authentication/MessageBroker.java
similarity index 97%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/MessageBroker.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/MessageBroker.java
index e2f7294..be5226e 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/MessageBroker.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/MessageBroker.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication;
+package org.apache.isis.security.authentication;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/bypass/AuthenticatorBypass.java b/core/security/src/main/java/org/apache/isis/security/authentication/bypass/AuthenticatorBypass.java
similarity index 85%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/bypass/AuthenticatorBypass.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/bypass/AuthenticatorBypass.java
index 48c2857..29c5112 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/bypass/AuthenticatorBypass.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/bypass/AuthenticatorBypass.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.bypass;
+package org.apache.isis.security.authentication.bypass;
-import org.apache.isis.core.security.authentication.AuthenticationRequest;
-import org.apache.isis.core.security.authentication.standard.AuthenticatorAbstract;
+import org.apache.isis.security.authentication.AuthenticationRequest;
+import org.apache.isis.security.authentication.standard.AuthenticatorAbstract;
/**
* Implementation that bypasses authentication.
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/fixtures/AuthenticationRequestLogonFixture.java b/core/security/src/main/java/org/apache/isis/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
similarity index 87%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
index ed973cb..fdacc22 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.fixtures;
+package org.apache.isis.security.authentication.fixtures;
import java.util.Collection;
import java.util.Collections;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.core.security.authentication.AuthenticationRequestAbstract;
-import org.apache.isis.core.security.authentication.standard.AuthenticationManagerStandard;
+import org.apache.isis.security.authentication.AuthenticationRequestAbstract;
+import org.apache.isis.security.authentication.standard.AuthenticationManagerStandard;
/**
* For testing purposes, request corresponding to a {@link LogonFixture}.
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/fixtures/LogonFixtureAuthenticator.java b/core/security/src/main/java/org/apache/isis/security/authentication/fixtures/LogonFixtureAuthenticator.java
similarity index 87%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/fixtures/LogonFixtureAuthenticator.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/fixtures/LogonFixtureAuthenticator.java
index 588dd2b..396cd4e 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/fixtures/LogonFixtureAuthenticator.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/fixtures/LogonFixtureAuthenticator.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.fixtures;
+package org.apache.isis.security.authentication.fixtures;
import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.core.security.authentication.AuthenticationRequest;
-import org.apache.isis.core.security.authentication.standard.AuthenticatorAbstract;
+import org.apache.isis.security.authentication.AuthenticationRequest;
+import org.apache.isis.security.authentication.standard.AuthenticatorAbstract;
public class LogonFixtureAuthenticator extends AuthenticatorAbstract {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthSession.java b/core/security/src/main/java/org/apache/isis/security/authentication/health/HealthAuthSession.java
similarity index 90%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthSession.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/health/HealthAuthSession.java
index 770ee07..64e0901 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthSession.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/health/HealthAuthSession.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.health;
+package org.apache.isis.security.authentication.health;
import java.io.IOException;
import java.util.stream.Stream;
import org.apache.isis.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.security.authentication.AuthenticationSessionAbstract;
public class HealthAuthSession extends AuthenticationSessionAbstract {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java b/core/security/src/main/java/org/apache/isis/security/authentication/manager/AuthenticationManager.java
similarity index 90%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/manager/AuthenticationManager.java
index cc5c1da..df5f6e6 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/manager/AuthenticationManager.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.manager;
+package org.apache.isis.security.authentication.manager;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
-import org.apache.isis.core.security.authentication.AuthenticationRequest;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationRequest;
+import org.apache.isis.security.authentication.AuthenticationSession;
/**
* Implementing class is added to {@link ServicesInjector} as an (internal) domain service;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthorizationManagerStandard.java b/core/security/src/main/java/org/apache/isis/security/authentication/manager/AuthorizationManagerStandard.java
similarity index 92%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthorizationManagerStandard.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/manager/AuthorizationManagerStandard.java
index 782a1e2..791b339 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthorizationManagerStandard.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/manager/AuthorizationManagerStandard.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.manager;
+package org.apache.isis.security.authentication.manager;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -26,9 +26,9 @@ import javax.inject.Singleton;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.sudo.SudoService;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
-import org.apache.isis.core.security.authorization.standard.Authorizor;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authorization.manager.AuthorizationManager;
+import org.apache.isis.security.authorization.standard.Authorizor;
@Singleton
public class AuthorizationManagerStandard implements AuthorizationManager {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/RegistrationDetails.java b/core/security/src/main/java/org/apache/isis/security/authentication/manager/RegistrationDetails.java
similarity index 93%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/manager/RegistrationDetails.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/manager/RegistrationDetails.java
index 1bdb942..b4022eb 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/RegistrationDetails.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/manager/RegistrationDetails.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.security.authentication.manager;
+package org.apache.isis.security.authentication.manager;
public interface RegistrationDetails {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/package-info.java b/core/security/src/main/java/org/apache/isis/security/authentication/package-info.java
similarity index 75%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/package-info.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/package-info.java
index 7c3a7dd..991819d 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/package-info.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/package-info.java
@@ -18,13 +18,13 @@
*/
/**
- * Defines the {@link org.apache.isis.core.security.authentication.AuthenticationSession}
+ * 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.core.security.authentication.AuthenticationSession}
+ * 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.core.security.authentication.AuthenticationSession}
+ * 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.core.security.authentication;
\ No newline at end of file
+package org.apache.isis.security.authentication;
\ No newline at end of file
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/AuthenticationRequestSingleUser.java b/core/security/src/main/java/org/apache/isis/security/authentication/singleuser/AuthenticationRequestSingleUser.java
similarity index 89%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/AuthenticationRequestSingleUser.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/singleuser/AuthenticationRequestSingleUser.java
index e679dbf..da7dcbe 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/AuthenticationRequestSingleUser.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/singleuser/AuthenticationRequestSingleUser.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.singleuser;
+package org.apache.isis.security.authentication.singleuser;
-import org.apache.isis.core.security.authentication.AuthenticationRequestAbstract;
+import org.apache.isis.security.authentication.AuthenticationRequestAbstract;
/**
* Requests corresponding to an {@link SingleUserSession}.
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserSession.java b/core/security/src/main/java/org/apache/isis/security/authentication/singleuser/SingleUserSession.java
similarity index 92%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserSession.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/singleuser/SingleUserSession.java
index 50dc709..4f2035d 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserSession.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/singleuser/SingleUserSession.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.singleuser;
+package org.apache.isis.security.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.core.security.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.security.authentication.AuthenticationSessionAbstract;
public final class SingleUserSession extends AuthenticationSessionAbstract implements Encodable {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticationManagerStandard.java b/core/security/src/main/java/org/apache/isis/security/authentication/standard/AuthenticationManagerStandard.java
similarity index 95%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticationManagerStandard.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/standard/AuthenticationManagerStandard.java
index 524e530..be2df4e 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticationManagerStandard.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/standard/AuthenticationManagerStandard.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.standard;
+package org.apache.isis.security.authentication.standard;
import java.util.Collection;
import java.util.Collections;
@@ -33,10 +33,10 @@ import org.apache.isis.applib.util.ToString;
import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.core.security.authentication.AuthenticationRequest;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.core.security.authentication.manager.RegistrationDetails;
+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 static org.apache.isis.commons.internal.base._NullSafe.stream;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Authenticator.java b/core/security/src/main/java/org/apache/isis/security/authentication/standard/Authenticator.java
similarity index 87%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Authenticator.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/standard/Authenticator.java
index 7e94685..2a6ce71 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Authenticator.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/standard/Authenticator.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.standard;
+package org.apache.isis.security.authentication.standard;
import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
-import org.apache.isis.core.security.authentication.AuthenticationRequest;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationRequest;
+import org.apache.isis.security.authentication.AuthenticationSession;
public interface Authenticator extends ApplicationScopedComponent {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorAbstract.java b/core/security/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorAbstract.java
similarity index 89%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorAbstract.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorAbstract.java
index e16bd77..4704168 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorAbstract.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorAbstract.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.standard;
+package org.apache.isis.security.authentication.standard;
-import org.apache.isis.core.security.authentication.AuthenticationRequest;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationRequest;
+import org.apache.isis.security.authentication.AuthenticationSession;
public abstract class AuthenticatorAbstract implements Authenticator {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorDefault.java b/core/security/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorDefault.java
similarity index 93%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorDefault.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorDefault.java
index 2d109eb..4d5c595 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorDefault.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.standard;
+package org.apache.isis.security.authentication.standard;
public abstract class AuthenticatorDefault extends AuthenticatorAbstract {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorFuncs.java b/core/security/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorFuncs.java
similarity index 90%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorFuncs.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorFuncs.java
index ce671c8..b8a5273 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorFuncs.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/standard/AuthenticatorFuncs.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.standard;
+package org.apache.isis.security.authentication.standard;
import java.util.function.Predicate;
-import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.security.authentication.AuthenticationRequest;
public final class AuthenticatorFuncs {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/NoAuthenticatorException.java b/core/security/src/main/java/org/apache/isis/security/authentication/standard/NoAuthenticatorException.java
similarity index 95%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/standard/NoAuthenticatorException.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/standard/NoAuthenticatorException.java
index 01de904..f614697 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/NoAuthenticatorException.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/standard/NoAuthenticatorException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.standard;
+package org.apache.isis.security.authentication.standard;
import org.apache.isis.commons.exceptions.IsisException;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/PasswordRequestAuthenticatorAbstract.java b/core/security/src/main/java/org/apache/isis/security/authentication/standard/PasswordRequestAuthenticatorAbstract.java
similarity index 84%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/standard/PasswordRequestAuthenticatorAbstract.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/standard/PasswordRequestAuthenticatorAbstract.java
index 4dcabfd..1f85b83 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/PasswordRequestAuthenticatorAbstract.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/standard/PasswordRequestAuthenticatorAbstract.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.standard;
+package org.apache.isis.security.authentication.standard;
-import org.apache.isis.core.security.authentication.AuthenticationRequest;
-import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.security.authentication.AuthenticationRequest;
+import org.apache.isis.security.authentication.AuthenticationRequestPassword;
public abstract class PasswordRequestAuthenticatorAbstract extends AuthenticatorAbstract {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGenerator.java b/core/security/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator.java
similarity index 93%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGenerator.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator.java
index f288062..ad0482a 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGenerator.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.standard;
+package org.apache.isis.security.authentication.standard;
public interface RandomCodeGenerator {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGenerator10Chars.java b/core/security/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator10Chars.java
similarity index 95%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGenerator10Chars.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator10Chars.java
index 8299c69..d513530 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGenerator10Chars.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGenerator10Chars.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.security.authentication.standard;
+package org.apache.isis.security.authentication.standard;
import java.util.Random;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGeneratorUUID.java b/core/security/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGeneratorUUID.java
similarity index 95%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGeneratorUUID.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGeneratorUUID.java
index 12ec5c8..04a2490 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGeneratorUUID.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/standard/RandomCodeGeneratorUUID.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.standard;
+package org.apache.isis.security.authentication.standard;
import java.util.UUID;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Registrar.java b/core/security/src/main/java/org/apache/isis/security/authentication/standard/Registrar.java
similarity index 92%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Registrar.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/standard/Registrar.java
index 021ecf1..d415a51 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Registrar.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/standard/Registrar.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.standard;
+package org.apache.isis.security.authentication.standard;
import java.util.function.Function;
import java.util.function.Predicate;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
-import org.apache.isis.core.security.authentication.manager.RegistrationDetails;
+import org.apache.isis.security.authentication.manager.RegistrationDetails;
public interface Registrar extends Authenticator, ApplicationScopedComponent {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RegistrationDetailsPassword.java b/core/security/src/main/java/org/apache/isis/security/authentication/standard/RegistrationDetailsPassword.java
similarity index 89%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RegistrationDetailsPassword.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/standard/RegistrationDetailsPassword.java
index 3ca5fb7..3ca3869 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RegistrationDetailsPassword.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/standard/RegistrationDetailsPassword.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.security.authentication.standard;
+package org.apache.isis.security.authentication.standard;
-import org.apache.isis.core.security.authentication.manager.RegistrationDetails;
+import org.apache.isis.security.authentication.manager.RegistrationDetails;
public class RegistrationDetailsPassword implements RegistrationDetails {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleSession.java b/core/security/src/main/java/org/apache/isis/security/authentication/standard/SimpleSession.java
similarity index 95%
rename from core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleSession.java
rename to core/security/src/main/java/org/apache/isis/security/authentication/standard/SimpleSession.java
index 9376393..166d2d8 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleSession.java
+++ b/core/security/src/main/java/org/apache/isis/security/authentication/standard/SimpleSession.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.isis.core.security.authentication.standard;
+package org.apache.isis.security.authentication.standard;
import java.io.IOException;
import java.util.stream.Stream;
import org.apache.isis.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.security.authentication.AuthenticationSessionAbstract;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authorization/bypass/AuthorizorBypass.java b/core/security/src/main/java/org/apache/isis/security/authorization/bypass/AuthorizorBypass.java
similarity index 92%
rename from core/security/src/main/java/org/apache/isis/core/security/authorization/bypass/AuthorizorBypass.java
rename to core/security/src/main/java/org/apache/isis/security/authorization/bypass/AuthorizorBypass.java
index 39835c8..5efbe27 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authorization/bypass/AuthorizorBypass.java
+++ b/core/security/src/main/java/org/apache/isis/security/authorization/bypass/AuthorizorBypass.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.core.security.authorization.bypass;
+package org.apache.isis.security.authorization.bypass;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.security.authorization.standard.Authorizor;
+import org.apache.isis.security.authorization.standard.Authorizor;
public class AuthorizorBypass implements Authorizor {
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java b/core/security/src/main/java/org/apache/isis/security/authorization/manager/AuthorizationManager.java
similarity index 94%
rename from core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java
rename to core/security/src/main/java/org/apache/isis/security/authorization/manager/AuthorizationManager.java
index 5cd9d83..5aa87f8 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java
+++ b/core/security/src/main/java/org/apache/isis/security/authorization/manager/AuthorizationManager.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.isis.core.security.authorization.manager;
+package org.apache.isis.security.authorization.manager;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
/**
* Authorizes the user in the current session view and use members of an object.
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/AuthorizationConstants.java b/core/security/src/main/java/org/apache/isis/security/authorization/standard/AuthorizationConstants.java
similarity index 94%
rename from core/security/src/main/java/org/apache/isis/core/security/authorization/standard/AuthorizationConstants.java
rename to core/security/src/main/java/org/apache/isis/security/authorization/standard/AuthorizationConstants.java
index 5a25dd7..495ca6c 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/AuthorizationConstants.java
+++ b/core/security/src/main/java/org/apache/isis/security/authorization/standard/AuthorizationConstants.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.security.authorization.standard;
+package org.apache.isis.security.authorization.standard;
import org.apache.isis.config.ConfigurationConstants;
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/Authorizor.java b/core/security/src/main/java/org/apache/isis/security/authorization/standard/Authorizor.java
similarity index 97%
rename from core/security/src/main/java/org/apache/isis/core/security/authorization/standard/Authorizor.java
rename to core/security/src/main/java/org/apache/isis/security/authorization/standard/Authorizor.java
index 84c4b92..ec24ab7 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/Authorizor.java
+++ b/core/security/src/main/java/org/apache/isis/security/authorization/standard/Authorizor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.security.authorization.standard;
+package org.apache.isis.security.authorization.standard;
import org.apache.isis.applib.Identifier;
import org.apache.isis.commons.internal.components.ApplicationScopedComponent;
diff --git a/core/specsupport/src/main/java/org/apache/isis/core/specsupport/scenarios/ScenarioExecution.java b/core/specsupport/src/main/java/org/apache/isis/core/specsupport/scenarios/ScenarioExecution.java
index b6c5828..3bea4a4 100644
--- a/core/specsupport/src/main/java/org/apache/isis/core/specsupport/scenarios/ScenarioExecution.java
+++ b/core/specsupport/src/main/java/org/apache/isis/core/specsupport/scenarios/ScenarioExecution.java
@@ -37,7 +37,7 @@ import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
/**
* Represents the currently executing scenario, allowing information to be shared
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java
index 0e83406..463e6cc 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/IsisRestfulObjectsSessionFilter.java
@@ -46,10 +46,10 @@ import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.runtime.system.SystemConstants;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.webapp.auth.AuthenticationSessionStrategy;
import org.apache.isis.core.webapp.auth.AuthenticationSessionStrategyDefault;
import org.apache.isis.core.webapp.modules.resources.ResourceCachingFilter;
+import org.apache.isis.security.authentication.AuthenticationSession;
import lombok.val;
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
index 64c3abc..e3aa687 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
@@ -42,7 +42,7 @@ import org.apache.isis.core.runtime.memento.Data;
import org.apache.isis.core.runtime.persistence.FixturesInstalledState;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionAspectSupport;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.rendering.RendererContext;
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthResourceServerside.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthResourceServerside.java
index 463c075..6b205bf 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthResourceServerside.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HealthResourceServerside.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.health.Health;
import org.apache.isis.applib.services.health.HealthCheckService;
import org.apache.isis.core.runtime.sessiontemplate.AbstractIsisSessionTemplate;
-import org.apache.isis.core.security.authentication.health.HealthAuthSession;
+import org.apache.isis.security.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/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java
index 1d048f3..fddc0bf 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java
@@ -24,7 +24,7 @@ import java.util.stream.Stream;
import org.apache.isis.core.metamodel.MetaModelContext;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.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/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserReprRenderer.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserReprRenderer.java
index 497701a..a094be0 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserReprRenderer.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserReprRenderer.java
@@ -16,7 +16,7 @@
*/
package org.apache.isis.viewer.restfulobjects.server.resources;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.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/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
index c611e42..c31df45 100644
--- a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
+++ b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
@@ -41,9 +41,9 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.RequestParameter;
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index f852bc1..4e50e3d 100644
--- a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -41,8 +41,8 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java
index b6e6691..7b3a959 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AnonymousWebSessionForIsis.java
@@ -19,7 +19,7 @@
package org.apache.isis.viewer.wicket.viewer.integration.wicket;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.security.authentication.manager.AuthenticationManager;
import org.apache.wicket.Session;
import org.apache.wicket.request.Request;
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
index 87d3979..f437492 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
@@ -23,10 +23,10 @@ import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.security.authentication.AuthenticationRequest;
-import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+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.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/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
index 36d8133..cc84ca5 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
@@ -65,8 +65,8 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidExcep
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisRequestCycle;
import org.apache.isis.core.runtime.system.session.IsisSession;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.MessageBroker;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.MessageBroker;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java b/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java
index 736a8a0..8124b77 100644
--- a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java
+++ b/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java
@@ -32,11 +32,10 @@ import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-
-import org.apache.isis.core.security.authentication.AuthenticationRequest;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.security.authentication.AuthenticationRequest;
+import org.apache.isis.security.authentication.manager.AuthenticationManager;
import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
public class AuthenticatedWebSessionForIsis_Authenticate {
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java b/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java
index 461243e..b775c81 100644
--- a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java
+++ b/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java
@@ -30,11 +30,10 @@ import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-
-import org.apache.isis.core.security.authentication.AuthenticationRequest;
-import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.security.authentication.AuthenticationRequest;
+import org.apache.isis.security.authentication.manager.AuthenticationManager;
import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
public class AuthenticatedWebSessionForIsis_SignIn {
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
index b2ac492..3871717 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
@@ -23,7 +23,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSession;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
import org.apache.wicket.model.LoadableDetachableModel;
/**
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index f994c3b..879be97 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -52,8 +52,8 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.runtime.memento.ObjectAdapterMemento;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSessionProvider;
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/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
index 643e7a7..1c52201 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
@@ -46,7 +46,7 @@ import org.apache.isis.core.runtime.memento.ObjectAdapterMemento;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.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/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
index d0fb6b9..d7da7c5 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.security.authentication.MessageBroker;
+import org.apache.isis.security.authentication.MessageBroker;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index c42ea68..bc10356 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/core/viewer-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.core.metamodel.adapter.concurrency.ConcurrencyChecking;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.core.security.authentication.MessageBroker;
+import org.apache.isis.security.authentication.MessageBroker;
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/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
index 69a2056..e2e5585 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.memento.ObjectAdapterMemento;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.IsisConverterLocator;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
index af1d5b1..deda7b7 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
@@ -31,7 +31,7 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.security.authentication.MessageBroker;
+import org.apache.isis.security.authentication.MessageBroker;
/**
* Attach to any Ajax button that might trigger a notification (ie calls
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
index a95cef2..db2fd30 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
@@ -18,10 +18,9 @@
*/
package org.apache.isis.viewer.wicket.ui.errors;
+import org.apache.isis.security.authentication.MessageBroker;
import org.apache.wicket.util.string.Strings;
-import org.apache.isis.core.security.authentication.MessageBroker;
-
public class JGrowlUtil {
private JGrowlUtil(){}
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 0cb5ad4..ad488b8 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -38,7 +38,7 @@ import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.beans.WebAppConfigBean;
import org.apache.isis.config.property.ConfigPropertyEnum;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.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/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index a080e4f..bf70f1e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.adapter.concurrency.ConcurrencyChecking;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
index 5ea226c..e4ec16b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -43,8 +43,8 @@ import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisRequestCycle;
import org.apache.isis.core.runtime.system.session.IsisSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.security.authentication.MessageBroker;
+import org.apache.isis.security.authentication.AuthenticationSession;
+import org.apache.isis.security.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/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index 2476932..a2876134 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -34,7 +34,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.ui.ComponentType;
diff --git a/example/misc/smoketest/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainModule.java b/example/misc/smoketest/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainModule.java
index 676681c..1e7df4d 100644
--- a/example/misc/smoketest/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainModule.java
+++ b/example/misc/smoketest/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainModule.java
@@ -30,7 +30,7 @@ import org.springframework.context.annotation.PropertySources;
import org.apache.isis.config.Presets;
import org.apache.isis.config.beans.IsisBeanScanInterceptorForSpring;
import org.apache.isis.config.beans.WebAppConfigBean;
-import org.apache.isis.core.security.IsisBootSecurityBypass;
+import org.apache.isis.security.IsisBootSecurityBypass;
@Configuration
diff --git a/example/misc/smoketest/src/test/resources/org/apache/isis/testdomain/tests/builtin-IsisBoot.json b/example/misc/smoketest/src/test/resources/org/apache/isis/testdomain/tests/builtin-IsisBoot.json
index 034a034..cc7659c 100644
--- a/example/misc/smoketest/src/test/resources/org/apache/isis/testdomain/tests/builtin-IsisBoot.json
+++ b/example/misc/smoketest/src/test/resources/org/apache/isis/testdomain/tests/builtin-IsisBoot.json
@@ -24,6 +24,6 @@
"org.apache.isis.core.runtime.services.menubars.bootstrap3.MenuBarsServiceBS3",
"org.apache.isis.core.runtime.services.message.MessageServiceDefault",
"org.apache.isis.core.runtime.services.xmlsnapshot.XmlSnapshotServiceDefault",
- "org.apache.isis.core.security.authentication.standard.AuthenticationManagerStandard",
+ "org.apache.isis.security.authentication.standard.AuthenticationManagerStandard",
"org.apache.isis.core.wrapper.WrapperFactoryDefault"
]
\ No newline at end of file
diff --git a/example/misc/smoketest/src/test/resources/org/apache/isis/testdomain/tests/builtin-singleton.json b/example/misc/smoketest/src/test/resources/org/apache/isis/testdomain/tests/builtin-singleton.json
index 5908c85..24b3fc5 100644
--- a/example/misc/smoketest/src/test/resources/org/apache/isis/testdomain/tests/builtin-singleton.json
+++ b/example/misc/smoketest/src/test/resources/org/apache/isis/testdomain/tests/builtin-singleton.json
@@ -69,7 +69,7 @@
"org.apache.isis.core.runtime.services.xmlsnapshot.XmlSnapshotServiceDefault",
"org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory5",
"org.apache.isis.core.runtime.system.session.IsisSessionFactory",
- "org.apache.isis.core.security.authentication.standard.AuthenticationManagerStandard",
+ "org.apache.isis.security.authentication.standard.AuthenticationManagerStandard",
"org.apache.isis.core.wrapper.WrapperFactoryDefault",
"org.apache.isis.objectstore.jdo.datanucleus.service.eventbus.EventBusServiceJdo"
]