You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/06/28 10:54:58 UTC

[isis] branch v2 updated: ISIS-2126 aligning remaining 'runtime' package names

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/v2 by this push:
     new b3a6716  ISIS-2126 aligning remaining 'runtime' package names
b3a6716 is described below

commit b3a6716fd49561b0ef911d51637081b834c60821
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jun 28 12:34:00 2019 +0200

    ISIS-2126 aligning remaining 'runtime' package names
    
    - also aligning test package names
    - moving commons.encoding pkgs from 'metamodel' -> 'commons'
---
 .../isis/commons/internal}/encoding/DataInputExtendedDecorator.java | 4 +---
 .../isis/commons/internal}/encoding/DataInputStreamExtended.java    | 4 +---
 .../commons/internal}/encoding/DataOutputExtendedDecorator.java     | 4 +---
 .../isis/commons/internal}/encoding/DataOutputStreamExtended.java   | 5 +----
 .../isis/commons/internal}/encoding/DebugDataInputExtended.java     | 4 +---
 .../isis/commons/internal}/encoding/DebugDataOutputExtended.java    | 4 +---
 .../apache/isis/commons/internal}/encoding/EncodingConstants.java   | 2 +-
 .../isis/commons/internal}/encoding/FailedToDecodeException.java    | 2 +-
 .../commons/internal}/encoding/FailedToDeserializeException.java    | 2 +-
 .../java/org/apache/isis/commons/internal}/encoding/FieldType.java  | 5 +----
 .../org/apache/isis/commons/internal}/encoding/package-info.java    | 2 +-
 .../internal/assertions}/Ensure_GivenValueThatDoesMatchTest.java    | 2 +-
 .../internal/assertions}/Ensure_GivenValueThatDoesNotMatchTest.java | 2 +-
 .../commons/internal}/encoding/ByteEncoderDecoderRoundtripTest.java | 6 +++---
 .../{core/commons/lang => metamodel/commons}/IoUtils_CopyTest.java  | 2 +-
 .../lang => metamodel/commons}/JavaClassUtilsTest_getBuiltIn.java   | 2 +-
 .../commons/lang => metamodel/commons}/ListUtilsTest_adjust.java    | 2 +-
 .../commons/lang => metamodel/commons}/ListUtilsTest_insert.java    | 2 +-
 .../lang => metamodel/commons}/ListUtilsTest_mutableCopy.java       | 2 +-
 .../{core/commons/lang => metamodel/commons}/LocaleUtilsTest.java   | 2 +-
 .../isis/{core/commons/lang => metamodel/commons}/NameUtilTest.java | 2 +-
 .../isis/{core/commons/lang => metamodel/commons}/PrintLocale.java  | 2 +-
 .../lang => metamodel/commons}/StringUtilsTest_enumTitle.java       | 2 +-
 .../lang => metamodel/commons}/StringUtils_NaturalNameTest.java     | 2 +-
 .../lang => metamodel/commons}/StringUtils_NaturalizeTest.java      | 2 +-
 .../lang => metamodel/commons}/StringUtils_NormalizedTest.java      | 2 +-
 .../commons}/StringUtils_RemoveLeadingWhiteSpace.java               | 2 +-
 .../lang => metamodel/commons}/StringUtils_SplitOnCommas.java       | 2 +-
 .../commons}/StringUtils_StripLeadingSlashTest.java                 | 2 +-
 .../lang => metamodel/commons}/StringUtils_StripNewLinesTest.java   | 2 +-
 .../lang => metamodel/commons}/StringUtils_camelLowerFirst.java     | 2 +-
 .../lang => metamodel/commons}/StringUtils_toLineSeparated.java     | 2 +-
 .../lang => metamodel/commons}/StringUtils_toLowerDashed.java       | 2 +-
 .../commons/lang => metamodel/commons}/TypesTest_filteredList.java  | 2 +-
 .../isis/{core => metamodel}/commons/matchers/IsisMatchers.java     | 2 +-
 .../commons/matchers/IsisMatchers_NonEmptyStringTest.java           | 2 +-
 .../actions/action/ActionAnnotationFacetFactoryTest_Invocation.java | 2 +-
 .../actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java     | 2 +-
 .../collection/CollectionAnnotationFacetFactoryTest.java            | 2 +-
 .../annotation/DomainServiceFacetAnnotationFactoryTest.java         | 5 +++--
 .../properties/property/PropertyAnnotationFacetFactoryTest.java     | 2 +-
 .../runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java    | 1 +
 .../jdo/ExceptionRecognizerCompositeForJdoObjectStore.java          | 3 ---
 .../runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java    | 2 +-
 .../java/org/apache/isis/{core => }/runtime/system/Interface1.java  | 2 +-
 .../apache/isis/{core => }/runtime/system/JavaActionTestObject.java | 2 +-
 .../runtime/system/JavaObjectWithBasicProgramConventions.java       | 2 +-
 .../runtime/system/JavaObjectWithOneToOneAssociations.java          | 2 +-
 .../apache/isis/{core => }/runtime/system/JavaReferencedObject.java | 2 +-
 .../isis/{core => }/runtime/system/MethodFinderUtilsTest.java       | 2 +-
 .../{core => }/runtime/system/ObjectActionLayoutXmlDefaultTest.java | 2 +-
 .../{core => }/runtime/system/OneToManyAssociationDefaultTest.java  | 2 +-
 .../org/apache/isis/{core => }/runtime/system/RuntimeTestPojo.java  | 2 +-
 .../org/apache/isis/{core => }/runtime/system/TestDomainObject.java | 2 +-
 .../java/org/apache/isis/{core => }/runtime/system/TestObject.java  | 2 +-
 .../isis/{core => }/runtime/system/TestObjectAsAggregated.java      | 2 +-
 .../apache/isis/{core => }/runtime/system/TestObjectAsService.java  | 2 +-
 .../isis/{core => }/runtime/system/TestObjectWithCollection.java    | 2 +-
 .../{core => }/runtime/system/TypeExtractorMethodReturnTest.java    | 4 ++--
 .../runtime/system/TypeExtractorMethodsParametersTest.java          | 2 +-
 .../systemusinginstallers/fixture/budget/SomeServiceToInclude.java  | 2 +-
 .../fixture/budgetassignment/SomeServiceNotToInclude.java           | 2 +-
 .../authentication/fixture/LogonFixtureAuthenticatorTest.java       | 0
 .../isis/metamodel/commons/encoding/EncodabilityContractTest.java   | 4 ++--
 .../runtime/authentication/standard/AuthenticatorDefaultTest.java   | 0
 .../standard/SimpleSessionEncodabilityNoRolesTest.java              | 0
 .../standard/SimpleSessionEncodabilityTestAbstract.java             | 0
 .../standard/SimpleSessionEncodabilityWithRolesTest.java            | 0
 .../standard/StandardAuthenticationManager_AuthenticationTest.java  | 0
 .../standard/StandardAuthenticationManager_AuthenticatorsTest.java  | 0
 .../wicket/model/models/LowestCommonSuperclassClosureTest.java      | 2 +-
 71 files changed, 69 insertions(+), 86 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/DataInputExtendedDecorator.java b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtendedDecorator.java
similarity index 97%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/DataInputExtendedDecorator.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtendedDecorator.java
index ab97b6d..dde2bb0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/DataInputExtendedDecorator.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtendedDecorator.java
@@ -17,13 +17,11 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.commons.encoding;
+package org.apache.isis.commons.internal.encoding;
 
 import java.io.DataInputStream;
 import java.io.IOException;
 
-import org.apache.isis.commons.internal.encoding.DataInputExtended;
-
 public class DataInputExtendedDecorator implements DataInputExtended {
 
     private final DataInputExtended underlying;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/DataInputStreamExtended.java b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputStreamExtended.java
similarity index 97%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/DataInputStreamExtended.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputStreamExtended.java
index 63ca028..37ada9a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/DataInputStreamExtended.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputStreamExtended.java
@@ -17,14 +17,12 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.commons.encoding;
+package org.apache.isis.commons.internal.encoding;
 
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.isis.commons.internal.encoding.DataInputExtended;
-
 public class DataInputStreamExtended implements DataInputExtended {
 
     private final DataInputStream dataInputStream;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/DataOutputExtendedDecorator.java b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtendedDecorator.java
similarity index 97%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/DataOutputExtendedDecorator.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtendedDecorator.java
index dc8bb41..d7e9777 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/DataOutputExtendedDecorator.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtendedDecorator.java
@@ -17,13 +17,11 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.commons.encoding;
+package org.apache.isis.commons.internal.encoding;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.isis.commons.internal.encoding.DataOutputExtended;
-
 public class DataOutputExtendedDecorator implements DataOutputExtended {
 
     private final DataOutputExtended underlying;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/DataOutputStreamExtended.java b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputStreamExtended.java
similarity index 97%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/DataOutputStreamExtended.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputStreamExtended.java
index c1c4eaa..bd6469f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/DataOutputStreamExtended.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputStreamExtended.java
@@ -17,16 +17,13 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.commons.encoding;
+package org.apache.isis.commons.internal.encoding;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Serializable;
 
-import org.apache.isis.commons.internal.encoding.DataOutputExtended;
-import org.apache.isis.commons.internal.encoding.Encodable;
-
 public class DataOutputStreamExtended implements DataOutputExtended {
 
     private final DataOutputStream dataOutputStream;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/DebugDataInputExtended.java b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataInputExtended.java
similarity index 96%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/DebugDataInputExtended.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataInputExtended.java
index 84332fe..8dc9e48 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/DebugDataInputExtended.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataInputExtended.java
@@ -17,13 +17,11 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.commons.encoding;
+package org.apache.isis.commons.internal.encoding;
 
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.isis.commons.internal.encoding.DataInputExtended;
-
 import lombok.extern.log4j.Log4j2;
 
 @Log4j2
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/DebugDataOutputExtended.java b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataOutputExtended.java
similarity index 96%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/DebugDataOutputExtended.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataOutputExtended.java
index f2f92e3..ef9e913 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/DebugDataOutputExtended.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataOutputExtended.java
@@ -17,12 +17,10 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.commons.encoding;
+package org.apache.isis.commons.internal.encoding;
 
 import java.io.IOException;
 
-import org.apache.isis.commons.internal.encoding.DataOutputExtended;
-
 import lombok.extern.log4j.Log4j2;
 
 @Log4j2
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/EncodingConstants.java b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/EncodingConstants.java
similarity index 95%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/EncodingConstants.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/encoding/EncodingConstants.java
index cd6723c..6c0dec0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/EncodingConstants.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/EncodingConstants.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.commons.encoding;
+package org.apache.isis.commons.internal.encoding;
 
 public class EncodingConstants {
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/FailedToDecodeException.java b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDecodeException.java
similarity index 95%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/FailedToDecodeException.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDecodeException.java
index afdf180..01e091e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/FailedToDecodeException.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDecodeException.java
@@ -20,7 +20,7 @@
 /**
  *
  */
-package org.apache.isis.metamodel.commons.encoding;
+package org.apache.isis.commons.internal.encoding;
 
 import java.io.IOException;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/FailedToDeserializeException.java b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDeserializeException.java
similarity index 95%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/FailedToDeserializeException.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDeserializeException.java
index 50f293d..aa549f1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/FailedToDeserializeException.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDeserializeException.java
@@ -20,7 +20,7 @@
 /**
  *
  */
-package org.apache.isis.metamodel.commons.encoding;
+package org.apache.isis.commons.internal.encoding;
 
 import java.io.IOException;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/FieldType.java b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FieldType.java
similarity index 99%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/FieldType.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FieldType.java
index 543b05a..75322c3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/FieldType.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FieldType.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.commons.encoding;
+package org.apache.isis.commons.internal.encoding;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -32,9 +32,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.commons.internal.encoding.DataOutputExtended;
-import org.apache.isis.commons.internal.encoding.Encodable;
 
 import lombok.extern.log4j.Log4j2;
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/package-info.java b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/package-info.java
similarity index 96%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/package-info.java
rename to core/commons/src/main/java/org/apache/isis/commons/internal/encoding/package-info.java
index 6f7a5ff..dc22eee 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/commons/encoding/package-info.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/encoding/package-info.java
@@ -27,4 +27,4 @@
  * uses {@link org.hamcrest.Matcher Hamcrest matcher}s and is
  * more powerful so generally to be preferred.
  */
-package org.apache.isis.metamodel.commons.encoding;
\ No newline at end of file
+package org.apache.isis.commons.internal.encoding;
\ No newline at end of file
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/ensure/Ensure_GivenValueThatDoesMatchTest.java b/core/commons/src/test/java/org/apache/isis/commons/internal/assertions/Ensure_GivenValueThatDoesMatchTest.java
similarity index 97%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/ensure/Ensure_GivenValueThatDoesMatchTest.java
rename to core/commons/src/test/java/org/apache/isis/commons/internal/assertions/Ensure_GivenValueThatDoesMatchTest.java
index 2a06c87..1d3fb35 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/ensure/Ensure_GivenValueThatDoesMatchTest.java
+++ b/core/commons/src/test/java/org/apache/isis/commons/internal/assertions/Ensure_GivenValueThatDoesMatchTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.ensure;
+package org.apache.isis.commons.internal.assertions;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/ensure/Ensure_GivenValueThatDoesNotMatchTest.java b/core/commons/src/test/java/org/apache/isis/commons/internal/assertions/Ensure_GivenValueThatDoesNotMatchTest.java
similarity index 97%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/ensure/Ensure_GivenValueThatDoesNotMatchTest.java
rename to core/commons/src/test/java/org/apache/isis/commons/internal/assertions/Ensure_GivenValueThatDoesNotMatchTest.java
index a3543f1..2be7927 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/ensure/Ensure_GivenValueThatDoesNotMatchTest.java
+++ b/core/commons/src/test/java/org/apache/isis/commons/internal/assertions/Ensure_GivenValueThatDoesNotMatchTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.ensure;
+package org.apache.isis.commons.internal.assertions;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/encoding/ByteEncoderDecoderRoundtripTest.java b/core/commons/src/test/java/org/apache/isis/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
similarity index 96%
rename from core/metamodel/src/test/java/org/apache/isis/metamodel/commons/encoding/ByteEncoderDecoderRoundtripTest.java
rename to core/commons/src/test/java/org/apache/isis/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
index 1becd83..e38a12e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/encoding/ByteEncoderDecoderRoundtripTest.java
+++ b/core/commons/src/test/java/org/apache/isis/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.metamodel.commons.encoding;
+package org.apache.isis.commons.internal.encoding;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
@@ -30,10 +30,10 @@ import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 
 import org.apache.isis.commons.internal.encoding.DataInputExtended;
+import org.apache.isis.commons.internal.encoding.DataInputStreamExtended;
 import org.apache.isis.commons.internal.encoding.DataOutputExtended;
+import org.apache.isis.commons.internal.encoding.DataOutputStreamExtended;
 import org.apache.isis.commons.internal.encoding.Encodable;
-import org.apache.isis.metamodel.commons.encoding.DataInputStreamExtended;
-import org.apache.isis.metamodel.commons.encoding.DataOutputStreamExtended;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/IoUtils_CopyTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/IoUtils_CopyTest.java
similarity index 99%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/IoUtils_CopyTest.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/IoUtils_CopyTest.java
index b30c163..8b1b6b3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/IoUtils_CopyTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/IoUtils_CopyTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import static org.junit.Assert.assertThat;
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/JavaClassUtilsTest_getBuiltIn.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/JavaClassUtilsTest_getBuiltIn.java
similarity index 97%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/JavaClassUtilsTest_getBuiltIn.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/JavaClassUtilsTest_getBuiltIn.java
index 04a8d41..86f43a0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/JavaClassUtilsTest_getBuiltIn.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/JavaClassUtilsTest_getBuiltIn.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_adjust.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_adjust.java
similarity index 98%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_adjust.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_adjust.java
index 25d234e..b01176b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_adjust.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_adjust.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_insert.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_insert.java
similarity index 98%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_insert.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_insert.java
index 965c9e6..8e9ba49 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_insert.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_insert.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_mutableCopy.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_mutableCopy.java
similarity index 98%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_mutableCopy.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_mutableCopy.java
index aa2af47..37f341d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_mutableCopy.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/ListUtilsTest_mutableCopy.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/LocaleUtilsTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/LocaleUtilsTest.java
similarity index 96%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/LocaleUtilsTest.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/LocaleUtilsTest.java
index b072051..f1295f3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/LocaleUtilsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/LocaleUtilsTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/NameUtilTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/NameUtilTest.java
similarity index 98%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/NameUtilTest.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/NameUtilTest.java
index 35e08ca..e9e4853 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/NameUtilTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/NameUtilTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import org.apache.isis.metamodel.commons.StringExtensions;
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/PrintLocale.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/PrintLocale.java
similarity index 98%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/PrintLocale.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/PrintLocale.java
index 31c885f..52eaf17 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/PrintLocale.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/PrintLocale.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import java.util.Locale;
 import java.util.MissingResourceException;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtilsTest_enumTitle.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtilsTest_enumTitle.java
similarity index 97%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtilsTest_enumTitle.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtilsTest_enumTitle.java
index b7c68ce..8fb023d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtilsTest_enumTitle.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtilsTest_enumTitle.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NaturalNameTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NaturalNameTest.java
similarity index 98%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NaturalNameTest.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NaturalNameTest.java
index abe4782..cf043d8 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NaturalNameTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NaturalNameTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NaturalizeTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NaturalizeTest.java
similarity index 97%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NaturalizeTest.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NaturalizeTest.java
index 3e8afb6..137b7cb 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NaturalizeTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NaturalizeTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NormalizedTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NormalizedTest.java
similarity index 98%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NormalizedTest.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NormalizedTest.java
index 19aa988..9561ed6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NormalizedTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_NormalizedTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_RemoveLeadingWhiteSpace.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_RemoveLeadingWhiteSpace.java
similarity index 97%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_RemoveLeadingWhiteSpace.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_RemoveLeadingWhiteSpace.java
index bf33f8e..bd0162e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_RemoveLeadingWhiteSpace.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_RemoveLeadingWhiteSpace.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import org.apache.isis.metamodel.commons.StringExtensions;
 import org.hamcrest.CoreMatchers;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_SplitOnCommas.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_SplitOnCommas.java
similarity index 98%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_SplitOnCommas.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_SplitOnCommas.java
index 0479b05..dc5080c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_SplitOnCommas.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_SplitOnCommas.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import java.util.List;
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_StripLeadingSlashTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_StripLeadingSlashTest.java
similarity index 97%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_StripLeadingSlashTest.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_StripLeadingSlashTest.java
index cb49332..8469ec4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_StripLeadingSlashTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_StripLeadingSlashTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_StripNewLinesTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_StripNewLinesTest.java
similarity index 97%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_StripNewLinesTest.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_StripNewLinesTest.java
index 1e24f94..434a819 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_StripNewLinesTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_StripNewLinesTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_camelLowerFirst.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_camelLowerFirst.java
similarity index 97%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_camelLowerFirst.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_camelLowerFirst.java
index 4c2661f..5c0c8ba 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_camelLowerFirst.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_camelLowerFirst.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_toLineSeparated.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_toLineSeparated.java
similarity index 97%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_toLineSeparated.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_toLineSeparated.java
index 96e7dc5..98d08ce 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_toLineSeparated.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_toLineSeparated.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_toLowerDashed.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_toLowerDashed.java
similarity index 96%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_toLowerDashed.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_toLowerDashed.java
index 7190520..16b690a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_toLowerDashed.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/StringUtils_toLowerDashed.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/TypesTest_filteredList.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/TypesTest_filteredList.java
similarity index 98%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/lang/TypesTest_filteredList.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/TypesTest_filteredList.java
index f638ada..44e682d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/TypesTest_filteredList.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/TypesTest_filteredList.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.lang;
+package org.apache.isis.metamodel.commons;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/matchers/IsisMatchers.java
similarity index 97%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/matchers/IsisMatchers.java
index 0c9778b..ce9faf2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/matchers/IsisMatchers.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.matchers;
+package org.apache.isis.metamodel.commons.matchers;
 
 import org.hamcrest.Description;
 import org.hamcrest.Factory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_NonEmptyStringTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/matchers/IsisMatchers_NonEmptyStringTest.java
similarity index 96%
rename from core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_NonEmptyStringTest.java
rename to core/metamodel/src/test/java/org/apache/isis/metamodel/commons/matchers/IsisMatchers_NonEmptyStringTest.java
index 6d1afff..1a5cd70 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/matchers/IsisMatchers_NonEmptyStringTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/matchers/IsisMatchers_NonEmptyStringTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.commons.matchers;
+package org.apache.isis.metamodel.commons.matchers;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
index aaa79bc..94eef50 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Invocation.java
@@ -1,6 +1,6 @@
 package org.apache.isis.metamodel.facets.actions.action;
 
-import static org.apache.isis.core.commons.matchers.IsisMatchers.classEqualTo;
+import static org.apache.isis.metamodel.commons.matchers.IsisMatchers.classEqualTo;
 import static org.junit.Assert.assertThat;
 
 import org.apache.isis.applib.annotation.Action;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java
index a2c5db9..a7e9d7a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java
@@ -1,6 +1,6 @@
 package org.apache.isis.metamodel.facets.actions.action;
 
-import static org.apache.isis.core.commons.matchers.IsisMatchers.classEqualTo;
+import static org.apache.isis.metamodel.commons.matchers.IsisMatchers.classEqualTo;
 import static org.junit.Assert.assertThat;
 
 import java.util.Collection;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
index a4ee0e1..f2971fd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
@@ -60,7 +60,7 @@ import org.apache.isis.metamodel.facets.propcoll.accessor.PropertyOrCollectionAc
 import org.apache.isis.metamodel.spec.ManagedObject;
 import org.apache.isis.metamodel.spec.ObjectSpecification;
 
-import static org.apache.isis.core.commons.matchers.IsisMatchers.classEqualTo;
+import static org.apache.isis.metamodel.commons.matchers.IsisMatchers.classEqualTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactoryTest.java
index 9e01255..758dee6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactoryTest.java
@@ -19,6 +19,9 @@
 package org.apache.isis.metamodel.facets.object.domainservice.annotation;
 
 import org.junit.Assert;
+
+import static org.apache.isis.metamodel.commons.matchers.IsisMatchers.classEqualTo;
+
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.metamodel.facetapi.Facet;
 import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
@@ -27,8 +30,6 @@ import org.apache.isis.metamodel.facets.object.domainservice.DomainServiceFacet;
 import org.apache.isis.metamodel.facets.object.domainservice.annotation.DomainServiceFacetAnnotation;
 import org.apache.isis.metamodel.facets.object.domainservice.annotation.DomainServiceFacetAnnotationFactory;
 
-import static org.apache.isis.core.commons.matchers.IsisMatchers.classEqualTo;
-
 public class DomainServiceFacetAnnotationFactoryTest extends AbstractFacetFactoryTest {
 
     private DomainServiceFacetAnnotationFactory facetFactory;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index 5c8aea0..c4ddd88 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -76,7 +76,7 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.metamodel.specloader.specimpl.IntrospectionState;
 
-import static org.apache.isis.core.commons.matchers.IsisMatchers.classEqualTo;
+import static org.apache.isis.metamodel.commons.matchers.IsisMatchers.classEqualTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index 7f601ef..beec374 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -34,6 +34,7 @@ import org.apache.isis.metamodel.adapter.version.Version;
 import org.apache.isis.metamodel.spec.ObjectSpecId;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
+import org.apache.isis.runtime.persistence.adapterfactory.pojo.RuntimeTestPojo;
 import org.apache.isis.runtime.system.persistence.PersistenceSession5;
 import org.apache.isis.security.authentication.AuthenticationSession;
 import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
diff --git a/core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStore.java b/core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStore.java
index 07887e1..71c8a8b 100644
--- a/core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStore.java
+++ b/core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStore.java
@@ -18,8 +18,6 @@
  */
 package org.apache.isis.applib.services.exceprecog.jdo;
 
-import java.util.Map;
-
 import javax.annotation.PostConstruct;
 
 import org.apache.isis.applib.annotation.DomainService;
@@ -27,7 +25,6 @@ import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
 import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
-import org.apache.isis.commons.internal.base._Strings;
 import org.apache.isis.config.internal._Config;
 
 /**
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java b/core/runtime/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java
index 00e2ca3..906bc74 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.core.runtime.persistence.adapterfactory.pojo;
+package org.apache.isis.runtime.persistence.adapterfactory.pojo;
 
 public class RuntimeTestPojo {
     private static int nextId;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/Interface1.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/Interface1.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/Interface1.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/system/Interface1.java
index 4b31145..3e51c47 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/Interface1.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/Interface1.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.runtime.system;
 
 public interface Interface1 {
 
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaActionTestObject.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaActionTestObject.java
similarity index 97%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaActionTestObject.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/system/JavaActionTestObject.java
index 7080ee8..7dc4aa9 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaActionTestObject.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaActionTestObject.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.runtime.system;
 
 public class JavaActionTestObject {
     private boolean actionCalled = false;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithBasicProgramConventions.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaObjectWithBasicProgramConventions.java
similarity index 99%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithBasicProgramConventions.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/system/JavaObjectWithBasicProgramConventions.java
index c402059..f87e8d1 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithBasicProgramConventions.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaObjectWithBasicProgramConventions.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.runtime.system;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithOneToOneAssociations.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaObjectWithOneToOneAssociations.java
similarity index 97%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithOneToOneAssociations.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/system/JavaObjectWithOneToOneAssociations.java
index c47e15d..480708c 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithOneToOneAssociations.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaObjectWithOneToOneAssociations.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.runtime.system;
 
 public class JavaObjectWithOneToOneAssociations {
     boolean available = false;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaReferencedObject.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaReferencedObject.java
similarity index 96%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaReferencedObject.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/system/JavaReferencedObject.java
index 696458f..2f06185 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaReferencedObject.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaReferencedObject.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.runtime.system;
 
 public class JavaReferencedObject {
     private static int next;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/MethodFinderUtilsTest.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/MethodFinderUtilsTest.java
similarity index 98%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/MethodFinderUtilsTest.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/system/MethodFinderUtilsTest.java
index c8e3449..24b1673 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/MethodFinderUtilsTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/MethodFinderUtilsTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.runtime.system;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
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/runtime/system/ObjectActionLayoutXmlDefaultTest.java
similarity index 98%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java
index 8c0302e..9fc48f7 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.runtime.system;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
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/runtime/system/OneToManyAssociationDefaultTest.java
similarity index 99%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java
index 42aaaa3..1f2b6e0 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.runtime.system;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/RuntimeTestPojo.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/RuntimeTestPojo.java
similarity index 97%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/RuntimeTestPojo.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/system/RuntimeTestPojo.java
index e542b1d..50d5cda 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/RuntimeTestPojo.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/RuntimeTestPojo.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.runtime.system;
 
 public class RuntimeTestPojo {
     private static int nextId;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestDomainObject.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/TestDomainObject.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestDomainObject.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/system/TestDomainObject.java
index 6ac2004..59a3f54 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestDomainObject.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/TestDomainObject.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.runtime.system;
 
 public class TestDomainObject {
 
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObject.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObject.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObject.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/system/TestObject.java
index 9d20f20..ad75c93 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObject.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObject.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.runtime.system;
 
 public class TestObject {
 }
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsAggregated.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectAsAggregated.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsAggregated.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectAsAggregated.java
index 05896f7..e211d13 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsAggregated.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectAsAggregated.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.runtime.system;
 
 // import org.apache.isis.applib.Aggregated;
 
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsService.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectAsService.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsService.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectAsService.java
index 05d0667..17e7b67 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsService.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectAsService.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.runtime.system;
 
 public class TestObjectAsService {
 
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectWithCollection.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectWithCollection.java
similarity index 98%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectWithCollection.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectWithCollection.java
index 004bd95..de5af67 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectWithCollection.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectWithCollection.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.runtime.system;
 
 import java.util.Vector;
 
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodReturnTest.java
similarity index 94%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodReturnTest.java
index 3533e09..4ef44ef 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodReturnTest.java
@@ -17,9 +17,9 @@
  *  under the License.
  */
 
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.runtime.system;
 
-import static org.apache.isis.core.runtime.system.TypeExtractorMethodsParametersTest.containsElementThat;
+import static org.apache.isis.runtime.system.TypeExtractorMethodsParametersTest.containsElementThat;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java b/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodsParametersTest.java
similarity index 98%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodsParametersTest.java
index ee4b983..7866a29 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodsParametersTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.core.runtime.system;
+package org.apache.isis.runtime.system;
 
 import java.lang.reflect.Method;
 import java.util.List;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java b/core/runtime/src/test/java/org/apache/isis/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java
similarity index 92%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java
index 34e14d8..24e2c6b 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.core.runtime.systemusinginstallers.fixture.budget;
+package org.apache.isis.runtime.systemusinginstallers.fixture.budget;
 
 public class SomeServiceToInclude {
 }
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java b/core/runtime/src/test/java/org/apache/isis/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java
similarity index 91%
rename from core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java
rename to core/runtime/src/test/java/org/apache/isis/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java
index c17e740..7fec8ee 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java
+++ b/core/runtime/src/test/java/org/apache/isis/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.core.runtime.systemusinginstallers.fixture.budgetassignment;
+package org.apache.isis.runtime.systemusinginstallers.fixture.budgetassignment;
 
 public class SomeServiceNotToInclude {
 }
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticatorTest.java b/core/security/src/test/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticatorTest.java
similarity index 100%
rename from core/metamodel/src/test/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticatorTest.java
rename to core/security/src/test/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticatorTest.java
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/encoding/EncodabilityContractTest.java b/core/security/src/test/java/org/apache/isis/metamodel/commons/encoding/EncodabilityContractTest.java
similarity index 95%
rename from core/metamodel/src/test/java/org/apache/isis/metamodel/commons/encoding/EncodabilityContractTest.java
rename to core/security/src/test/java/org/apache/isis/metamodel/commons/encoding/EncodabilityContractTest.java
index 75a9f4f..683deff 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/commons/encoding/EncodabilityContractTest.java
+++ b/core/security/src/test/java/org/apache/isis/metamodel/commons/encoding/EncodabilityContractTest.java
@@ -33,9 +33,9 @@ import org.jmock.integration.junit4.JUnit4Mockery;
 import org.junit.Before;
 import org.junit.Test;
 import org.apache.isis.commons.internal.encoding.DataInputExtended;
+import org.apache.isis.commons.internal.encoding.DataInputStreamExtended;
+import org.apache.isis.commons.internal.encoding.DataOutputStreamExtended;
 import org.apache.isis.commons.internal.encoding.Encodable;
-import org.apache.isis.metamodel.commons.encoding.DataInputStreamExtended;
-import org.apache.isis.metamodel.commons.encoding.DataOutputStreamExtended;
 import org.apache.isis.security.authentication.AuthenticationSession;
 
 public abstract class EncodabilityContractTest {
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/AuthenticatorDefaultTest.java b/core/security/src/test/java/org/apache/isis/runtime/authentication/standard/AuthenticatorDefaultTest.java
similarity index 100%
rename from core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/AuthenticatorDefaultTest.java
rename to core/security/src/test/java/org/apache/isis/runtime/authentication/standard/AuthenticatorDefaultTest.java
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java b/core/security/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
similarity index 100%
rename from core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
rename to core/security/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityTestAbstract.java b/core/security/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
similarity index 100%
rename from core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
rename to core/security/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java b/core/security/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
similarity index 100%
rename from core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
rename to core/security/src/test/java/org/apache/isis/runtime/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java b/core/security/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
similarity index 100%
rename from core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
rename to core/security/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java b/core/security/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
similarity index 100%
rename from core/runtime/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
rename to core/security/src/test/java/org/apache/isis/runtime/authentication/standard/StandardAuthenticationManager_AuthenticatorsTest.java
diff --git a/core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java b/core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java
index e21da91..c26bb6a 100644
--- a/core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java
+++ b/core/viewer-wicket-model/src/test/java/org/apache/isis/viewer/wicket/model/models/LowestCommonSuperclassClosureTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertThat;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.isis.core.commons.matchers.IsisMatchers;
+import org.apache.isis.metamodel.commons.matchers.IsisMatchers;
 import org.junit.Test;
 
 public class LowestCommonSuperclassClosureTest {