You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/10 18:35:33 UTC
[isis] 08/14: ISIS-2259: search-n-replace text references to
isis.apache.isis where missing "core" as the next bit.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 4613ed6746861c794dc43ec2a62b373be7108ed5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 16:53:55 2020 +0000
ISIS-2259: search-n-replace text references to isis.apache.isis where missing "core" as the next bit.
Also adds in some missing dependencies on core-commons and lombok.
---
.../isis-configurations-and-modules.pptx | Bin 49792 -> 49796 bytes
.../modules/ROOT/partials/component-nav.adoc | 2 +-
.../applib-ant/examples/annotation/Facets.java | 4 ++--
.../applib-cm/examples/tree/LazyTreeNode.java | 2 +-
.../doc/modules/applib-cm/examples/value/Image.java | 2 +-
.../applib-cm/examples/value/LocalResourcePath.java | 2 +-
.../modules/applib-cm/examples/value/Markup.java | 2 +-
.../modules/applib-cm/examples/value/Password.java | 2 +-
.../org/apache/isis/applib/annotation/Facets.java | 4 ++--
.../org/apache/isis/applib/tree/LazyTreeNode.java | 2 +-
.../java/org/apache/isis/applib/value/Image.java | 2 +-
.../apache/isis/applib/value/LocalResourcePath.java | 2 +-
.../java/org/apache/isis/applib/value/Markup.java | 2 +-
.../java/org/apache/isis/applib/value/Password.java | 2 +-
api/schema/pom.xml | 6 ------
core/codegen-bytebuddy/pom.xml | 2 +-
core/commons/pom.xml | 5 +++--
core/config/pom.xml | 5 +++++
.../apache/isis/core/config/IsisConfiguration.java | 4 ++--
.../core/config/presets/DebugDiscovery.properties | 4 ++--
.../core/config/presets/DebugMetaModel.properties | 2 +-
.../core/config/presets/SilenceMetaModel.properties | 2 +-
.../BidirectionalRelationshipContractTestAll.java | 2 +-
.../files/FilesTest_deleteFiles.java | 8 ++++----
...jectServiceMethodMustBeFinalContractTestAll.java | 2 +-
.../IsisActionsTest_returnNewTransientInstance.java | 2 +-
.../jmocking/JMockActionsTest_returnArgument.java | 2 +-
.../jmocking/JMockActionsTest_returnEach.java | 2 +-
.../jmocking/JUnitRuleMockery2Test.java | 2 +-
...t_autoWiring_constructorInjection_happyCase.java | 4 ++--
...ry2Test_autoWiring_sadCase_noClassUnderTest.java | 2 +-
...Test_autoWiring_sadCase_twoClassesUnderTest.java | 4 ++--
...y2Test_autoWiring_setterInjection_happyCase.java | 4 ++--
...tRuleMockery2Test_mockAnnotatedWithAllowing.java | 6 +++---
...tRuleMockery2Test_mockAnnotatedWithChecking.java | 8 ++++----
...tRuleMockery2Test_mockAnnotatedWithIgnoring.java | 6 +++---
...ckery2Test_mockAnnotatedWithNever_happyCase.java | 6 +++---
...Mockery2Test_mockAnnotatedWithNever_sadCase.java | 6 +++---
...Mockery2Test_mockAnnotatedWithOne_happyCase.java | 6 +++---
...leMockery2Test_mockAnnotatedWithOne_sadCase.java | 6 +++---
.../sortedsets/SortedSetsContractTestAll.java | 2 +-
core/metamodel/pom.xml | 13 +++++++++++--
.../core/metamodel/IsisModuleCoreMetamodel.java | 4 ++--
.../core/metamodel/adapter/oid/Oid_Parented.java | 1 +
.../core/metamodel/adapter/oid/ParentedOid.java | 2 ++
.../standard/AuthorizationFacetAbstract.java | 2 +-
.../authorization/standard/package-info.java | 4 ++--
.../core/metamodel/context/MetaModelContext.java | 8 ++++----
.../context/MetaModelContext_usingIoc.java | 6 +++---
.../facets/members/cssclass/CssClassFacet.java | 2 +-
.../facets/members/hidden/HiddenFacetAbstract.java | 4 ++--
.../object/immutable/ImmutableFacetAbstract.java | 6 +++---
.../recreatable/RecreatableObjectFacetFactory.java | 2 +-
.../metamodel/interactions/InteractionContext.java | 2 +-
.../ProgrammingModelInitFilterDefault.java | 2 ++
.../classsubstitutor/ClassSubstitutorDefault.java | 2 +-
.../title/TitlesAndTranslationsValidator.java | 2 +-
.../metamodel/services/user/UserServiceDefault.java | 2 +-
.../core/metamodel/spec/ObjectSpecification.java | 4 ++--
.../core/metamodel/spec/feature/ObjectMember.java | 2 +-
.../core/metamodel/specloader/package-info.java | 6 +++---
.../specimpl/ObjectSpecificationAbstract.java | 2 +-
.../core/metamodel/MetaModelContext_configTest.java | 4 ++--
.../core/metamodel/MetaModelContext_forTesting.java | 12 ++++++------
.../oid/CollectionOidTest_valueSemantics.java | 2 +-
...idDefaultTest_valueSemantics_whenPersistent.java | 2 +-
...OidDefaultTest_valueSemantics_whenTransient.java | 2 +-
.../facets/AbstractFacetFactoryJUnit4TestCase.java | 6 +++---
.../metamodel/facets/AbstractFacetFactoryTest.java | 6 +++---
.../metamodel/facets/ObjectAdapterUtilsTest.java | 4 ++--
.../actions/ActionMethodsFacetFactoryTest.java | 4 ++--
.../action/ActionAnnotationFacetFactoryTest.java | 2 +-
.../prototype/PrototypeFacetAbstractTest.java | 2 +-
.../CollectionFieldMethodsFacetFactoryTest.java | 4 ++--
.../facets/collections/JavaCollectionFacetTest.java | 4 ++--
.../ViewModelSemanticCheckingFacetFactoryTest.java | 4 ++--
.../object/defaults/DefaultedFacetFactoryTest.java | 2 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 2 +-
.../DomainObjectLayoutFactoryTest.java | 2 +-
.../annotation/TitleAnnotationFacetFactoryTest.java | 4 ++--
.../TitleFacetViaTitleAnnotationTest.java | 4 ++--
.../NavigableParentAnnotationFacetFactoryTest.java | 4 ++--
.../parseable/ParseableFacetUsingParserTest.java | 6 +++---
...ueFacetAnnotationOrConfigurationFactoryTest.java | 2 +-
.../ordering/memberorder/DeweyOrderSetTest.java | 2 +-
.../MemberOrderAnnotationFacetFactoryTest.java | 2 +-
.../memberorder/MemberOrderComparatorTest.java | 2 +-
...PromptStyleFacetFromPropertyAnnotation_Test.java | 2 +-
.../PropertyAnnotationFacetFactoryTest.java | 2 +-
.../value/BigDecimalValueSemanticsProviderTest.java | 2 +-
.../value/BigIntValueSemanticsProviderTest.java | 2 +-
.../value/ByteValueSemanticsProviderTest.java | 2 +-
.../value/DoubleValueSemanticsProviderTest.java | 2 +-
.../value/FloatValueSemanticsProviderTest.java | 2 +-
.../ImageValueSemanticsProviderAbstractTest.java | 6 +++---
.../facets/value/IntValueSemanticsProviderTest.java | 2 +-
.../JavaSqlDateValueSemanticsProviderTest.java | 2 +-
.../JavaSqlTimeValueSemanticsProviderTest.java | 2 +-
.../JavaUtilDateValueSemanticsProviderTest.java | 2 +-
.../value/LongValueSemanticsProviderTest.java | 2 +-
.../value/ShortValueSemanticsProviderTest.java | 2 +-
.../ValueSemanticsProviderAbstractTestCase.java | 8 ++++----
...JodaLocalDateTimeValueSemanticsProviderTest.java | 4 ++--
...bjectAssociationPredicatesTest_visibleWhere.java | 4 ++--
.../services/appfeat/ApplicationFeatureIdTest.java | 4 ++--
.../ApplicationFeatureRepositoryDefaultTest.java | 2 +-
...ceptionRecognizerDocDefault_recognizes_Test.java | 4 ++--
.../metamodel/MetaModelServiceDefaultTest.java | 4 ++--
.../spec/ObjectSpecIdTest_valueSemantics.java | 2 +-
.../specloader/SpecificationCacheDefaultTest.java | 4 ++--
.../specloader/SpecificationLoaderTestAbstract.java | 2 +-
...tionParameterAbstractTest_getId_and_getName.java | 4 ++--
.../specimpl/ObjectAssociationAbstractTest.java | 4 ++--
.../ObjectAssociationAbstractTest_alwaysHidden.java | 4 ++--
.../metamodel/testspec/ObjectSpecificationStub.java | 2 +-
.../isis/core/runtime/context/IsisContext.java | 2 +-
.../runtime/context/session/RuntimeContext.java | 2 +-
.../runtime/context/session/RuntimeContextBase.java | 4 ++--
.../session/PersistenceSessionFactory.java | 2 +-
.../isis/core/runtime/session/IsisRequestCycle.java | 2 +-
.../isis/core/runtime/session/IsisSession.java | 4 ++--
.../core/runtime/session/IsisSessionFactory.java | 2 +-
.../runtime/session/IsisSessionFactoryDefault.java | 4 ++--
.../runtime/session/init/InitialisationSession.java | 2 +-
.../template/AbstractIsisSessionTemplate.java | 2 +-
.../system/ObjectActionLayoutXmlDefaultTest.java | 2 +-
.../system/OneToManyAssociationDefaultTest.java | 2 +-
.../auth/AuthenticationSessionProviderDefault.java | 6 +++---
.../message/MessageServiceDefault.java | 2 +-
.../userprof/UserProfileServiceDefault.java | 2 +-
.../handlers/DomainObjectInvocationHandler.java | 2 +-
core/security/pom.xml | 7 ++++++-
.../main/doc/modules/api/partials/module-nav.adoc | 2 --
.../configure-isis-to-use-bypass.PNG | Bin
.../src/main/doc/modules/{api => core}/nav.adoc | 0
.../main/doc/modules/{api => core}/pages/about.adoc | 0
.../main/doc/modules/core/partials/module-nav.adoc | 2 ++
.../security/IsisModuleCoreSecurity.java} | 10 +++++-----
.../authentication/AuthenticationRequest.java | 2 +-
.../AuthenticationRequestAbstract.java | 2 +-
.../AuthenticationRequestPassword.java | 2 +-
.../authentication/AuthenticationSession.java | 4 ++--
.../AuthenticationSessionAbstract.java | 2 +-
.../AuthenticationSessionProvider.java | 2 +-
.../security}/authentication/MessageBroker.java | 2 +-
.../fixtures/AuthenticationRequestLogonFixture.java | 6 +++---
.../authentication/health/HealthAuthSession.java | 4 ++--
.../manager/AuthenticationManager.java | 16 ++++++++--------
.../authentication/manager/RegistrationDetails.java | 2 +-
.../singleuser/AuthenticationRequestSingleUser.java | 4 ++--
.../singleuser/SingleUserSession.java | 4 ++--
.../authentication/standard/Authenticator.java | 6 +++---
.../standard/AuthenticatorAbstract.java | 6 +++---
.../standard/NoAuthenticatorException.java | 2 +-
.../standard/RandomCodeGenerator.java | 2 +-
.../standard/RandomCodeGeneratorDefault.java | 2 +-
.../authentication/standard/Registrar.java | 4 ++--
.../standard/RegistrationDetailsPassword.java | 4 ++--
.../authentication/standard/SimpleSession.java | 4 ++--
.../authorization/manager/AuthorizationManager.java | 6 +++---
.../standard/AuthorizationConstants.java | 2 +-
.../authorization/standard/Authorizor.java | 2 +-
.../isis/security/EncodabilityContractTest.java | 2 +-
.../AuthenticationManager_authenticators_Test.java | 10 +++++-----
.../standard/AuthenticatorDefaultTest.java | 4 ++--
.../SimpleSessionEncodabilityNoRolesTest.java | 2 +-
.../SimpleSessionEncodabilityTestAbstract.java | 2 +-
.../SimpleSessionEncodabilityWithRolesTest.java | 2 +-
...ardAuthenticationManager_AuthenticationTest.java | 12 ++++++------
core/unittestsupport/pom.xml | 6 ++++++
.../core/webapp/context/memento/ObjectMemento.java | 4 ++--
.../wormhole/AuthenticationSessionWormhole.java | 2 +-
core/webspringboot/pom.xml | 2 +-
.../bootstrapping/builtin-domain-services.list | 16 ++++++++--------
.../bootstrapping/builtin-requestscoped.list | 4 ++--
.../secman/shiro/IsisModuleExtSecmanShiroRealm.java | 2 +-
.../examples/facets/jsr303/Jsr303FacetFactory.java | 12 ++++++------
.../facets/jsr303/Jsr303ProgModelFacets.java | 8 ++++----
.../jsr303/Jsr303PropertyValidationFacet.java | 18 +++++++++---------
.../examples/facets/jsr303/CustomPattern.java | 2 +-
.../facets/jsr303/CustomPatternValidator.java | 2 +-
.../examples/facets/jsr303/CustomPatterns.java | 2 +-
.../examples/facets/jsr303/DomainObjectVanilla.java | 2 +-
.../jsr303/DomainObjectWithBuiltInValidation.java | 2 +-
.../jsr303/DomainObjectWithCustomValidation.java | 2 +-
.../facets/jsr303/Jsr303FacetFacetHolder.java | 6 +++---
.../jsr303/Jsr303FacetFactoryFeatureTypes.java | 6 +++---
.../jsr303/Jsr303FacetFactoryInstantiation.java | 4 ++--
.../jsr303/Jsr303FacetFactoryProcessObject.java | 8 ++++----
.../jsr303/Jsr303FacetFactoryProcessProperty.java | 12 ++++++------
.../facets/jsr303/Jsr303FacetInstantiation.java | 6 +++---
.../jsr303/Jsr303FacetValidatingInteraction.java | 10 +++++-----
.../org/apache/isis/legacy/applib/value/Color.java | 2 +-
.../org/apache/isis/legacy/applib/value/Money.java | 2 +-
.../apache/isis/legacy/applib/value/Percentage.java | 2 +-
mavendeps/pom.xml | 10 ++++++++--
mavendeps/testing/pom.xml | 2 +-
.../objectadapter/ObjectAdapterContext.java | 2 +-
.../persistence/IsisPersistenceSessionJdoBase.java | 2 +-
.../IsisPlatformTransactionManagerForJdo.java | 2 +-
.../persistence/PersistenceSession5.java | 2 +-
.../persistence/PersistenceSessionFactory5.java | 2 +-
.../adapterfactory/pojo/PojoAdapterTest.java | 2 +-
.../runtime/system/ObjectMemberAbstractTest.java | 4 ++--
.../WrapperFactoryDefault_wrappedObject_Test.java | 4 ++--
...FactoryDefault_wrappedObject_transient_Test.java | 4 ++--
.../bypass/authentication/AuthenticatorBypass.java | 4 ++--
.../bypass/authorization/AuthorizorBypass.java | 2 +-
.../authentication/AuthenticatorKeycloak.java | 6 +++---
.../keycloak/authorization/AuthorizorKeycloak.java | 2 +-
.../security/keycloak/webmodule/KeycloakFilter.java | 4 ++--
.../shiro/authentication/AuthenticatorShiro.java | 12 ++++++------
.../shiro/authorization/AuthorizorShiro.java | 4 ++--
.../shiro/context/ShiroSecurityContext.java | 4 ++--
...oAuthenticatorOrAuthorizorTest_authenticate.java | 6 +++---
...nticatorOrAuthorizorTest_isVisibleInAnyRole.java | 4 ++--
subdomains/pom.xml | 4 +++-
subdomains/spring/pom.xml | 1 -
testing/fixtures/applib/pom.xml | 4 ++--
.../applib/modules/ModuleWithFixturesService.java | 2 +-
testing/pom.xml | 20 ++++++++++----------
.../valuetypes/asciidoc/applib/value/AsciiDoc.java | 2 +-
.../valuetypes/markdown/applib/value/Markdown.java | 2 +-
valuetypes/markdown/pom.xml | 20 ++++++++++++++++++++
.../restfulobjects/rendering/IResourceContext.java | 2 +-
.../viewer/resources/HomePageReprRenderer.java | 2 +-
.../viewer/resources/UserReprRenderer.java | 2 +-
.../auth/AuthenticationSessionStrategy.java | 4 ++--
.../auth/AuthenticationSessionStrategyAbstract.java | 2 +-
.../AuthenticationSessionStrategyBasicAuth.java | 4 ++--
.../auth/AuthenticationSessionStrategyDefault.java | 2 +-
...t_ensureCompatibleAcceptHeader_ContractTest.java | 2 +-
.../viewer/context/ResourceContext_getArg_Test.java | 2 +-
.../viewer/wicket/model/models/ScalarModel.java | 2 +-
.../serviceactions/TertiaryActionsPanel.java | 2 +-
.../widgets/breadcrumbs/BreadcrumbPanel.java | 2 +-
.../viewer/wicket/ui/errors/JGrowlBehaviour.java | 2 +-
.../isis/viewer/wicket/ui/errors/JGrowlUtil.java | 2 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../isis/viewer/wicket/ui/panels/FormAbstract.java | 2 +-
.../wicket/ui/panels/FormExecutorDefault.java | 4 ++--
.../isis/viewer/wicket/ui/panels/PanelBase.java | 2 +-
.../integration/AnonymousWebSessionForIsis.java | 2 +-
.../integration/AuthenticatedWebSessionForIsis.java | 8 ++++----
.../viewer/integration/WebRequestCycleForIsis.java | 4 ++--
...AuthenticatedWebSessionForIsis_Authenticate.java | 12 ++++++------
.../AuthenticatedWebSessionForIsis_SignIn.java | 10 +++++-----
...AuthenticatedWebSessionForIsis_TestAbstract.java | 2 +-
248 files changed, 498 insertions(+), 446 deletions(-)
diff --git a/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx b/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx
index e855177..05aebce 100644
Binary files a/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx and b/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx differ
diff --git a/antora/components/security/modules/ROOT/partials/component-nav.adoc b/antora/components/security/modules/ROOT/partials/component-nav.adoc
index ddfab02..b4a276b 100644
--- a/antora/components/security/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/security/modules/ROOT/partials/component-nav.adoc
@@ -1,5 +1,5 @@
include::security:ROOT:partial$module-nav.adoc[]
-include::security:api:partial$module-nav.adoc[]
+include::security:core:partial$module-nav.adoc[]
include::security:bypass:partial$module-nav.adoc[]
include::security:shiro:partial$module-nav.adoc[]
include::security:keycloak:partial$module-nav.adoc[]
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Facets.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Facets.java
index 804ca3f..db68ad0 100644
--- a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Facets.java
+++ b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Facets.java
@@ -39,7 +39,7 @@ import java.lang.annotation.Target;
public @interface Facets {
/**
* Array of fully qualified names of classes each implementing
- * <tt>org.apache.isis.metamodel.facets.FacetFactory</tt>.
+ * <tt>org.apache.isis.core.metamodel.facets.FacetFactory</tt>.
*
* <p>
* Either the array provided by this method or by
@@ -49,7 +49,7 @@ public @interface Facets {
/**
* Array of {@link Class}s, each indicating a class implementing
- * <tt>org.apache.isis.metamodel.facets.FacetFactory</tt>.
+ * <tt>org.apache.isis.core.metamodel.facets.FacetFactory</tt>.
*
* <p>
* Either the array provided by this method or by
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java b/api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java
index f34b28f..bf39556 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.Value;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-@Value(semanticsProviderName="org.apache.isis.metamodel.facets.value.treenode.TreeNodeValueSemanticsProvider")
+@Value(semanticsProviderName="org.apache.isis.core.metamodel.facets.value.treenode.TreeNodeValueSemanticsProvider")
public class LazyTreeNode<T> implements TreeNode<T> {
private final TreeState sharedState;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/value/Image.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/Image.java
index 73522ce..e282895 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/value/Image.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/value/Image.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.Value;
/**
* Represents an image.
*/
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.image.ImageValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.image.ImageValueSemanticsProvider")
public class Image implements Serializable {
private static final long serialVersionUID = 1L;
private final int[][] image;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/value/LocalResourcePath.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/LocalResourcePath.java
index 34b45af..915bc2b 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/value/LocalResourcePath.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/value/LocalResourcePath.java
@@ -31,7 +31,7 @@ import lombok.NonNull;
/**
* Represents a local resource path, typically a relative path originating at this web-app's root or context-root.
*/
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.localrespath.LocalResourcePathValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.localrespath.LocalResourcePathValueSemanticsProvider")
public final class LocalResourcePath implements Serializable {
private static final long serialVersionUID = 1L;
@NonNull private final String path;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/value/Markup.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/Markup.java
index 882ec47..c70d337 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/value/Markup.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/value/Markup.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.Value;
* Immutable value type holding pre-rendered HTML.
*
*/
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.markup.MarkupValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.markup.MarkupValueSemanticsProvider")
public class Markup implements Serializable {
private static final long serialVersionUID = 1L;
private final String html;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/value/Password.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/Password.java
index a3ca4f5..6026d74 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/value/Password.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/value/Password.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
import org.apache.isis.applib.annotation.Value;
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.password.PasswordValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.password.PasswordValueSemanticsProvider")
public class Password implements Serializable {
private static final long serialVersionUID = 1L;
private static final String STARS = "********************";
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java
index 804ca3f..db68ad0 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java
@@ -39,7 +39,7 @@ import java.lang.annotation.Target;
public @interface Facets {
/**
* Array of fully qualified names of classes each implementing
- * <tt>org.apache.isis.metamodel.facets.FacetFactory</tt>.
+ * <tt>org.apache.isis.core.metamodel.facets.FacetFactory</tt>.
*
* <p>
* Either the array provided by this method or by
@@ -49,7 +49,7 @@ public @interface Facets {
/**
* Array of {@link Class}s, each indicating a class implementing
- * <tt>org.apache.isis.metamodel.facets.FacetFactory</tt>.
+ * <tt>org.apache.isis.core.metamodel.facets.FacetFactory</tt>.
*
* <p>
* Either the array provided by this method or by
diff --git a/api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java b/api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java
index 34001ce..673d3d1 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.Value;
import org.apache.isis.core.commons.internal.base._Lazy;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-@Value(semanticsProviderName="org.apache.isis.metamodel.facets.value.treenode.TreeNodeValueSemanticsProvider")
+@Value(semanticsProviderName="org.apache.isis.core.metamodel.facets.value.treenode.TreeNodeValueSemanticsProvider")
public class LazyTreeNode<T> implements TreeNode<T> {
private final TreeState sharedState;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/Image.java b/api/applib/src/main/java/org/apache/isis/applib/value/Image.java
index 73522ce..e282895 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/Image.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/Image.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.Value;
/**
* Represents an image.
*/
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.image.ImageValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.image.ImageValueSemanticsProvider")
public class Image implements Serializable {
private static final long serialVersionUID = 1L;
private final int[][] image;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java b/api/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java
index 34b45af..915bc2b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java
@@ -31,7 +31,7 @@ import lombok.NonNull;
/**
* Represents a local resource path, typically a relative path originating at this web-app's root or context-root.
*/
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.localrespath.LocalResourcePathValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.localrespath.LocalResourcePathValueSemanticsProvider")
public final class LocalResourcePath implements Serializable {
private static final long serialVersionUID = 1L;
@NonNull private final String path;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/Markup.java b/api/applib/src/main/java/org/apache/isis/applib/value/Markup.java
index 882ec47..c70d337 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/Markup.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/Markup.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.Value;
* Immutable value type holding pre-rendered HTML.
*
*/
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.markup.MarkupValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.markup.MarkupValueSemanticsProvider")
public class Markup implements Serializable {
private static final long serialVersionUID = 1L;
private final String html;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/Password.java b/api/applib/src/main/java/org/apache/isis/applib/value/Password.java
index a3ca4f5..6026d74 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/Password.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/Password.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
import org.apache.isis.applib.annotation.Value;
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.password.PasswordValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.password.PasswordValueSemanticsProvider")
public class Password implements Serializable {
private static final long serialVersionUID = 1L;
private static final String STARS = "********************";
diff --git a/api/schema/pom.xml b/api/schema/pom.xml
index bb7ca79..e2e1637 100644
--- a/api/schema/pom.xml
+++ b/api/schema/pom.xml
@@ -35,12 +35,6 @@
</properties>
<dependencies>
-<!--
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-commons</artifactId>
- </dependency>
--->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
diff --git a/core/codegen-bytebuddy/pom.xml b/core/codegen-bytebuddy/pom.xml
index 359f01c..0ad22a8 100644
--- a/core/codegen-bytebuddy/pom.xml
+++ b/core/codegen-bytebuddy/pom.xml
@@ -20,7 +20,7 @@
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- a<artifactId>isis-core-codegen-bytebuddy</artifactId>
+ <artifactId>isis-core-codegen-bytebuddy</artifactId>
<name>Apache Isis Core - Code Gen (ByteBuddy)</name>
<description>
diff --git a/core/commons/pom.xml b/core/commons/pom.xml
index 61e5e00..3126113 100644
--- a/core/commons/pom.xml
+++ b/core/commons/pom.xml
@@ -28,8 +28,8 @@
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.commons</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/commons</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.commons</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core/commons</git-plugin.propertiesDir>
</properties>
<build>
@@ -67,6 +67,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/core/config/pom.xml b/core/config/pom.xml
index 616853c..dbbdcfc 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -93,6 +93,11 @@
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index 14bd2b8..f737b4b 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -1188,7 +1188,7 @@ public class IsisConfiguration {
* eg: {@code isis.value.format.datetime=iso}
* <p>
* A pre-determined list of values is available, specifically 'iso_encoding', 'iso' and 'medium' (see
- * <code>org.apache.isis.metamodel.facets.value.datetimejdk8local.Jdk8LocalDateTimeValueSemanticsProvider#NAMED_TITLE_FORMATTERS</code>).
+ * <code>org.apache.isis.core.metamodel.facets.value.datetimejdk8local.Jdk8LocalDateTimeValueSemanticsProvider#NAMED_TITLE_FORMATTERS</code>).
* Alternatively, can also specify a mask, eg <tt>dd-MMM-yyyy</tt>.
*/
DATETIME,
@@ -1198,7 +1198,7 @@ public class IsisConfiguration {
* eg: {@code isis.value.format.date=iso}
* <p>
* A pre-determined list of values is available, specifically 'iso_encoding', 'iso' and 'medium' (see
- * <code>org.apache.isis.metamodel.facets.value.datejdk8local.Jdk8LocalDateValueSemanticsProvider.NAMED_TITLE_FORMATTERS</code>).
+ * <code>org.apache.isis.core.metamodel.facets.value.datejdk8local.Jdk8LocalDateValueSemanticsProvider.NAMED_TITLE_FORMATTERS</code>).
* Alternatively, can also specify a mask, eg <tt>dd-MMM-yyyy</tt>.
*/
DATE,
diff --git a/core/config/src/main/java/org/apache/isis/core/config/presets/DebugDiscovery.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugDiscovery.properties
index 53d21fb..6ec936a 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/presets/DebugDiscovery.properties
+++ b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugDiscovery.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-logging.level.org.apache.isis.config.beans.IsisBeanTypeRegistry = DEBUG
-logging.level.org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring = DEBUG
+logging.level.org.apache.isis.core.config.beans.IsisBeanTypeRegistry = DEBUG
+logging.level.org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring = DEBUG
diff --git a/core/config/src/main/java/org/apache/isis/core/config/presets/DebugMetaModel.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugMetaModel.properties
index c6e2e2a..5d008ee 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/presets/DebugMetaModel.properties
+++ b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugMetaModel.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-logging.level.org.apache.isis.metamodel.specloader.MetaModelValidatorServiceDefault = DEBUG
+logging.level.org.apache.isis.core.metamodel.specloader.MetaModelValidatorServiceDefault = DEBUG
logging.level.SpecificationLoaderDefault = DEBUG
\ No newline at end of file
diff --git a/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceMetaModel.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceMetaModel.properties
index 573565c..77aed6b 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceMetaModel.properties
+++ b/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceMetaModel.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-logging.level.org.apache.isis.metamodel.specloader.MetaModelValidatorServiceDefault = WARN
+logging.level.org.apache.isis.core.metamodel.specloader.MetaModelValidatorServiceDefault = WARN
logging.level.SpecificationLoaderDefault = WARN
\ No newline at end of file
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
index 920cfed..cc0b8e4 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
@@ -23,7 +23,7 @@ import org.apache.isis.core.commons.internal.collections._Maps;
public class BidirectionalRelationshipContractTestAll extends BidirectionalRelationshipContractTestAbstract {
public BidirectionalRelationshipContractTestAll() {
- super("org.apache.isis.unittestsupport.bidir",
+ super("org.apache.isis.core.unittestsupport.bidir",
_Maps.<Class<?>,Instantiator>unmodifiable(
// no instantiator need be registered for ParentDomainObject.class;
// will default to using new InstantiatorSimple(AgreementForTesting.class),
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
index ae1490d..a7ea30e 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
@@ -29,10 +29,10 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.files.Files.Deleter;
-import org.apache.isis.unittestsupport.files.Files.Recursion;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.files.Files.Deleter;
+import org.apache.isis.core.unittestsupport.files.Files.Recursion;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class FilesTest_deleteFiles {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
index 62efadc..8fcb405 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.unittestsupport.inject;
public class InjectServiceMethodMustBeFinalContractTestAll extends InjectServiceMethodMustBeFinalContractTestAbstract {
public InjectServiceMethodMustBeFinalContractTestAll() {
- super("org.apache.isis.unittestsupport.inject");
+ super("org.apache.isis.core.unittestsupport.inject");
withLoggingTo(System.out);
}
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
index db6bdea..9bdcedb 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
@@ -31,7 +31,7 @@ import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class IsisActionsTest_returnNewTransientInstance {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
index 66c1596..af57dee 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JMockActionsTest_returnArgument {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
index b95eafb..d0aa901 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JMockActionsTest_returnEach {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
index 8b83738..6976961 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
@@ -24,7 +24,7 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
index eddf0ee..dd042d4 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
@@ -28,8 +28,8 @@ import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
index efdea13..6c82c6c 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
@@ -23,7 +23,7 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
index 601a9d9..6249a8a 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
@@ -24,8 +24,8 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
index f31fb63..630246a 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
@@ -28,8 +28,8 @@ import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
index 05b8183..e22c5a6 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
@@ -23,9 +23,9 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Allowing;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Allowing;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_mockAnnotatedWithAllowing {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
index e22055e..b71427d 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
@@ -23,10 +23,10 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Checking;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ExpectationsOn;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Checking;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ExpectationsOn;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_mockAnnotatedWithChecking {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
index afed4e2..21a33ef 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
@@ -23,9 +23,9 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Ignoring;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Ignoring;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_mockAnnotatedWithIgnoring {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
index d7953f9..7f87f5b 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
@@ -23,9 +23,9 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Never;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Never;
public class JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
index b6aa7f8..162837e 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
@@ -24,9 +24,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Never;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Never;
public class JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
index 3e11207..363d0c1 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
@@ -23,9 +23,9 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.One;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.One;
public class JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
index 61f3a1d..7e14479 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
@@ -24,9 +24,9 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.One;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.One;
public class JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
index d3e1faa..b348df1 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.unittestsupport.sortedsets;
public class SortedSetsContractTestAll extends SortedSetsContractTestAbstract {
public SortedSetsContractTestAll() {
- super("org.apache.isis.unittestsupport.sortedsets");
+ super("org.apache.isis.core.unittestsupport.sortedsets");
withLoggingTo(System.out);
}
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 705045b..b21692c 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -109,13 +109,16 @@
</exclusions>
</dependency>
-<!--
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-commons</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
<scope>test</scope>
</dependency>
--->
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -131,6 +134,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java
index 4a1affd..e5647aa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java
@@ -50,14 +50,14 @@ import org.apache.isis.core.metamodel.services.user.UserServiceDefault;
import org.apache.isis.core.metamodel.valuetypes.ValueTypeProviderDefault;
import org.apache.isis.core.metamodel.valuetypes.ValueTypeProviderForCollections;
import org.apache.isis.core.metamodel.valuetypes.ValueTypeRegistry;
-import org.apache.isis.security.api.IsisModuleSecurityApi;
+import org.apache.isis.core.security.IsisModuleCoreSecurity;
@Configuration
@Import({
// modules
IsisModuleApplib.class,
IsisModuleCoreConfig.class,
- IsisModuleSecurityApi.class,
+ IsisModuleCoreSecurity.class,
// @Configuration's
MetaModelContexts.class,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Parented.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Parented.java
index 551d207..7e12136 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Parented.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Parented.java
@@ -25,6 +25,7 @@ import java.util.Objects;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import static org.apache.isis.core.commons.internal.base._With.requires;
+import static org.apache.isis.core.metamodel.adapter.oid.Oid.*;
final class Oid_Parented implements ParentedOid {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedOid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedOid.java
index f721fba..a2b87e1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedOid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedOid.java
@@ -23,6 +23,8 @@ import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import static org.apache.isis.core.metamodel.adapter.oid.Oid.unmarshaller;
+
/**
* Used as the {@link Oid} for {@link OneToManyAssociation} (collections).
*/
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetAbstract.java
index 6f569c9..a022310 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/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.security.api.authorization.manager.AuthorizationManager;
+import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/package-info.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/package-info.java
index ea27f71..b14f48f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/package-info.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/package-info.java
@@ -23,10 +23,10 @@
* <p>
* Used in two different ways:
* <ul>
- * <li>in prototyping or single user, used by the {@link org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl facet factory}
+ * <li>in prototyping or single user, used by the {@link org.apache.isis.core.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl facet factory}
* implementations, that is, enforcing authorization on the "client-side".
* </li>
- * <li>In client/server mode, used by a {@link org.apache.isis.metamodel.facetdecorator.FacetDecorator} for proxy authorization,
+ * <li>In client/server mode, used by a {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator} for proxy authorization,
* that is, enforcing authorization by delegating to the "server-side".</li>
* </ul>
*/
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext.java
index 756a480..5a2586b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext.java
@@ -34,10 +34,10 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.services.homepage.HomePageAction;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
+import org.apache.isis.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;
/**
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext_usingIoc.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext_usingIoc.java
index 81a5e90..ee90a02 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext_usingIoc.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext_usingIoc.java
@@ -42,9 +42,9 @@ import org.apache.isis.core.metamodel.services.ServiceUtil;
import org.apache.isis.core.metamodel.services.homepage.HomePageAction;
import org.apache.isis.core.metamodel.services.homepage.HomePageResolverService;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.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/cssclass/CssClassFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassFacet.java
index 11a08fd..dec9798 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassFacet.java
@@ -31,7 +31,7 @@ public interface CssClassFacet extends Facet {
/**
* return custom CSS (if any) for provided {@link ManagedObject object}.
*
- * @param objectAdapter - to evaluate. May be <tt>null</tt> in exceptional circumstances (specifically: the {@link org.apache.isis.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson#asJson(ObjectSpecification)} which generates <tt>xxx.layout.json</tt> for a spec without recourse to any given object).
+ * @param objectAdapter - to evaluate. May be <tt>null</tt> in exceptional circumstances (specifically: the {@link org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson#asJson(ObjectSpecification)} which generates <tt>xxx.layout.json</tt> for a spec without recourse to any given object).
*/
public String cssClass(final ManagedObject objectAdapter);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
index 43e1ad0..ccaaae4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
/**
- * This implements {@link org.apache.isis.metamodel.facetapi.MultiTypedFacet} so that each concrete implementation
+ * This implements {@link org.apache.isis.core.metamodel.facetapi.MultiTypedFacet} so that each concrete implementation
* is added to the eventual {@link FacetHolder} twice: once under
* <tt>HiddeFacet.class</tt> and once under its own concrete type class (eg <tt>HiddenFacetForActionAnnotation</tt>).
* This satisfies a couple of (independent) requirements:
@@ -41,7 +41,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
* <li>that we don't have the concept of a single (blessed?) HiddenFacet; rather there are simply facets some of
* which implement {@link HidingInteractionAdvisor}</li>
* <li>that there is nevertheless always at least one facet that is registered under <tt>HiddenFacet.class</tt>;
- * this is used by the {@link org.apache.isis.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson} exporter</li>
+ * this is used by the {@link org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson} exporter</li>
* </ul>
* <p>
* Note that the {@link FacetUtil#getFacets(java.util.Map, Predicate)}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java
index 5a3fbd1..0edf94f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java
@@ -44,9 +44,9 @@ public abstract class ImmutableFacetAbstract extends FacetAbstract implements Im
public String disables(final UsabilityContext<? extends UsabilityEvent> ic) {
final ManagedObject target = ic.getTarget();
switch (ic.getInteractionType()) {
- case InteractionContextType.PROPERTY_MODIFY:
- case InteractionContextType.COLLECTION_ADD_TO:
- case InteractionContextType.COLLECTION_REMOVE_FROM:
+ case PROPERTY_MODIFY:
+ case COLLECTION_ADD_TO:
+ case COLLECTION_REMOVE_FROM:
return disabledReason(target);
default:
return null;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
index 848469c..09f256e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
@@ -50,7 +50,7 @@ implements MetaModelRefiner, PostConstructMethodCache {
}
/**
- * We simply attach all facets we can find; the {@link #refineMetaModelValidator(org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite, IsisConfiguration) meta-model validation} will detect if multiple interfaces/annotations have
+ * We simply attach all facets we can find; the {@link #refineMetaModelValidator(org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite, IsisConfiguration) meta-model validation} will detect if multiple interfaces/annotations have
* been attached.
*/
@Override
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 6255567..d55d98b 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.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.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/progmodel/ProgrammingModelInitFilterDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
index 62244d4..14c1bbc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
@@ -31,6 +31,8 @@ import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.core.metamodel.facets.FacetFactory;
+import static org.apache.isis.core.metamodel.progmodel.ProgrammingModelInitFilter.*;
+
import lombok.val;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
index f410f1c..b79d7b3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
@@ -60,7 +60,7 @@ public class ClassSubstitutorDefault extends ClassSubstitutorAbstract {
private void ignoreApacheIsisInternals() {
// can't ignoring this class ... will result in NPEs...
- // ignoreClass("org.apache.isis.commons.internal.ioc.spring.BeanAdapterSpring");
+ // ignoreClass("org.apache.isis.core.commons.internal.ioc.spring.BeanAdapterSpring");
}
protected void ignoreJacksonAndGson() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitlesAndTranslationsValidator.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitlesAndTranslationsValidator.java
index b146eb9..216ed18 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitlesAndTranslationsValidator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitlesAndTranslationsValidator.java
@@ -138,7 +138,7 @@ public class TitlesAndTranslationsValidator extends MetaModelValidatorAbstract {
val translationService = serviceRegistry.lookupServiceElseFail(TranslationService.class);
// as used by the Wicket UI
- final String context = "org.apache.isis.runtime.system.session.IsisSessionFactory";
+ final String context = "org.apache.isis.core.runtime.system.session.IsisSessionFactory";
final MessageRegistry messageRegistry = new MessageRegistry();
for (String message : messageRegistry.listMessages()) {
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 4901a5b..63e2607 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
@@ -37,7 +37,7 @@ 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.commons.collections.Can;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import lombok.val;
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 0ef8190..97cc115 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
@@ -59,7 +59,7 @@ import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
import org.apache.isis.core.metamodel.facets.object.parented.ParentedCollectionFacet;
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.val;
@@ -206,7 +206,7 @@ public interface ObjectSpecification extends Specification, ObjectActionContaine
* Returns the CSS class name to use for the specified object.
*
* <p>
- * Corresponds to the {@link CssClassFacet#cssClass(org.apache.isis.metamodel.spec.Instance)} value}
+ * Corresponds to the {@link CssClassFacet#cssClass(org.apache.isis.core.metamodel.spec.Instance)} value}
* returned by the {@link CssClassFacet}.
*
* @param objectAdapter - to evaluate (may be <tt>null</tt> if called by deprecated {@link #getCssClass}).
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
index 9b8aa5c..52e7caf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
@@ -144,7 +144,7 @@ public interface ObjectMember extends ObjectFeature {
*
* <p>
* For the former case, is thrown by
- * {@link ObjectAction#executeWithRuleChecking(ObjectAdapter, ObjectAdapter[], org.apache.isis.commons.authentication.AuthenticationSession, org.apache.isis.applib.annotation.Where)}
+ * {@link ObjectAction#executeWithRuleChecking(ObjectAdapter, ObjectAdapter[], org.apache.isis.core.commons.authentication.AuthenticationSession, org.apache.isis.applib.annotation.Where)}
* when the action being executed is not visible or not usable for the specified session. One reason this
* might occur if there was an attempt to construct a URL (eg a bookmarked action) and invoke in an unauthenticated session.
* </p>
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/package-info.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/package-info.java
index 5fc5386..2d2563f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/package-info.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/package-info.java
@@ -28,15 +28,15 @@
* Concrete implementations are in the <tt>programmingmodel-xxx-impl</tt> modules. These
* are expected to be based heavily on <tt>ObjectReflectorAbstract</tt>, defined in
* <tt>nof-core</tt>. This implementation defines two further sub-APIs which are based on
- * the {@link org.apache.isis.core.metamodel.facetapi.Facet}s and {@link org.apache.isis.metamodel.facetdecorator.FacetDecorator}s:
+ * the {@link org.apache.isis.core.metamodel.facetapi.Facet}s and {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator}s:
* <ul>
* <li> the {@link ProgrammingModelInstaller} is used to specify the collection of {@link org.apache.isis.core.metamodel.facets.FacetFactory}s
* that will be used to actually process and build up the metamodel.
* <li> the {@link FacetDecoratorInstaller} API specifies how {@link org.apache.isis.core.metamodel.facetapi.Facet}, once created,
* can be additionally decorated to modify their behaviour. A number of other components are implemented as
- * {@link org.apache.isis.metamodel.facetdecorator.FacetDecorator}s, such as {@link org.apache.isis.authorization.AuthorisationFacetDecorator authorisation},
+ * {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator}s, such as {@link org.apache.isis.authorization.AuthorisationFacetDecorator authorisation},
* {@link org.apache.isis.help.HelpFacetDecorator help}, and {@link org.apache.isis.transaction.facetdecorator.TransactionFacetDecorator transactions}. However
- * it is possible for other {@link org.apache.isis.metamodel.facetdecorator.FacetDecorator}s to be defined and installed also (such as <tt>i18n</tt>).
+ * it is possible for other {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator}s to be defined and installed also (such as <tt>i18n</tt>).
* </ul>
*
*/
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 bb79f56..bee946c 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
@@ -89,7 +89,7 @@ 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.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java
index 9cdeb70..ac12b31 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java
@@ -25,8 +25,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
index 0f3ea6d..95eb59a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
@@ -48,12 +48,12 @@ import org.apache.isis.core.metamodel.services.homepage.HomePageAction;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.SpecificationLoaderDefault;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.unittestsupport.config.internal._Config;
+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.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
import lombok.Builder;
import lombok.Getter;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
index 46d9420..19357fa 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
@@ -22,7 +22,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
+import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class CollectionOidTest_valueSemantics extends ValueTypeContractTestAbstract<ParentedOid> {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
index 3d11aa3..7fd4921 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
@@ -22,7 +22,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
+import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class RootOidDefaultTest_valueSemantics_whenPersistent extends ValueTypeContractTestAbstract<RootOid> {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenTransient.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenTransient.java
index c0a0e44..327d03c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenTransient.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenTransient.java
@@ -22,7 +22,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
+import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class RootOidDefaultTest_valueSemantics_whenTransient extends ValueTypeContractTestAbstract<RootOid> {
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 6b2b5e1..c0d04f8 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
@@ -48,9 +48,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.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+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;
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 bdd3da4..b2d37d5 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
@@ -36,9 +36,9 @@ import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import junit.framework.TestCase;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
index 5ce10b3..74398d1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
@@ -28,8 +28,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectAdapterUtilsTest {
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 c9c26ef..a51119f 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
@@ -52,8 +52,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.security.api.authentication.AuthenticationSession;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import lombok.val;
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 dabe879..7a890bf 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
@@ -33,7 +33,7 @@ import org.apache.isis.core.config.metamodel.facets.PublishActionsConfiguration;
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.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java
index 339731b..d2d3755 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals;
import org.apache.isis.core.commons.internal.environment.DeploymentType;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class PrototypeFacetAbstractTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
index 18b6fa7..f0d1b15 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
@@ -50,8 +50,8 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.facets.collections.clear.CollectionClearFacetFactory;
import org.apache.isis.core.metamodel.facets.collections.clear.CollectionClearFacetViaAccessor;
import org.apache.isis.core.metamodel.facets.collections.clear.CollectionClearFacetViaClearMethod;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
index c352216..49503cd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
@@ -38,8 +38,8 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.collections.javautilcollection.JavaCollectionFacet;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JavaCollectionFacetTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index 2b83006..5695681 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -41,8 +41,8 @@ import org.apache.isis.core.metamodel.progmodel.ProgrammingModelAbstract;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModelInitFilterDefault;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorAbstract;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
-import org.apache.isis.unittestsupport.config.internal._Config;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
index 65b82a5..00a0ff3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.annotation.Defaulted;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.defaults.annotcfg.DefaultedFacetAnnotationElseConfigurationFactory;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class DefaultedFacetFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index ad4104b..3d14a9a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -60,7 +60,7 @@ import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObj
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
index c7e3059..fea2797 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
@@ -47,7 +47,7 @@ import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaPosition;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class DomainObjectLayoutFactoryTest 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 22ad752..4b538d4 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
@@ -43,8 +43,8 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
index a5dd9b7..722563d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
@@ -41,8 +41,8 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class TitleFacetViaTitleAnnotationTest {
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 ba0d200..b4da653 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.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.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 26560f9..71be3d6 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
@@ -36,9 +36,9 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ParseableFacetUsingParserTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
index 0c00da5..bef8f2c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.facets.object.value.annotcfg.ValueFacetAnn
import org.apache.isis.core.metamodel.facets.object.value.annotcfg.ValueFacetAnnotationOrConfigurationFactory;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderUtil;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java
index f6c918e..3ba024d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java
@@ -34,7 +34,7 @@ import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetAnnotation;
import org.apache.isis.core.metamodel.layout.DeweyOrderSet;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import junit.framework.TestCase;
import junit.framework.TestSuite;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java
index b4a2b84..9eb2c9b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetAnnotation;
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetFactory;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class MemberOrderAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
index f132417..621bcd5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.commons.internal.context._Context;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetAnnotation;
import org.apache.isis.core.metamodel.layout.memberorderfacet.MemberOrderComparator;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import junit.framework.TestCase;
import junit.framework.TestSuite;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
index 52f8a3b..a819306 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
@@ -39,7 +39,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleFacet;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured;
import org.apache.isis.core.metamodel.facets.properties.propertylayout.PromptStyleFacetForPropertyLayoutAnnotation;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class PromptStyleFacetFromPropertyAnnotation_Test {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index bb5d30d..58f55fb 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -76,7 +76,7 @@ import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySe
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
index 1bab314..9f6d7fa 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class BigDecimalValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
index 30fa373..ab68e5e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class BigIntValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
index afc3ee7..046dd4c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.bytes.ByteValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.bytes.ByteWrapperValueSemanticsProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class ByteValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
index 862c9db..aeefa19 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.doubles.DoubleWrapperValueSemanticsProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class DoubleValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
index 30bbe6e..d6f669c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.floats.FloatValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.floats.FloatWrapperValueSemanticsProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class FloatValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
index 34f6bf6..104f00d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
@@ -32,9 +32,9 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.value.image.ImageValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ImageValueSemanticsProviderAbstractTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
index 6d6b0c6..552f950 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.integer.IntValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.integer.IntWrapperValueSemanticsProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class IntValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
index e160d5b..8a555b3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.datesql.JavaSqlDateValueSemanticsProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class JavaSqlDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
index bea1dbf..e55359b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.value.timesql.JavaSqlTimeValueSemanticsProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class JavaSqlTimeValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
index 0b8bd67..c981cf2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.dateutil.JavaUtilDateValueSemanticsProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class JavaUtilDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
index f513e69..e248f7d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.longs.LongValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.longs.LongWrapperValueSemanticsProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class LongValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
index 6227a29..7962e7d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.shortint.ShortValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.shortint.ShortWrapperValueSemanticsProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class ShortValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
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 da3cfce..069873f 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
@@ -45,10 +45,10 @@ import org.apache.isis.core.metamodel.facets.object.encodeable.encoder.Encodable
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public abstract class ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
index f67c857..e2a4186 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
@@ -32,8 +32,8 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.unittestsupport.config.internal._Config;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class JodaLocalDateTimeValueSemanticsProviderTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java
index 1dbeae3..87b4806 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java
@@ -42,8 +42,8 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.WhereValueFacet;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
@RunWith(Parameterized.class)
public class ObjectAssociationPredicatesTest_visibleWhere {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
index 9f228a9..0cf2058 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
@@ -39,8 +39,8 @@ import static org.hamcrest.Matchers.lessThan;
import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.appfeat.ApplicationMemberType;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class ApplicationFeatureIdTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
index 168fd97..6d25e07 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
@@ -56,7 +56,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class ApplicationFeatureRepositoryDefaultTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault_recognizes_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault_recognizes_Test.java
index 5b4bc97..04210ba 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault_recognizes_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault_recognizes_Test.java
@@ -27,8 +27,8 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ExceptionRecognizerDocDefault_recognizes_Test {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefaultTest.java
index 6d6aa51..071c385 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefaultTest.java
@@ -53,8 +53,8 @@ import org.apache.isis.core.metamodel.spec.Hierarchical;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionDefault;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
class MetaModelServiceDefaultTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
index 3693d85..e324b16 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.spec;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
+import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class ObjectSpecIdTest_valueSemantics extends ValueTypeContractTestAbstract<ObjectSpecId> {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
index 5607022..f99aa12 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
@@ -32,8 +32,8 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import lombok.val;
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 2b85973..3c2def6 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
@@ -49,7 +49,7 @@ import org.apache.isis.core.metamodel.progmodels.dflt.ProgrammingModelFacetsJava
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
index b3badc3..a72c159 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
@@ -40,8 +40,8 @@ import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectActionParameterAbstractTest_getId_and_getName {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
index 453a1ec..a2ec67c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
@@ -43,8 +43,8 @@ import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectAssociationAbstractTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
index 2b92020..243c600 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
@@ -46,8 +46,8 @@ import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectAssociationAbstractTest_alwaysHidden {
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 aec4394..5cfa3af 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
@@ -47,7 +47,7 @@ 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.metamodel.specloader.specimpl.IntrospectionState;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSpecification {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java
index 455e914..664ee57 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidExcep
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
/**
* Provides static access to current context's singletons
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContext.java
index 68b742d..9e7cf4f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContext.java
@@ -24,7 +24,7 @@ import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.services.homepage.HomePageAction;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
/**
* TODO [2033] this was introduced when refactoring, maybe use MetaModelContext instead if possible
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java
index e7c3b34..0637c09 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java
@@ -29,8 +29,8 @@ import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.services.homepage.HomePageAction;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import lombok.Getter;
import lombok.val;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSessionFactory.java
index 84200a2..98717e6 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSessionFactory.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.runtime.persistence.session;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
public interface PersistenceSessionFactory {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisRequestCycle.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisRequestCycle.java
index 535a6e6..11431ec 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisRequestCycle.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisRequestCycle.java
@@ -22,7 +22,7 @@ import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionTemplate;
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java
index 1f4fd96..25ea526 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java
@@ -29,8 +29,8 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.runtime.context.session.RuntimeContextBase;
import org.apache.isis.core.runtime.context.session.RuntimeEventService;
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.MessageBroker;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.MessageBroker;
import lombok.Getter;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java
index e27f672..cf8ad41 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java
@@ -25,7 +25,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.runtime.session.init.InitialisationSession;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
/**
* Is the factory of {@link IsisSession}s, also holding a reference to the current session using
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryDefault.java
index 378e729..b91e4bf 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryDefault.java
@@ -48,8 +48,8 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.context.session.RuntimeEventService;
import org.apache.isis.core.runtime.session.init.IsisLocaleInitializer;
import org.apache.isis.core.runtime.session.init.IsisTimeZoneInitializer;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/InitialisationSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/InitialisationSession.java
index 3f04fc4..ce2950a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/InitialisationSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/InitialisationSession.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.session.init;
import java.io.IOException;
import org.apache.isis.core.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.security.api.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
public final class InitialisationSession extends AuthenticationSessionAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/template/AbstractIsisSessionTemplate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/template/AbstractIsisSessionTemplate.java
index b6ffe3a..4eb7ad2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/template/AbstractIsisSessionTemplate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/template/AbstractIsisSessionTemplate.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
public abstract class AbstractIsisSessionTemplate {
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 b44b832..b432880 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
@@ -38,7 +38,7 @@ import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacetAbstract;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionDefault;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+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;
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 c7154f8..fe10470 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
@@ -43,7 +43,7 @@ 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.security.api.authentication.AuthenticationSessionProvider;
+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;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/auth/AuthenticationSessionProviderDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/auth/AuthenticationSessionProviderDefault.java
index 8534674..8545e3d 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/auth/AuthenticationSessionProviderDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/auth/AuthenticationSessionProviderDefault.java
@@ -30,9 +30,9 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.metamodel.services.user.UserServiceDefault;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
+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 lombok.val;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/message/MessageServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/message/MessageServiceDefault.java
index bce6d69..d1a0d98 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/message/MessageServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/message/MessageServiceDefault.java
@@ -32,7 +32,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.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.MessageBroker;
+import org.apache.isis.core.security.authentication.MessageBroker;
@Service
@Named("isisRuntimeServices.MessageServiceDefault")
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userprof/UserProfileServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userprof/UserProfileServiceDefault.java
index bb8b111..0060840 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userprof/UserProfileServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userprof/UserProfileServiceDefault.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.userprof.UserProfileService;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
@Service
@Named("isisRuntimeServices.UserProfileServiceDefault")
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
index 03d463d..596d5dc 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -67,7 +67,7 @@ import org.apache.isis.core.metamodel.specloader.specimpl.ContributeeMember;
import org.apache.isis.core.metamodel.specloader.specimpl.MixedInMember;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionContributee;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.val;
diff --git a/core/security/pom.xml b/core/security/pom.xml
index d1d356a..3492f17 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -24,7 +24,6 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>isis-core-security</artifactId>
@@ -78,6 +77,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
</project>
diff --git a/core/security/src/main/doc/modules/api/partials/module-nav.adoc b/core/security/src/main/doc/modules/api/partials/module-nav.adoc
deleted file mode 100644
index e636f85..0000000
--- a/core/security/src/main/doc/modules/api/partials/module-nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-* xref:security:api:about.adoc[API]
-
diff --git a/core/security/src/main/doc/modules/api/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG b/core/security/src/main/doc/modules/core/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
similarity index 100%
rename from core/security/src/main/doc/modules/api/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
rename to core/security/src/main/doc/modules/core/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
diff --git a/core/security/src/main/doc/modules/api/nav.adoc b/core/security/src/main/doc/modules/core/nav.adoc
similarity index 100%
rename from core/security/src/main/doc/modules/api/nav.adoc
rename to core/security/src/main/doc/modules/core/nav.adoc
diff --git a/core/security/src/main/doc/modules/api/pages/about.adoc b/core/security/src/main/doc/modules/core/pages/about.adoc
similarity index 100%
rename from core/security/src/main/doc/modules/api/pages/about.adoc
rename to core/security/src/main/doc/modules/core/pages/about.adoc
diff --git a/core/security/src/main/doc/modules/core/partials/module-nav.adoc b/core/security/src/main/doc/modules/core/partials/module-nav.adoc
new file mode 100644
index 0000000..0bf37dd
--- /dev/null
+++ b/core/security/src/main/doc/modules/core/partials/module-nav.adoc
@@ -0,0 +1,2 @@
+* xref:security:core:about.adoc[API]
+
diff --git a/core/security/src/main/java/org/apache/isis/security/api/IsisModuleSecurityApi.java b/core/security/src/main/java/org/apache/isis/core/security/IsisModuleCoreSecurity.java
similarity index 77%
rename from core/security/src/main/java/org/apache/isis/security/api/IsisModuleSecurityApi.java
rename to core/security/src/main/java/org/apache/isis/core/security/IsisModuleCoreSecurity.java
index ae9cbfd..b5349f9 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/IsisModuleSecurityApi.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/IsisModuleCoreSecurity.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.security.api;
+package org.apache.isis.core.security;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorDefault;
-import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.standard.RandomCodeGeneratorDefault;
+import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
@Configuration
@Import({
@@ -34,5 +34,5 @@ import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
// @Component's
RandomCodeGeneratorDefault.class,
})
-public class IsisModuleSecurityApi {
+public class IsisModuleCoreSecurity {
}
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequest.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequest.java
similarity index 96%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequest.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequest.java
index 88cc8df..f9aeab5 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequest.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication;
+package org.apache.isis.core.security.authentication;
import java.util.Collection;
import java.util.stream.Stream;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestAbstract.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequestAbstract.java
similarity index 96%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestAbstract.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequestAbstract.java
index ec83086..02e7c50 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestAbstract.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequestAbstract.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication;
+package org.apache.isis.core.security.authentication;
import java.util.Set;
import java.util.stream.Stream;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestPassword.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequestPassword.java
similarity index 95%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestPassword.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequestPassword.java
index 362d941..159bbaf 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestPassword.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequestPassword.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication;
+package org.apache.isis.core.security.authentication;
public class AuthenticationRequestPassword extends AuthenticationRequestAbstract {
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSession.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSession.java
similarity index 95%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSession.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSession.java
index 59158de..f80b1c0 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSession.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSession.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication;
+package org.apache.isis.core.security.authentication;
import java.io.Serializable;
import org.apache.isis.applib.security.UserMemento;
import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal.encoding.Encodable;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
/**
* The representation within the system of an authenticated user.
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionAbstract.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionAbstract.java
similarity index 98%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionAbstract.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionAbstract.java
index 635eb48..8103089 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionAbstract.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionAbstract.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication;
+package org.apache.isis.core.security.authentication;
import java.io.IOException;
import java.io.Serializable;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionProvider.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionProvider.java
similarity index 94%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionProvider.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionProvider.java
index 1062367..fbc6acd 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionProvider.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.security.api.authentication;
+package org.apache.isis.core.security.authentication;
/**
* This is implemented by an (internal) domain service
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/MessageBroker.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/MessageBroker.java
similarity index 97%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/MessageBroker.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/MessageBroker.java
index 5a0e6dc..7dd153e 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/MessageBroker.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/MessageBroker.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication;
+package org.apache.isis.core.security.authentication;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/fixtures/AuthenticationRequestLogonFixture.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
similarity index 87%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/fixtures/AuthenticationRequestLogonFixture.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
index cf4b6d9..2b31fc7 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/fixtures/AuthenticationRequestLogonFixture.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.fixtures;
+package org.apache.isis.core.security.authentication.fixtures;
import java.util.Collection;
import java.util.Collections;
import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.security.api.authentication.AuthenticationRequestAbstract;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.AuthenticationRequestAbstract;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
/**
* For testing purposes, request corresponding to a {@link LogonFixture}.
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/health/HealthAuthSession.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthSession.java
similarity index 90%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/health/HealthAuthSession.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthSession.java
index b99f5f4..11db2b2 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/health/HealthAuthSession.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthSession.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.health;
+package org.apache.isis.core.security.authentication.health;
import java.io.IOException;
import java.util.stream.Stream;
import org.apache.isis.core.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.security.api.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
public class HealthAuthSession extends AuthenticationSessionAbstract {
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
similarity index 90%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
index 9c18b50..26ab71f 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.manager;
+package org.apache.isis.core.security.authentication.manager;
import java.util.List;
import java.util.Map;
@@ -36,13 +36,13 @@ import org.apache.isis.applib.util.ToString;
import org.apache.isis.core.commons.internal.base._NullSafe;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.standard.Authenticator;
-import org.apache.isis.security.api.authentication.standard.NoAuthenticatorException;
-import org.apache.isis.security.api.authentication.standard.RandomCodeGenerator;
-import org.apache.isis.security.api.authentication.standard.Registrar;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.standard.NoAuthenticatorException;
+import org.apache.isis.core.security.authentication.standard.RandomCodeGenerator;
+import org.apache.isis.core.security.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authentication.standard.Registrar;
import lombok.Getter;
import lombok.val;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/manager/RegistrationDetails.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/RegistrationDetails.java
similarity index 93%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/manager/RegistrationDetails.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/manager/RegistrationDetails.java
index 116dcac..1bdb942 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/manager/RegistrationDetails.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/RegistrationDetails.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.security.api.authentication.manager;
+package org.apache.isis.core.security.authentication.manager;
public interface RegistrationDetails {
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/AuthenticationRequestSingleUser.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/AuthenticationRequestSingleUser.java
similarity index 89%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/AuthenticationRequestSingleUser.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/AuthenticationRequestSingleUser.java
index a435d0c..e679dbf 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/AuthenticationRequestSingleUser.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/AuthenticationRequestSingleUser.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.singleuser;
+package org.apache.isis.core.security.authentication.singleuser;
-import org.apache.isis.security.api.authentication.AuthenticationRequestAbstract;
+import org.apache.isis.core.security.authentication.AuthenticationRequestAbstract;
/**
* Requests corresponding to an {@link SingleUserSession}.
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/SingleUserSession.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserSession.java
similarity index 92%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/SingleUserSession.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserSession.java
index 2e9ceef..01c0fab 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/SingleUserSession.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserSession.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.singleuser;
+package org.apache.isis.core.security.authentication.singleuser;
import java.io.IOException;
import org.apache.isis.core.commons.internal.encoding.DataInputExtended;
import org.apache.isis.core.commons.internal.encoding.DataOutputExtended;
import org.apache.isis.core.commons.internal.encoding.Encodable;
-import org.apache.isis.security.api.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
public final class SingleUserSession extends AuthenticationSessionAbstract implements Encodable {
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Authenticator.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Authenticator.java
similarity index 86%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Authenticator.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Authenticator.java
index 4f9d9d0..8c9b7dd 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Authenticator.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Authenticator.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.standard;
+package org.apache.isis.core.security.authentication.standard;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
public interface Authenticator {
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorAbstract.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorAbstract.java
similarity index 88%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorAbstract.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorAbstract.java
index 55b7ea3..393a3c0 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorAbstract.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorAbstract.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.standard;
+package org.apache.isis.core.security.authentication.standard;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
public abstract class AuthenticatorAbstract implements Authenticator {
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/NoAuthenticatorException.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/NoAuthenticatorException.java
similarity index 95%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/standard/NoAuthenticatorException.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/standard/NoAuthenticatorException.java
index 3ef7da0..1d47e55 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/NoAuthenticatorException.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/NoAuthenticatorException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.standard;
+package org.apache.isis.core.security.authentication.standard;
import org.apache.isis.core.commons.exceptions.IsisException;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGenerator.java
similarity index 93%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGenerator.java
index f77c892..f288062 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGenerator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.standard;
+package org.apache.isis.core.security.authentication.standard;
public interface RandomCodeGenerator {
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGeneratorDefault.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGeneratorDefault.java
similarity index 96%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGeneratorDefault.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGeneratorDefault.java
index 721386b..4854bc7 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGeneratorDefault.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGeneratorDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.security.api.authentication.standard;
+package org.apache.isis.core.security.authentication.standard;
import java.util.Random;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Registrar.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Registrar.java
similarity index 88%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Registrar.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Registrar.java
index 6855d2d..0435479 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Registrar.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Registrar.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.standard;
+package org.apache.isis.core.security.authentication.standard;
-import org.apache.isis.security.api.authentication.manager.RegistrationDetails;
+import org.apache.isis.core.security.authentication.manager.RegistrationDetails;
public interface Registrar extends Authenticator {
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RegistrationDetailsPassword.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RegistrationDetailsPassword.java
similarity index 87%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RegistrationDetailsPassword.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RegistrationDetailsPassword.java
index ba8458d..9c68bef 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RegistrationDetailsPassword.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RegistrationDetailsPassword.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.security.api.authentication.standard;
+package org.apache.isis.core.security.authentication.standard;
-import org.apache.isis.security.api.authentication.manager.RegistrationDetails;
+import org.apache.isis.core.security.authentication.manager.RegistrationDetails;
import lombok.Data;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/SimpleSession.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleSession.java
similarity index 94%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/standard/SimpleSession.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleSession.java
index 765283a..b060c9f 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/SimpleSession.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleSession.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.standard;
+package org.apache.isis.core.security.authentication.standard;
import java.io.IOException;
import java.util.List;
import java.util.stream.Stream;
import org.apache.isis.core.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.security.api.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java b/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java
similarity index 94%
rename from core/security/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java
rename to core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java
index 2791681..eec982d 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authorization.manager;
+package org.apache.isis.core.security.authorization.manager;
import javax.annotation.Nullable;
import javax.inject.Inject;
@@ -31,8 +31,8 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.sudo.SudoService;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authorization.standard.Authorizor;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authorization.standard.Authorizor;
/**
* 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/security/api/authorization/standard/AuthorizationConstants.java b/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/AuthorizationConstants.java
similarity index 94%
rename from core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
rename to core/security/src/main/java/org/apache/isis/core/security/authorization/standard/AuthorizationConstants.java
index be462ac..2a1aa5d 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/AuthorizationConstants.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authorization.standard;
+package org.apache.isis.core.security.authorization.standard;
public final class AuthorizationConstants {
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/Authorizor.java b/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/Authorizor.java
similarity index 96%
rename from core/security/src/main/java/org/apache/isis/security/api/authorization/standard/Authorizor.java
rename to core/security/src/main/java/org/apache/isis/core/security/authorization/standard/Authorizor.java
index 1f93c49..a2550e7 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/Authorizor.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/Authorizor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authorization.standard;
+package org.apache.isis.core.security.authorization.standard;
import org.apache.isis.applib.Identifier;
diff --git a/core/security/src/test/java/org/apache/isis/security/EncodabilityContractTest.java b/core/security/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
index a567b28..71dab7a 100644
--- a/core/security/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
@@ -37,7 +37,7 @@ import org.apache.isis.core.commons.internal.encoding.DataInputExtended;
import org.apache.isis.core.commons.internal.encoding.DataInputStreamExtended;
import org.apache.isis.core.commons.internal.encoding.DataOutputStreamExtended;
import org.apache.isis.core.commons.internal.encoding.Encodable;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
public abstract class EncodabilityContractTest {
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
index 4fefa4f..7df1785 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
@@ -32,11 +32,11 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertThat;
-import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.api.authentication.standard.Authenticator;
-import org.apache.isis.security.api.authentication.standard.NoAuthenticatorException;
-import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorDefault;
+import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authentication.standard.NoAuthenticatorException;
+import org.apache.isis.core.security.authentication.standard.RandomCodeGeneratorDefault;
@RunWith(JMock.class)
public class AuthenticationManager_authenticators_Test {
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
index 9f61f65..f001460 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
@@ -26,8 +26,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.standard.AuthenticatorAbstract;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.standard.AuthenticatorAbstract;
@RunWith(JMock.class)
public class AuthenticatorDefaultTest {
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
index 08d553b..0478512 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
@@ -25,7 +25,7 @@ import org.jmock.integration.junit4.JMock;
import org.junit.runner.RunWith;
import org.apache.isis.core.commons.internal.encoding.Encodable;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authentication.standard.SimpleSession;
@RunWith(JMock.class)
public class SimpleSessionEncodabilityNoRolesTest extends SimpleSessionEncodabilityTestAbstract {
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
index 0d93ce0..1d67946 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
@@ -24,7 +24,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import org.apache.isis.security.EncodabilityContractTest;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authentication.standard.SimpleSession;
public abstract class SimpleSessionEncodabilityTestAbstract extends EncodabilityContractTest {
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
index bb2f595..3dc472c 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
@@ -25,7 +25,7 @@ import org.jmock.integration.junit4.JMock;
import org.junit.runner.RunWith;
import org.apache.isis.core.commons.internal.encoding.Encodable;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authentication.standard.SimpleSession;
@RunWith(JMock.class)
public class SimpleSessionEncodabilityWithRolesTest extends SimpleSessionEncodabilityTestAbstract {
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
index 679c53f..50da857 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
@@ -35,12 +35,12 @@ import org.junit.runner.RunWith;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.api.authentication.standard.Authenticator;
-import org.apache.isis.security.api.authentication.standard.RandomCodeGenerator;
+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.core.security.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authentication.standard.RandomCodeGenerator;
@RunWith(JMock.class)
public class StandardAuthenticationManager_AuthenticationTest {
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 03b9a29..0189f69 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -179,6 +179,12 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<profiles>
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMemento.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMemento.java
index 6c206ad..750451a 100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMemento.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMemento.java
@@ -39,7 +39,7 @@ public interface ObjectMemento extends Serializable {
/**
* Returns a bookmark only if
- * {@link org.apache.isis.runtime.services.memento.ObjectMementoLegacy.RecreateStrategy#LOOKUP} and
+ * {@link org.apache.isis.core.runtimeservices.memento.ObjectMementoLegacy.RecreateStrategy#LOOKUP} and
* {@link #getCardinality() sort} is {@link Cardinality#SCALAR scalar}.
* Returns {@code null} otherwise.
*/
@@ -47,7 +47,7 @@ public interface ObjectMemento extends Serializable {
/**
* Returns a bookmark only if
- * {@link org.apache.isis.runtime.services.memento.ObjectMementoLegacy.RecreateStrategy#LOOKUP} and
+ * {@link org.apache.isis.core.runtimeservices.memento.ObjectMementoLegacy.RecreateStrategy#LOOKUP} and
* {@link #getCardinality() sort} is {@link Cardinality#SCALAR scalar}.
* Returns {@code null} otherwise.
*/
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/wormhole/AuthenticationSessionWormhole.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/wormhole/AuthenticationSessionWormhole.java
index 9c18837..690711e 100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/wormhole/AuthenticationSessionWormhole.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/wormhole/AuthenticationSessionWormhole.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.webapp.wormhole;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.experimental.UtilityClass;
diff --git a/core/webspringboot/pom.xml b/core/webspringboot/pom.xml
index f820000..32202d4 100644
--- a/core/webspringboot/pom.xml
+++ b/core/webspringboot/pom.xml
@@ -34,7 +34,7 @@
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.webboot.springboot</jar-plugin.automaticModuleName>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.webspringboot</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/webboot/springboot</git-plugin.propertiesDir>
</properties>
diff --git a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
index 8e62669..b3ce4c7 100644
--- a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
+++ b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
@@ -12,11 +12,11 @@ org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts
ServiceRegistryDefault
UserServiceDefault$SudoServiceSpi
org.apache.isis.persistence.jdo.datanucleus5.metrics.MetricsServiceDefault
-org.apache.isis.runtime.services.command.CommandDtoServiceInternalDefault
-org.apache.isis.runtime.services.confmenu.ConfigurationViewServiceDefault
-org.apache.isis.runtime.services.email.EmailServiceDefault
-org.apache.isis.runtime.services.i18n.po.TranslationServicePoMenu
-org.apache.isis.runtime.services.ixn.InteractionDtoServiceInternalDefault
-org.apache.isis.runtime.services.sudo.SudoServiceDefault
-org.apache.isis.runtime.services.userprof.UserProfileServiceDefault
-org.apache.isis.runtime.services.userreg.EmailNotificationServiceDefault
\ No newline at end of file
+org.apache.isis.core.runtimeservices.command.CommandDtoServiceInternalDefault
+org.apache.isis.core.runtimeservices.confmenu.ConfigurationViewServiceDefault
+org.apache.isis.core.runtimeservices.email.EmailServiceDefault
+org.apache.isis.core.runtimeservices.i18n.po.TranslationServicePoMenu
+org.apache.isis.core.runtimeservices.ixn.InteractionDtoServiceInternalDefault
+org.apache.isis.core.runtimeservices.sudo.SudoServiceDefault
+org.apache.isis.core.runtimeservices.userprof.UserProfileServiceDefault
+org.apache.isis.core.runtimeservices.userreg.EmailNotificationServiceDefault
\ No newline at end of file
diff --git a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list
index 5dfef67..b7036eb 100644
--- a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list
+++ b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list
@@ -2,7 +2,7 @@ org.apache.isis.applib.services.command.CommandContext
org.apache.isis.applib.services.iactn.InteractionContext
org.apache.isis.applib.services.queryresultscache.QueryResultsCacheInternal
org.apache.isis.applib.services.scratchpad.Scratchpad
-org.apache.isis.runtime.services.changes.ChangedObjectsServiceInternal
-org.apache.isis.runtime.services.metrics.MetricsServiceDefault
+org.apache.isis.core.runtimeservices.changes.ChangedObjectsServiceInternal
+org.apache.isis.core.runtimeservices.metrics.MetricsServiceDefault
PublisherDispatchServiceDefault
org.apache.isis.objectstore.jdo.datanucleus.service.support.TimestampService
\ No newline at end of file
diff --git a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java
index 7135598..093bab8 100644
--- a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java
+++ b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java
@@ -47,7 +47,7 @@ import org.apache.isis.extensions.secman.api.user.AccountType;
import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
import org.apache.isis.extensions.secman.shiro.util.ShiroUtils;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authorization.standard.Authorizor;
+import org.apache.isis.core.security.authorization.standard.Authorizor;
import lombok.Getter;
import lombok.Setter;
diff --git a/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java b/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
index 2942859..3d59e52 100644
--- a/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
+++ b/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
@@ -18,15 +18,15 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import java.lang.reflect.Method;
-import org.apache.isis.metamodel.facets.FacetFactory;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetUtil;
-import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetUtil;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
public class Jsr303FacetFactory implements FacetFactory {
diff --git a/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java b/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
index dacd6e3..6b18c97 100644
--- a/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
+++ b/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
@@ -18,11 +18,11 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
-import org.apache.isis.metamodel.facets.FacetFactory;
-import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
-import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacetsJava5;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
+import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacetsJava5;
/**
diff --git a/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java b/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
index da2a0a1..d8b1d76 100644
--- a/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
+++ b/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import java.util.Set;
@@ -27,14 +27,14 @@ import javax.validation.ValidationProviderFactory;
import javax.validation.Validator;
import org.apache.isis.applib.events.ValidityEvent;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetAbstract;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.interactions.ProposedHolder;
-import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
-import org.apache.isis.metamodel.interactions.ValidityContext;
-import org.apache.isis.metamodel.spec.identifier.Identified;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.interactions.ProposedHolder;
+import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions.ValidityContext;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
public class Jsr303PropertyValidationFacet extends FacetAbstract implements ValidatingInteractionAdvisor {
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
index 05ed767..0a5bed8 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
index 4adc9f4..15a3297 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import javax.validation.Constraint;
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
index 17eefcb..39a82bf 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
index 148120f..0f7288e 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import org.apache.isis.applib.AbstractDomainObject;
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
index 4d24609..63e89f3 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import javax.validation.Pattern;
import javax.validation.Patterns;
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
index e7be3da..4ba69e9 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
public class DomainObjectWithCustomValidation {
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
index 421c9e2..f9dfe9b 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
@@ -32,8 +32,8 @@ import org.junit.runner.RunWith;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
index 59083a5..20976c7 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import org.junit.After;
import org.junit.Before;
@@ -28,8 +28,8 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.collection.IsArrayContaining.hasItemInArray;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
index 731c7ff..643b798 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
@@ -18,11 +18,11 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import org.junit.Test;
-import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
+import org.apache.isis.core.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
public class Jsr303FacetFactoryInstantiation {
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
index f8f846e..034e049 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
@@ -32,9 +32,9 @@ import org.junit.runner.RunWith;
import static org.junit.Assert.fail;
-import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
@RunWith(JMock.class)
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
index 821a92a..61dbebd 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import java.lang.reflect.Method;
@@ -32,12 +32,12 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
-import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
+import org.apache.isis.core.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
-import static org.apache.isis.metamodel.commons.matchers.NofMatchers.anInstanceOf;
+import static org.apache.isis.core.metamodel.commons.matchers.NofMatchers.anInstanceOf;
@RunWith(JMock.class)
public class Jsr303FacetFactoryProcessProperty {
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
index 27c1849..e0db582 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
@@ -18,14 +18,14 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
public class Jsr303FacetInstantiation {
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
index 04b61ff..645bda3 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import org.jmock.Expectations;
import org.jmock.Mockery;
@@ -36,10 +36,10 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
-import org.apache.isis.metamodel.interactions.PropertyModifyContext;
-import org.apache.isis.metamodel.spec.identifier.Identified;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
+import org.apache.isis.core.metamodel.interactions.PropertyModifyContext;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
@RunWith(JMock.class)
diff --git a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Color.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Color.java
index 6b0124e..ba7829f 100644
--- a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Color.java
+++ b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Color.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.Value;
* Where there is no basic colors (RGB all equal 0) then you get black; where
* each color is at maximum (RGB all equal 255) you get white.
*/
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.color.ColorValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.color.ColorValueSemanticsProvider")
public class Color extends Magnitude<Color> {
private static final long serialVersionUID = 1L;
diff --git a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Money.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Money.java
index 37fd105..82bc539 100644
--- a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Money.java
+++ b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Money.java
@@ -23,7 +23,7 @@ import java.math.BigDecimal;
import org.apache.isis.applib.annotation.Value;
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.money.MoneyValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.money.MoneyValueSemanticsProvider")
public class Money extends Magnitude<Money> {
private static final long serialVersionUID = 1L;
diff --git a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Percentage.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Percentage.java
index 1fffc6d..b99e6fb 100644
--- a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Percentage.java
+++ b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Percentage.java
@@ -21,7 +21,7 @@ package org.apache.isis.legacy.applib.value;
import org.apache.isis.applib.annotation.Value;
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.percentage.PercentageValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.percentage.PercentageValueSemanticsProvider")
public class Percentage extends Magnitude<Percentage> {
private static final long serialVersionUID = 1L;
diff --git a/mavendeps/pom.xml b/mavendeps/pom.xml
index 86124e6..f1bedf7 100644
--- a/mavendeps/pom.xml
+++ b/mavendeps/pom.xml
@@ -70,7 +70,6 @@
<dependencyManagement>
<dependencies>
- <!-- ISIS CORE -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
@@ -79,7 +78,14 @@
<scope>import</scope>
</dependency>
- <!-- LOMBOK -->
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
diff --git a/mavendeps/testing/pom.xml b/mavendeps/testing/pom.xml
index f2b4362..79c661d 100644
--- a/mavendeps/testing/pom.xml
+++ b/mavendeps/testing/pom.xml
@@ -57,7 +57,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing-integtestsupport-applib</artifactId>
</dependency>
<dependency>
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
index ceec585..ebebdf7 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
@@ -40,7 +40,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
import org.apache.isis.core.runtime.context.session.RuntimeContextBase;
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.Getter;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
index 178092e..8a299e4 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
@@ -44,7 +44,7 @@ import org.apache.isis.persistence.jdo.applib.fixturestate.FixturesInstalledStat
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.persistence.queries.PersistenceQueryProcessor;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFactory;
import org.apache.isis.core.runtime.persistence.transaction.ChangedObjectsService;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.Getter;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
index 5f8cf5a..37df2fb 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
@@ -45,7 +45,7 @@ import org.apache.isis.core.runtime.persistence.transaction.events.TransactionBe
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.core.runtime.session.init.InitialisationSession;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
index e8fe44c..aa39a07 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
@@ -92,7 +92,7 @@ import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.Persiste
import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQuery;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFindAllInstances;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
index 50792b4..017ea91 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
@@ -51,7 +51,7 @@ import org.apache.isis.persistence.jdo.datanucleus5.entities.JdoEntityTypeRegist
import org.apache.isis.persistence.jdo.datanucleus5.lifecycles.JdoStoreLifecycleListenerForIsis;
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.persistence.session.PersistenceSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.Getter;
import lombok.Setter;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index d46c666..c4e5ecc 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+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;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
index 0ba63d9..920a50f 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
@@ -62,8 +62,8 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectMemberAbstract;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PojoAdapterBuilder;
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+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;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index 2b37416..bbc403e 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -71,8 +71,8 @@ import org.apache.isis.core.runtimeservices.wrapper.dom.employees.EmployeeReposi
import org.apache.isis.core.runtimeservices.wrapper.dom.employees.EmployeeRepositoryImpl;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.schema.cmd.v1.CommandDto;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.standard.SimpleSession;
import org.apache.isis.core.unittestsupport.config.internal._Config;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
index c8aeca0..edc24b6 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
@@ -65,8 +65,8 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.isis.core.runtimeservices.wrapper.dom.employees.Employee;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
+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;
diff --git a/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java b/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
index 38d97fb..8ddf0c3 100644
--- a/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
+++ b/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
@@ -26,8 +26,8 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.standard.AuthenticatorAbstract;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.standard.AuthenticatorAbstract;
/**
* Implementation that bypasses authentication.
diff --git a/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java b/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
index 0c1cce7..f71a56b 100644
--- a/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
+++ b/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.security.api.authorization.standard.Authorizor;
+import org.apache.isis.core.security.authorization.standard.Authorizor;
@Service
@Named("isisSecurityBypass.AuthorizorBypass")
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
index 8ac6117..92288ff 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
@@ -26,9 +26,9 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.standard.Authenticator;
import org.apache.isis.core.webapp.wormhole.AuthenticationSessionWormhole;
@Service
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
index 3f0197c..17ab0da 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.security.api.authorization.standard.Authorizor;
+import org.apache.isis.core.security.authorization.standard.Authorizor;
@Service
@Named("isisSecurityKeycloak.AuthorizorKeycloak")
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
index 711eff8..b5a95c9 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
@@ -14,8 +14,8 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.standard.SimpleSession;
import org.apache.isis.core.webapp.wormhole.AuthenticationSessionWormhole;
import lombok.val;
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
index 0ee2b3f..3424d5b 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
@@ -49,12 +49,12 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.commons.internal.collections._Sets;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.standard.Authenticator;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
-import org.apache.isis.security.api.authorization.standard.Authorizor;
+import org.apache.isis.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.shiro.context.ShiroSecurityContext;
import lombok.extern.log4j.Log4j2;
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
index 0a7bbbf..684305d 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
@@ -30,8 +30,8 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.security.api.authentication.standard.Authenticator;
-import org.apache.isis.security.api.authorization.standard.Authorizor;
+import org.apache.isis.core.security.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authorization.standard.Authorizor;
import org.apache.isis.security.shiro.context.ShiroSecurityContext;
import lombok.extern.log4j.Log4j2;
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/context/ShiroSecurityContext.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/context/ShiroSecurityContext.java
index 1267ebc..de9e6df 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/context/ShiroSecurityContext.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/context/ShiroSecurityContext.java
@@ -23,8 +23,8 @@ import org.apache.shiro.UnavailableSecurityManagerException;
import org.apache.shiro.mgt.RealmSecurityManager;
import org.apache.shiro.mgt.SecurityManager;
-import org.apache.isis.security.api.authentication.standard.Authenticator;
-import org.apache.isis.security.api.authorization.standard.Authorizor;
+import org.apache.isis.core.security.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authorization.standard.Authorizor;
/**
* @since 2.0
diff --git a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
index 739fbb3..4faaf83 100644
--- a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
+++ b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
@@ -36,9 +36,9 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
diff --git a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index 2d1b94f..4a25fd3 100644
--- a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -35,8 +35,8 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 1a59f6a..a4004b9 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -134,8 +134,10 @@
<!-- testing -->
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures-applib</artifactId>
+ <artifactId>isis-testing</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
</dependencies>
diff --git a/subdomains/spring/pom.xml b/subdomains/spring/pom.xml
index e02db86..7e28707 100644
--- a/subdomains/spring/pom.xml
+++ b/subdomains/spring/pom.xml
@@ -18,7 +18,6 @@
<groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>isis-subdomains-spring</artifactId>
diff --git a/testing/fixtures/applib/pom.xml b/testing/fixtures/applib/pom.xml
index 5db80c0..dcc2009 100644
--- a/testing/fixtures/applib/pom.xml
+++ b/testing/fixtures/applib/pom.xml
@@ -66,7 +66,7 @@
<version>${jdo-api.version}</version>
<!-- provided by plugins -->
<scope>provided</scope>
- </dependency>p
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -75,7 +75,7 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing-integtestsupport-applib</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixturesService.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixturesService.java
index 9cb0005..ac5a9af 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixturesService.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixturesService.java
@@ -43,7 +43,7 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.subdomains.spring.applib.service.BeanDescriptor;
import org.apache.isis.subdomains.spring.applib.service.ContextBeans;
import org.apache.isis.subdomains.spring.applib.service.SpringBeansService;
-import org.apache.isis.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.Annotations;
import lombok.Data;
import lombok.val;
diff --git a/testing/pom.xml b/testing/pom.xml
index 9b332c4..a5facdc 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -61,15 +61,11 @@
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-testing-integtestsupport-applib</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- </dependency>
+ <!-- this module -->
<dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-spring-applib</artifactId>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -119,6 +115,13 @@
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
+ <!-- dependencies -->
+ <dependency>
+ <groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-spring-applib</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -128,10 +131,7 @@
<module>h2console</module>
<module>hsqldbmgr</module>
<module>specsupport</module>
-
<module>integtestsupport</module>
- <module>integtestsupport/applib</module>
-
<module>unittestsupport</module>
</modules>
diff --git a/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java
index 402dc4a..2747841 100644
--- a/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java
+++ b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.value.Markup;
*
*/
@Value(semanticsProviderName =
- "org.apache.isis.metamodel.facets.value.markup.MarkupValueSemanticsProvider")
+ "org.apache.isis.core.metamodel.facets.value.markup.MarkupValueSemanticsProvider")
public class AsciiDoc extends Markup {
private static final long serialVersionUID = 1L;
diff --git a/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Markdown.java b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Markdown.java
index 807ffec..01e14a0 100644
--- a/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Markdown.java
+++ b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Markdown.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.value.Markup;
*
*/
@Value(semanticsProviderName =
- "org.apache.isis.metamodel.facets.value.markup.MarkupValueSemanticsProvider")
+ "org.apache.isis.core.metamodel.facets.value.markup.MarkupValueSemanticsProvider")
public class Markdown extends Markup {
private static final long serialVersionUID = 1L;
diff --git a/valuetypes/markdown/pom.xml b/valuetypes/markdown/pom.xml
index 6b0d833..3d3e8b0 100644
--- a/valuetypes/markdown/pom.xml
+++ b/valuetypes/markdown/pom.xml
@@ -37,4 +37,24 @@
<module>ui</module>
</modules>
+ <profiles>
+ <profile>
+ <id>resolving-conflicts</id>
+ <activation>
+ <property>
+ <name>!skip.resolving-conflicts</name>
+ </property>
+ </activation>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ <version>1.10.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
+ </profiles>
+
</project>
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
index 7e6ac4d..27306f9 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.DomainObjectReprRenderer;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAdapterLinkTo;
import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationService;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
index a296964..d94cb24 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
@@ -23,7 +23,7 @@ import java.util.stream.Stream;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.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/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
index 9435383..05a157a 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.viewer.restfulobjects.viewer.resources;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.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/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategy.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategy.java
index c30bc83..6443042 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategy.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategy.java
@@ -22,8 +22,8 @@ package org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
/**
* Decouples the <code>IsisSessionFilter</code> from the mechanism of obtaining the
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyAbstract.java
index 7f5fc82..c6c8319 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyAbstract.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyAbstract.java
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpSession;
import org.springframework.web.context.support.WebApplicationContextUtils;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import lombok.val;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java
index ae22d83..608eca3 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java
@@ -28,8 +28,8 @@ import javax.servlet.http.HttpSession;
import org.apache.isis.core.commons.internal.base._Bytes;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.val;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyDefault.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyDefault.java
index 2f3f6e4..5c9b15a 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyDefault.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyDefault.java
@@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.val;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index 3f9d291..3520507 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -45,7 +45,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
index 73c18c4..90e05ef 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
@@ -43,7 +43,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 97e49ec..878a24c 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -49,7 +49,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.links.LinksProvider;
import org.apache.isis.viewer.wicket.model.mementos.ActionParameterMemento;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
index 7b1db1a..d2dcbde 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
@@ -33,7 +33,7 @@ import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.panels.PanelBase;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index d1feac7..0a5e391 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.runtime.session.IsisSession;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.errors.JGrowlUtil;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
index a03c0dd..ae0510e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
@@ -28,7 +28,7 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.security.api.authentication.MessageBroker;
+import org.apache.isis.core.security.authentication.MessageBroker;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
index b0ecfb9..b358bbf 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
@@ -20,7 +20,7 @@ package org.apache.isis.viewer.wicket.ui.errors;
import org.apache.wicket.util.string.Strings;
-import org.apache.isis.security.api.authentication.MessageBroker;
+import org.apache.isis.core.security.authentication.MessageBroker;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 704e881..228b755 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -63,7 +63,7 @@ import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
import org.apache.isis.core.commons.internal.ioc.BeanSort;
import org.apache.isis.core.config.viewer.wicket.DialogMode;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.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/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index fa8a763..77308e4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -25,7 +25,7 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
index 5576a39..5881b8e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -50,8 +50,8 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.session.IsisRequestCycle;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.MessageBroker;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.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/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
index df6d846..9eb28e1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.MessageBroker;
+import org.apache.isis.core.security.authentication.MessageBroker;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AnonymousWebSessionForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AnonymousWebSessionForIsis.java
index 41e28e1..71fafa7 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AnonymousWebSessionForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AnonymousWebSessionForIsis.java
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.wicket.viewer.integration;
import org.apache.wicket.Session;
import org.apache.wicket.request.Request;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import lombok.Getter;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
index ca1da89..53ba371 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
@@ -31,10 +31,10 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.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.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/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
index a353e06..e8a9b38 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
@@ -56,8 +56,8 @@ import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.runtime.session.IsisRequestCycle;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.MessageBroker;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.MessageBroker;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
index 8a419c1..feae634 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
@@ -38,12 +38,12 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.api.authentication.standard.Authenticator;
-import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorDefault;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authentication.standard.RandomCodeGeneratorDefault;
+import org.apache.isis.core.security.authentication.standard.SimpleSession;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
index 771366a..f379664 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
@@ -36,11 +36,11 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.api.authentication.standard.Authenticator;
-import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorDefault;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authentication.standard.RandomCodeGeneratorDefault;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
index e7eda88..fd36163 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
@@ -30,7 +30,7 @@ import org.junit.Rule;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+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.core.webapp.context.IsisWebAppCommonContext;