You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/11/28 16:40:49 UTC

[isis] 01/06: ISIS-2186: changes package org.incode.module.base -> org.apache.isis.extensions.base

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

danhaywood pushed a commit to branch ISIS-2186
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 3f0ae410089c2f6cce20687de22ab21116e7a441
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Nov 28 12:10:59 2019 +0000

    ISIS-2186: changes package org.incode.module.base -> org.apache.isis.extensions.base
---
 .../base/dom/ApplicationExceptionExt.java          | 25 ++++++++++++++++++++++
 .../isis/extensions}/base/dom/Chained.java         |  6 +++---
 .../isis/extensions}/base/dom/Dflt.java            |  2 +-
 .../isis/extensions}/base/dom/PowerType.java       |  2 +-
 .../isis/extensions}/base/dom/Titled.java          |  2 +-
 .../isis/extensions}/base/dom/TitledEnum.java      |  4 ++--
 .../base/dom/types/DescriptionType.java            |  2 +-
 .../isis/extensions}/base/dom/types/FqcnType.java  |  2 +-
 .../isis/extensions}/base/dom/types/MoneyType.java |  2 +-
 .../isis/extensions}/base/dom/types/NameType.java  |  2 +-
 .../isis/extensions}/base/dom/types/NotesType.java |  2 +-
 .../base/dom/types/ObjectIdentifierType.java       |  2 +-
 .../extensions}/base/dom/types/PercentageType.java |  2 +-
 .../extensions}/base/dom/types/ProperNameType.java |  2 +-
 .../extensions}/base/dom/types/ReferenceType.java  |  2 +-
 .../isis/extensions}/base/dom/types/TitleType.java |  2 +-
 .../base/dom/types/UrlTemplateType.java            |  2 +-
 .../extensions}/base/dom/types/UserNameType.java   |  2 +-
 .../isis/extensions}/base/dom/types/XxxType.java   |  2 +-
 .../extensions}/base/dom/utils/ClassUtils.java     |  2 +-
 .../base/dom/utils/JodaPeriodUtils.java            |  2 +-
 .../isis/extensions}/base/dom/utils/MathUtils.java |  2 +-
 .../extensions}/base/dom/utils/MessageUtils.java   |  2 +-
 .../extensions}/base/dom/utils/StringUtils.java    |  2 +-
 .../extensions}/base/dom/utils/TitleBuilder.java   |  2 +-
 .../base/dom/valuetypes/AbstractInterval.java      |  2 +-
 .../base/dom/valuetypes/LocalDateInterval.java     |  2 +-
 .../base/dom/with/WithCodeComparable.java          |  2 +-
 .../extensions}/base/dom/with/WithCodeGetter.java  |  2 +-
 .../extensions}/base/dom/with/WithCodeUnique.java  |  2 +-
 .../base/dom/with/WithDescriptionComparable.java   |  2 +-
 .../base/dom/with/WithDescriptionGetter.java       |  2 +-
 .../base/dom/with/WithDescriptionUnique.java       |  2 +-
 .../extensions}/base/dom/with/WithInterval.java    |  4 ++--
 .../base/dom/with/WithIntervalContiguous.java      |  4 ++--
 .../base/dom/with/WithIntervalMutable.java         |  4 ++--
 .../base/dom/with/WithNameComparable.java          |  2 +-
 .../extensions}/base/dom/with/WithNameGetter.java  |  2 +-
 .../extensions}/base/dom/with/WithNameUnique.java  |  2 +-
 .../base/dom/with/WithReferenceComparable.java     |  2 +-
 .../base/dom/with/WithReferenceGetter.java         |  2 +-
 .../base/dom/with/WithReferenceUnique.java         |  2 +-
 .../extensions}/base/dom/with/WithSequence.java    |  2 +-
 .../extensions}/base/dom/with/WithStartDate.java   |  2 +-
 .../base/dom/with/WithTitleComparable.java         |  2 +-
 .../extensions}/base/dom/with/WithTitleGetter.java |  2 +-
 .../extensions}/base/dom/with/WithTitleUnique.java |  2 +-
 .../isis/extensions}/base/integtests/VT.java       |  6 +++---
 .../base/services/BaseServicesModule.java          |  9 ++++++++
 .../base/services/calendar/CalendarService.java    |  2 +-
 .../base/dom/IncodeApplicationException.java       | 25 ----------------------
 .../module/base/services/BaseServicesModule.java   |  4 ----
 .../isis/extensions}/base/IsisMatchers.java        |  2 +-
 .../base/dom/ApplicationExceptionExtTest.java      | 15 +++++++++++++
 .../base/dom/testing/PrivateConstructorTester.java |  2 +-
 .../TitledEnumContractTestAbstract_title.java      |  6 +++---
 .../base/dom/titled/TitledEnumContractTester.java  |  4 ++--
 .../extensions}/base/dom/utils/ClassUtilsTest.java |  4 ++--
 .../base/dom/utils/JodaPeriodUtilsTest.java        |  2 +-
 .../extensions}/base/dom/utils/MathUtilsTest.java  |  3 ++-
 .../base/dom/utils/MessageUtils_Test.java          |  4 ++--
 .../base/dom/utils/StringUtilsTest.java            |  5 +++--
 .../base/dom/utils/TitleBuilderTest.java           |  6 +++---
 .../base/dom/valuetypes/LocalDateIntervalTest.java |  4 ++--
 ...arableByCodeContractTestAbstract_compareTo.java |  4 ++--
 .../dom/with/ComparableByCodeContractTester.java   |  3 ++-
 ...yDescriptionContractTestAbstract_compareTo.java |  4 ++--
 .../ComparableByDescriptionContractTester.java     |  3 ++-
 ...arableByNameContractTestAbstract_compareTo.java |  4 ++--
 .../dom/with/ComparableByNameContractTester.java   |  4 ++--
 ...eByReferenceContractTestAbstract_compareTo.java |  4 ++--
 .../with/ComparableByReferenceContractTester.java  |  4 ++--
 ...rableByTitleContractTestAbstract_compareTo.java |  4 ++--
 .../dom/with/ComparableByTitleContractTester.java  |  4 ++--
 .../dom/with/InstantiatorForComparableByCode.java  |  3 ++-
 .../InstantiatorForComparableByDescription.java    |  3 ++-
 .../dom/with/InstantiatorForComparableByName.java  |  3 ++-
 .../with/InstantiatorForComparableByReference.java |  3 ++-
 .../dom/with/InstantiatorForWithStartDate.java     |  3 ++-
 ...lperClassesContractTest_privateConstructor.java |  5 +++--
 .../WithFieldUniqueContractTestAllAbstract.java    |  2 +-
 ...valMutableContractTestAbstract_changeDates.java |  3 ++-
 .../CalendarServiceTest_beginningOfMonth.java      |  4 ++--
 .../CalendarServiceTest_beginningOfQuarter.java    |  4 ++--
 .../TitledEnumContractTestAbstract_title.java      |  6 +++---
 .../dom/titled/TitledEnumContractTester.java       |  6 +++---
 ...arableByCodeContractTestAbstract_compareTo.java |  6 +++---
 .../dom/with/ComparableByCodeContractTester.java   |  6 +++---
 ...yDescriptionContractTestAbstract_compareTo.java |  6 +++---
 .../ComparableByDescriptionContractTester.java     |  6 +++---
 ...arableByNameContractTestAbstract_compareTo.java |  6 +++---
 .../dom/with/ComparableByNameContractTester.java   |  6 +++---
 ...eByReferenceContractTestAbstract_compareTo.java |  6 +++---
 .../with/ComparableByReferenceContractTester.java  |  6 +++---
 ...rableByTitleContractTestAbstract_compareTo.java |  6 +++---
 .../dom/with/ComparableByTitleContractTester.java  |  6 +++---
 .../dom/with/InstantiatorForComparableByCode.java  |  6 +++---
 .../InstantiatorForComparableByDescription.java    |  6 +++---
 .../dom/with/InstantiatorForComparableByName.java  | 16 ++++++++++++++
 .../with/InstantiatorForComparableByReference.java |  6 +++---
 .../dom/with/InstantiatorForWithStartDate.java     | 16 ++++++++++++++
 .../WithFieldUniqueContractTestAllAbstract.java    |  4 ++--
 ...valMutableContractTestAbstract_changeDates.java | 13 +++++++++++
 .../base/dom/IncodeApplicationExceptionTest.java   | 17 ---------------
 .../dom/with/InstantiatorForComparableByName.java  | 16 --------------
 .../dom/with/InstantiatorForWithStartDate.java     | 16 --------------
 ...valMutableContractTestAbstract_changeDates.java | 13 -----------
 107 files changed, 259 insertions(+), 245 deletions(-)

diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/ApplicationExceptionExt.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/ApplicationExceptionExt.java
new file mode 100644
index 0000000..3f1e09c
--- /dev/null
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/ApplicationExceptionExt.java
@@ -0,0 +1,25 @@
+package org.apache.isis.extensions.base.dom;
+
+import org.apache.isis.applib.ApplicationException;
+
+/**
+ * An unexpected application exception; will render as a stack trace to the end-user. 
+ */
+public class ApplicationExceptionExt extends ApplicationException {
+
+    private static final long serialVersionUID = 1L;
+
+    public ApplicationExceptionExt(final String msg, final Throwable cause) {
+        super(msg, cause);
+    }
+
+    public ApplicationExceptionExt(final String msg) {
+        super(msg);
+    }
+
+    public ApplicationExceptionExt(final Throwable cause) {
+        super(cause);
+    }
+
+    
+}
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/Chained.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Chained.java
similarity index 86%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/Chained.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Chained.java
index c26c183..9946473 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/Chained.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Chained.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom;
+package org.apache.isis.extensions.base.dom;
 
 import org.apache.isis.applib.annotation.Editing;
 
@@ -6,8 +6,8 @@ import org.apache.isis.applib.annotation.Optionality;
 import org.apache.isis.applib.annotation.Property;
 import org.apache.isis.applib.annotation.Where;
 
-import org.incode.module.base.dom.with.WithInterval;
-import org.incode.module.base.dom.with.WithIntervalContiguous;
+import org.apache.isis.extensions.base.dom.with.WithInterval;
+import org.apache.isis.extensions.base.dom.with.WithIntervalContiguous;
 
 public interface Chained<T extends Chained<T>> {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/Dflt.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Dflt.java
similarity index 89%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/Dflt.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Dflt.java
index a84ccb8..4b00b2a 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/Dflt.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Dflt.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom;
+package org.apache.isis.extensions.base.dom;
 
 import java.util.Collection;
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/PowerType.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/PowerType.java
similarity index 86%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/PowerType.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/PowerType.java
index 7000921..ae5d42c 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/PowerType.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/PowerType.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom;
+package org.apache.isis.extensions.base.dom;
 
 import org.apache.isis.applib.services.factory.FactoryService;
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/Titled.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Titled.java
similarity index 55%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/Titled.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Titled.java
index 0565f02..30ce763 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/Titled.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Titled.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom;
+package org.apache.isis.extensions.base.dom;
 
 public interface Titled {
     
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/TitledEnum.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/TitledEnum.java
similarity index 67%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/TitledEnum.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/TitledEnum.java
index 4cf0666..346f4c6 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/TitledEnum.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/TitledEnum.java
@@ -1,6 +1,6 @@
-package org.incode.module.base.dom;
+package org.apache.isis.extensions.base.dom;
 
-import org.incode.module.base.dom.utils.StringUtils;
+import org.apache.isis.extensions.base.dom.utils.StringUtils;
 
 /**
  * An enum that implements {@link Titled} and moreover its {@link #title()}
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/DescriptionType.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/DescriptionType.java
similarity index 81%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/DescriptionType.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/DescriptionType.java
index f1fc374..b1a955f 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/DescriptionType.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/DescriptionType.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.types;
+package org.apache.isis.extensions.base.dom.types;
 
 public class DescriptionType {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/FqcnType.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/FqcnType.java
similarity index 76%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/FqcnType.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/FqcnType.java
index ffddb14..f126318 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/FqcnType.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/FqcnType.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.types;
+package org.apache.isis.extensions.base.dom.types;
 
 public class FqcnType {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/MoneyType.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/MoneyType.java
similarity index 76%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/MoneyType.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/MoneyType.java
index 7a41329..ef27f52 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/MoneyType.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/MoneyType.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.types;
+package org.apache.isis.extensions.base.dom.types;
 
 public class MoneyType {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/NameType.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NameType.java
similarity index 76%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/NameType.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NameType.java
index fbd17e3..9acfe26 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/NameType.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NameType.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.types;
+package org.apache.isis.extensions.base.dom.types;
 
 public class NameType {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/NotesType.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NotesType.java
similarity index 77%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/NotesType.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NotesType.java
index 77810b5..9fe41ae 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/NotesType.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NotesType.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.types;
+package org.apache.isis.extensions.base.dom.types;
 
 public class NotesType {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/ObjectIdentifierType.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ObjectIdentifierType.java
similarity index 79%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/ObjectIdentifierType.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ObjectIdentifierType.java
index 5708a99..9f2fbbe 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/ObjectIdentifierType.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ObjectIdentifierType.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.types;
+package org.apache.isis.extensions.base.dom.types;
 
 public class ObjectIdentifierType {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/PercentageType.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/PercentageType.java
similarity index 77%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/PercentageType.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/PercentageType.java
index ceb0edc..f8cbbb1 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/PercentageType.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/PercentageType.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.types;
+package org.apache.isis.extensions.base.dom.types;
 
 public class PercentageType {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/ProperNameType.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ProperNameType.java
similarity index 77%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/ProperNameType.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ProperNameType.java
index 17a98bb..acef836 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/ProperNameType.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ProperNameType.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.types;
+package org.apache.isis.extensions.base.dom.types;
 
 public class ProperNameType {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/ReferenceType.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ReferenceType.java
similarity index 88%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/ReferenceType.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ReferenceType.java
index bdb4c65..376c4e7 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/ReferenceType.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ReferenceType.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.types;
+package org.apache.isis.extensions.base.dom.types;
 
 public class ReferenceType {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/TitleType.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/TitleType.java
similarity index 76%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/TitleType.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/TitleType.java
index 7f05f3b..c75e6dc 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/TitleType.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/TitleType.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.types;
+package org.apache.isis.extensions.base.dom.types;
 
 public class TitleType {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/UrlTemplateType.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UrlTemplateType.java
similarity index 78%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/UrlTemplateType.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UrlTemplateType.java
index 0add54f..6159d6e 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/UrlTemplateType.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UrlTemplateType.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.types;
+package org.apache.isis.extensions.base.dom.types;
 
 public class UrlTemplateType {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/UserNameType.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UserNameType.java
similarity index 77%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/UserNameType.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UserNameType.java
index e87e7d1..1c96e75 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/UserNameType.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UserNameType.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.types;
+package org.apache.isis.extensions.base.dom.types;
 
 public class UserNameType {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/XxxType.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/XxxType.java
similarity index 70%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/XxxType.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/XxxType.java
index ec4e3c4..8f3a8f5 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/types/XxxType.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/XxxType.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.types;
+package org.apache.isis.extensions.base.dom.types;
 
 public class XxxType {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/utils/ClassUtils.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/ClassUtils.java
similarity index 92%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/utils/ClassUtils.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/ClassUtils.java
index 92a5d61..eb7c7b1 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/utils/ClassUtils.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/ClassUtils.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.utils;
+package org.apache.isis.extensions.base.dom.utils;
 
 public final class ClassUtils {
     
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/utils/JodaPeriodUtils.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtils.java
similarity index 97%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/utils/JodaPeriodUtils.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtils.java
index c6fa168..9ccea0b 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/utils/JodaPeriodUtils.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtils.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.utils;
+package org.apache.isis.extensions.base.dom.utils;
 
 import org.joda.time.Period;
 import org.joda.time.format.PeriodFormatter;
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/utils/MathUtils.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MathUtils.java
similarity index 97%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/utils/MathUtils.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MathUtils.java
index 020dda3..d83244e 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/utils/MathUtils.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MathUtils.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.utils;
+package org.apache.isis.extensions.base.dom.utils;
 
 import java.math.BigDecimal;
 import java.math.MathContext;
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/utils/MessageUtils.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MessageUtils.java
similarity index 92%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/utils/MessageUtils.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MessageUtils.java
index 4f6a7e0..5c7a08b 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/utils/MessageUtils.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MessageUtils.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.utils;
+package org.apache.isis.extensions.base.dom.utils;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/utils/StringUtils.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/StringUtils.java
similarity index 97%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/utils/StringUtils.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/StringUtils.java
index 89f1cc1..30fd67c 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/utils/StringUtils.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/StringUtils.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.utils;
+package org.apache.isis.extensions.base.dom.utils;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/utils/TitleBuilder.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/TitleBuilder.java
similarity index 98%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/utils/TitleBuilder.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/TitleBuilder.java
index 0751728..fe51335 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/utils/TitleBuilder.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/TitleBuilder.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.utils;
+package org.apache.isis.extensions.base.dom.utils;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/valuetypes/AbstractInterval.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/AbstractInterval.java
similarity index 99%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/valuetypes/AbstractInterval.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/AbstractInterval.java
index c996320..9299599 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/valuetypes/AbstractInterval.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/AbstractInterval.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.valuetypes;
+package org.apache.isis.extensions.base.dom.valuetypes;
 
 import org.joda.time.Interval;
 import org.joda.time.LocalDate;
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/valuetypes/LocalDateInterval.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateInterval.java
similarity index 98%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/valuetypes/LocalDateInterval.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateInterval.java
index 2679d29..4cb67a8 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/valuetypes/LocalDateInterval.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateInterval.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.valuetypes;
+package org.apache.isis.extensions.base.dom.valuetypes;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithCodeComparable.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeComparable.java
similarity index 73%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithCodeComparable.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeComparable.java
index fe15d4e..fd28f90 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithCodeComparable.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeComparable.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithCodeGetter.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeGetter.java
similarity index 94%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithCodeGetter.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeGetter.java
index 4093edf..57899e0 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithCodeGetter.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeGetter.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import org.apache.isis.applib.util.ObjectContracts.ToStringEvaluator;
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithCodeUnique.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeUnique.java
similarity index 54%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithCodeUnique.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeUnique.java
index 7e0ac93..4830733 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithCodeUnique.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeUnique.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 public interface WithCodeUnique extends WithCodeGetter {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithDescriptionComparable.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionComparable.java
similarity index 78%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithDescriptionComparable.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionComparable.java
index b5d475f..d6c79c3 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithDescriptionComparable.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionComparable.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithDescriptionGetter.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionGetter.java
similarity index 94%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithDescriptionGetter.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionGetter.java
index c0560c9..e12629d 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithDescriptionGetter.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionGetter.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import org.apache.isis.applib.util.ObjectContracts.ToStringEvaluator;
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithDescriptionUnique.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionUnique.java
similarity index 60%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithDescriptionUnique.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionUnique.java
index 79d3a2f..57e2708 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithDescriptionUnique.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionUnique.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 public interface WithDescriptionUnique extends WithDescriptionGetter {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithInterval.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java
similarity index 97%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithInterval.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java
index 8d22748..2a2c58d 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithInterval.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import java.util.Iterator;
 import java.util.SortedSet;
@@ -9,7 +9,7 @@ import com.google.common.collect.Iterables;
 import org.apache.isis.applib.annotation.*;
 import org.joda.time.LocalDate;
 
-import org.incode.module.base.dom.valuetypes.LocalDateInterval;
+import org.apache.isis.extensions.base.dom.valuetypes.LocalDateInterval;
 
 public interface WithInterval<T extends WithInterval<T>> extends WithStartDate {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithIntervalContiguous.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java
similarity index 98%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithIntervalContiguous.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java
index 84dc3d8..83aedd1 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithIntervalContiguous.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import java.util.SortedSet;
 
@@ -9,7 +9,7 @@ import com.google.common.collect.Sets;
 import org.apache.isis.applib.annotation.*;
 import org.joda.time.LocalDate;
 
-import org.incode.module.base.dom.Chained;
+import org.apache.isis.extensions.base.dom.Chained;
 
 public interface WithIntervalContiguous<T extends WithIntervalContiguous<T>> 
         extends WithIntervalMutable<T>, Comparable<T> {
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithIntervalMutable.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java
similarity index 94%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithIntervalMutable.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java
index ba70ad0..edd661a 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithIntervalMutable.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import org.joda.time.LocalDate;
 
@@ -7,7 +7,7 @@ import org.apache.isis.applib.annotation.Optionality;
 import org.apache.isis.applib.annotation.Parameter;
 import org.apache.isis.applib.annotation.SemanticsOf;
 
-import org.incode.module.base.dom.valuetypes.LocalDateInterval;
+import org.apache.isis.extensions.base.dom.valuetypes.LocalDateInterval;
 
 public interface WithIntervalMutable<T extends WithIntervalMutable<T>> extends WithInterval<T> {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithNameComparable.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameComparable.java
similarity index 74%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithNameComparable.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameComparable.java
index 854768a..d62fe47 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithNameComparable.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameComparable.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithNameGetter.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameGetter.java
similarity index 94%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithNameGetter.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameGetter.java
index 0f19899..7d3ddaa 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithNameGetter.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameGetter.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import org.apache.isis.applib.util.ObjectContracts;
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithNameUnique.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameUnique.java
similarity index 54%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithNameUnique.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameUnique.java
index eaa595b..9238e91 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithNameUnique.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameUnique.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 public interface WithNameUnique extends WithNameGetter {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithReferenceComparable.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceComparable.java
similarity index 77%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithReferenceComparable.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceComparable.java
index 8c64e07..7ce040f 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithReferenceComparable.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceComparable.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithReferenceGetter.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceGetter.java
similarity index 94%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithReferenceGetter.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceGetter.java
index 0bfe1d6..1b430aa 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithReferenceGetter.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceGetter.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import org.apache.isis.applib.util.ObjectContracts.ToStringEvaluator;
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithReferenceUnique.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceUnique.java
similarity index 58%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithReferenceUnique.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceUnique.java
index b85b6db..d2ec7a4 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithReferenceUnique.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceUnique.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 public interface WithReferenceUnique extends WithReferenceGetter {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithSequence.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithSequence.java
similarity index 75%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithSequence.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithSequence.java
index 45d4986..b1007e2 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithSequence.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithSequence.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import java.math.BigInteger;
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithStartDate.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java
similarity index 85%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithStartDate.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java
index 81f2fd9..cd106ab 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithStartDate.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import org.apache.isis.applib.annotation.Editing;
 import org.apache.isis.applib.annotation.Property;
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithTitleComparable.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleComparable.java
similarity index 74%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithTitleComparable.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleComparable.java
index 9a0862d..a5f2feb 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithTitleComparable.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleComparable.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithTitleGetter.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleGetter.java
similarity index 94%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithTitleGetter.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleGetter.java
index c7a47f8..fbc8aa1 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithTitleGetter.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleGetter.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import org.apache.isis.applib.util.ObjectContracts.ToStringEvaluator;
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithTitleUnique.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleUnique.java
similarity index 55%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithTitleUnique.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleUnique.java
index e38be2f..115239c 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/with/WithTitleUnique.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleUnique.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 public interface WithTitleUnique extends WithTitleGetter {
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/integtests/VT.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/integtests/VT.java
similarity index 95%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/integtests/VT.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/integtests/VT.java
index c490f43..9a7a174 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/integtests/VT.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/integtests/VT.java
@@ -1,10 +1,10 @@
-package org.incode.module.base.integtests;
+package org.apache.isis.extensions.base.integtests;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.RoundingMode;
-import org.incode.module.base.dom.valuetypes.AbstractInterval;
-import org.incode.module.base.dom.valuetypes.LocalDateInterval;
+import org.apache.isis.extensions.base.dom.valuetypes.AbstractInterval;
+import org.apache.isis.extensions.base.dom.valuetypes.LocalDateInterval;
 import org.joda.time.LocalDate;
 
 /**
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/services/BaseServicesModule.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/services/BaseServicesModule.java
new file mode 100644
index 0000000..4c66230
--- /dev/null
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/services/BaseServicesModule.java
@@ -0,0 +1,9 @@
+package org.apache.isis.extensions.base.services;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan
+public class BaseServicesModule {
+}
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/services/calendar/CalendarService.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/services/calendar/CalendarService.java
similarity index 97%
rename from extensions/lib/base/impl/src/main/java/org/incode/module/base/services/calendar/CalendarService.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/services/calendar/CalendarService.java
index 3cff4d3..efa8514 100644
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/services/calendar/CalendarService.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/services/calendar/CalendarService.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.services.calendar;
+package org.apache.isis.extensions.base.services.calendar;
 
 import javax.inject.Inject;
 
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/IncodeApplicationException.java b/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/IncodeApplicationException.java
deleted file mode 100644
index 89ce00a..0000000
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/dom/IncodeApplicationException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.incode.module.base.dom;
-
-import org.apache.isis.applib.ApplicationException;
-
-/**
- * An unexpected application exception; will render as a stack trace to the end-user. 
- */
-public class IncodeApplicationException extends ApplicationException {
-
-    private static final long serialVersionUID = 1L;
-
-    public IncodeApplicationException(final String msg, final Throwable cause) {
-        super(msg, cause);
-    }
-
-    public IncodeApplicationException(final String msg) {
-        super(msg);
-    }
-
-    public IncodeApplicationException(final Throwable cause) {
-        super(cause);
-    }
-
-    
-}
diff --git a/extensions/lib/base/impl/src/main/java/org/incode/module/base/services/BaseServicesModule.java b/extensions/lib/base/impl/src/main/java/org/incode/module/base/services/BaseServicesModule.java
deleted file mode 100644
index a77f27c..0000000
--- a/extensions/lib/base/impl/src/main/java/org/incode/module/base/services/BaseServicesModule.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.incode.module.base.services;
-
-public class BaseServicesModule {
-}
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/IsisMatchers.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/IsisMatchers.java
similarity index 99%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/IsisMatchers.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/IsisMatchers.java
index 2eb1bfe..e98779a 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/IsisMatchers.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/IsisMatchers.java
@@ -1,4 +1,4 @@
-package org.incode.module.base;
+package org.apache.isis.extensions.base;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/ApplicationExceptionExtTest.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/ApplicationExceptionExtTest.java
new file mode 100644
index 0000000..ce269bd
--- /dev/null
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/ApplicationExceptionExtTest.java
@@ -0,0 +1,15 @@
+package org.apache.isis.extensions.base.dom;
+
+import org.junit.Test;
+
+public class ApplicationExceptionExtTest {
+
+    private Class<? extends Exception> cls;
+
+
+    @Test
+    public void testName() throws Exception {
+        final ApplicationExceptionExt ex = new ApplicationExceptionExt("dummy");
+
+    }
+}
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/testing/PrivateConstructorTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/testing/PrivateConstructorTester.java
similarity index 87%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/testing/PrivateConstructorTester.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/testing/PrivateConstructorTester.java
index 7b733e1..bb313c9 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/testing/PrivateConstructorTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/testing/PrivateConstructorTester.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.testing;
+package org.apache.isis.extensions.base.dom.testing;
 
 import java.lang.reflect.Constructor;
 
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/titled/TitledEnumContractTestAbstract_title.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java
similarity index 81%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/titled/TitledEnumContractTestAbstract_title.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java
index cbc0c6e..5e1da29 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/titled/TitledEnumContractTestAbstract_title.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java
@@ -1,12 +1,12 @@
-package org.incode.module.base.dom.titled;
+package org.apache.isis.extensions.base.dom.titled;
 
 import java.util.Set;
 
 import org.junit.Test;
 import org.reflections.Reflections;
 
-import org.incode.module.base.dom.TitledEnum;
-import org.incode.module.unittestsupport.dom.titled.TitledEnumContractTester;
+import org.apache.isis.extensions.base.dom.TitledEnum;
+import org.apache.isis.extensions.base.unittestsupport.dom.titled.TitledEnumContractTester;
 
 public abstract class TitledEnumContractTestAbstract_title {
     protected final String prefix;
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/titled/TitledEnumContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java
similarity index 89%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/titled/TitledEnumContractTester.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java
index f4e0d8c..11a2dbb 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/titled/TitledEnumContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java
@@ -1,10 +1,10 @@
-package org.incode.module.base.dom.titled;
+package org.apache.isis.extensions.base.dom.titled;
 
 import org.hamcrest.CoreMatchers;
 
 import org.apache.isis.applib.util.Enums;
 
-import org.incode.module.base.dom.TitledEnum;
+import org.apache.isis.extensions.base.dom.TitledEnum;
 
 import static org.junit.Assert.assertThat;
 
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/utils/ClassUtilsTest.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java
similarity index 87%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/utils/ClassUtilsTest.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java
index 15bbffd..d1a185c 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/utils/ClassUtilsTest.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.utils;
+package org.apache.isis.extensions.base.dom.utils;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -46,7 +46,7 @@ public class ClassUtilsTest {
         @Test
         public void existsAndIsNotASubclass() throws Exception {
             thrown.expect(IllegalArgumentException.class);
-            thrown.expectMessage("Class 'org.incode.module.base.dom.utils.ClassUtilsTest$Load$SomeOtherClass' not a subclass of org.incode.module.base.dom.utils.ClassUtilsTest$Load$SomeClass");
+            thrown.expectMessage("Class 'org.apache.isis.extensions.base.dom.utils.ClassUtilsTest$Load$SomeOtherClass' not a subclass of org.apache.isis.extensions.base.dom.utils.ClassUtilsTest$Load$SomeClass");
             final Class<? extends SomeClass> cls = ClassUtils.load(SomeOtherClass.class.getName(), SomeClass.class);
             assertThat(cls, is(not(nullValue())));
         }
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/utils/JodaPeriodUtilsTest.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtilsTest.java
similarity index 97%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/utils/JodaPeriodUtilsTest.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtilsTest.java
index 470456d..0a43f4c 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/utils/JodaPeriodUtilsTest.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtilsTest.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.utils;
+package org.apache.isis.extensions.base.dom.utils;
 
 import org.hamcrest.core.Is;
 import org.joda.time.LocalDate;
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/utils/MathUtilsTest.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MathUtilsTest.java
similarity index 97%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/utils/MathUtilsTest.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MathUtilsTest.java
index 4063e26..9753e3d 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/utils/MathUtilsTest.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MathUtilsTest.java
@@ -1,6 +1,7 @@
-package org.incode.module.base.dom.utils;
+package org.apache.isis.extensions.base.dom.utils;
 
 import java.math.BigDecimal;
+
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/utils/MessageUtils_Test.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java
similarity index 94%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/utils/MessageUtils_Test.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java
index 02a0ebd..28fe8c1 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/utils/MessageUtils_Test.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java
@@ -1,9 +1,9 @@
-package org.incode.module.base.dom.utils;
+package org.apache.isis.extensions.base.dom.utils;
 
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
-import org.incode.module.base.dom.utils.MessageUtils;
+import org.apache.isis.extensions.base.dom.utils.MessageUtils;
 
 public class MessageUtils_Test {
 
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/utils/StringUtilsTest.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java
similarity index 96%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/utils/StringUtilsTest.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java
index c84d6a5..6afe9e8 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/utils/StringUtilsTest.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java
@@ -1,11 +1,12 @@
-package org.incode.module.base.dom.utils;
+package org.apache.isis.extensions.base.dom.utils;
 
 import java.util.Arrays;
 import java.util.Collection;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.incode.module.base.dom.testing.PrivateConstructorTester;
+import org.apache.isis.extensions.base.dom.testing.PrivateConstructorTester;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/utils/TitleBuilderTest.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java
similarity index 86%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/utils/TitleBuilderTest.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java
index 6f35878..1ba6356 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/utils/TitleBuilderTest.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java
@@ -1,9 +1,9 @@
-package org.incode.module.base.dom.utils;
+package org.apache.isis.extensions.base.dom.utils;
 
 import org.junit.Test;
 
-import org.incode.module.base.dom.utils.TitleBuilder;
-import org.incode.module.base.dom.valuetypes.LocalDateInterval;
+import org.apache.isis.extensions.base.dom.utils.TitleBuilder;
+import org.apache.isis.extensions.base.dom.valuetypes.LocalDateInterval;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/valuetypes/LocalDateIntervalTest.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java
similarity index 98%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/valuetypes/LocalDateIntervalTest.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java
index c46bdd8..b657207 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/valuetypes/LocalDateIntervalTest.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java
@@ -1,9 +1,9 @@
-package org.incode.module.base.dom.valuetypes;
+package org.apache.isis.extensions.base.dom.valuetypes;
 
 import org.joda.time.Interval;
 import org.joda.time.LocalDate;
 import org.junit.Test;
-import org.incode.module.base.dom.valuetypes.AbstractInterval.IntervalEnding;
+import org.apache.isis.extensions.base.dom.valuetypes.AbstractInterval.IntervalEnding;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
similarity index 92%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
index f453174..84b30fa 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import java.util.Map;
 import java.util.Set;
@@ -8,7 +8,7 @@ import com.google.common.collect.ImmutableMap;
 import org.junit.Test;
 import org.reflections.Reflections;
 
-import org.incode.module.unittestsupport.dom.with.ComparableByCodeContractTester;
+import org.apache.isis.extensions.base.unittestsupport.dom.with.ComparableByCodeContractTester;
 
 public abstract class ComparableByCodeContractTestAbstract_compareTo {
     protected final String packagePrefix;
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByCodeContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java
similarity index 93%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByCodeContractTester.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java
index 265f99e..3476021 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByCodeContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java
@@ -1,7 +1,8 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import java.util.List;
 
+import org.apache.isis.extensions.base.dom.with.WithCodeComparable;
 import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
 
 import com.google.common.base.MoreObjects;
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
similarity index 92%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
index a2f7587..15ea681 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import java.util.Map;
 import java.util.Set;
@@ -8,7 +8,7 @@ import com.google.common.collect.ImmutableMap;
 import org.junit.Test;
 import org.reflections.Reflections;
 
-import org.incode.module.unittestsupport.dom.with.ComparableByDescriptionContractTester;
+import org.apache.isis.extensions.base.unittestsupport.dom.with.ComparableByDescriptionContractTester;
 
 public abstract class ComparableByDescriptionContractTestAbstract_compareTo {
     protected final String packagePrefix;
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByDescriptionContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java
similarity index 93%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByDescriptionContractTester.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java
index bf4c114..d09c9a9 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByDescriptionContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java
@@ -1,7 +1,8 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import java.util.List;
 
+import org.apache.isis.extensions.base.dom.with.WithDescriptionComparable;
 import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
 
 import com.google.common.base.MoreObjects;
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java
similarity index 92%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java
index 7ffa050..d0cd489 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import java.util.Map;
 import java.util.Set;
@@ -8,7 +8,7 @@ import com.google.common.collect.ImmutableMap;
 import org.junit.Test;
 import org.reflections.Reflections;
 
-import org.incode.module.unittestsupport.dom.with.ComparableByNameContractTester;
+import org.apache.isis.extensions.base.unittestsupport.dom.with.ComparableByNameContractTester;
 
 public abstract class ComparableByNameContractTestAbstract_compareTo {
     protected final String packagePrefix;
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByNameContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java
similarity index 93%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByNameContractTester.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java
index ecdc43b..b730513 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByNameContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java
@@ -1,11 +1,11 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import java.util.List;
 
+import org.apache.isis.extensions.base.dom.with.WithNameComparable;
 import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
 
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
 import com.google.common.collect.Lists;
 
 
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
similarity index 92%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
index 9db2a54..cf6be31 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import java.util.Map;
 import java.util.Set;
@@ -8,7 +8,7 @@ import com.google.common.collect.ImmutableMap;
 import org.junit.Test;
 import org.reflections.Reflections;
 
-import org.incode.module.unittestsupport.dom.with.ComparableByReferenceContractTester;
+import org.apache.isis.extensions.base.unittestsupport.dom.with.ComparableByReferenceContractTester;
 
 public abstract class ComparableByReferenceContractTestAbstract_compareTo {
     protected final String packagePrefix;
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByReferenceContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java
similarity index 93%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByReferenceContractTester.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java
index df4ad77..6d2439a 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByReferenceContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java
@@ -1,11 +1,11 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import java.util.List;
 
+import org.apache.isis.extensions.base.dom.with.WithReferenceComparable;
 import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
 
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
 import com.google.common.collect.Lists;
 
 
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByTitleContractTestAbstract_compareTo.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
similarity index 92%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
index c9d1e09..8c0759f 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import java.util.Map;
 import java.util.Set;
@@ -8,7 +8,7 @@ import com.google.common.collect.ImmutableMap;
 import org.junit.Test;
 import org.reflections.Reflections;
 
-import org.incode.module.unittestsupport.dom.with.ComparableByTitleContractTester;
+import org.apache.isis.extensions.base.unittestsupport.dom.with.ComparableByTitleContractTester;
 
 public abstract class ComparableByTitleContractTestAbstract_compareTo {
     protected final String packagePrefix;
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByTitleContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java
similarity index 93%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByTitleContractTester.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java
index 6c8029d..554416d 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/ComparableByTitleContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java
@@ -1,11 +1,11 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import java.util.List;
 
+import org.apache.isis.extensions.base.dom.with.WithTitleComparable;
 import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
 
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
 import com.google.common.collect.Lists;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/InstantiatorForComparableByCode.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java
similarity index 84%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/InstantiatorForComparableByCode.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java
index cf66928..da09bbd 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/InstantiatorForComparableByCode.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java
@@ -1,5 +1,6 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
+import org.apache.isis.extensions.base.dom.with.WithCodeComparable;
 import org.apache.isis.unittestsupport.bidir.Instantiator;
 
 public class InstantiatorForComparableByCode implements Instantiator {
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/InstantiatorForComparableByDescription.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java
similarity index 84%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/InstantiatorForComparableByDescription.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java
index 418a2d1..8d5d788 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/InstantiatorForComparableByDescription.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java
@@ -1,6 +1,7 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 
+import org.apache.isis.extensions.base.dom.with.WithDescriptionComparable;
 import org.apache.isis.unittestsupport.bidir.Instantiator;
 
 public class InstantiatorForComparableByDescription implements Instantiator {
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/InstantiatorForComparableByName.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java
similarity index 84%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/InstantiatorForComparableByName.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java
index 0954a0a..1f257b8 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/InstantiatorForComparableByName.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java
@@ -1,6 +1,7 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 
+import org.apache.isis.extensions.base.dom.with.WithNameComparable;
 import org.apache.isis.unittestsupport.bidir.Instantiator;
 
 public class InstantiatorForComparableByName implements Instantiator {
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/InstantiatorForComparableByReference.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java
similarity index 84%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/InstantiatorForComparableByReference.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java
index bc17cd9..148da65 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/InstantiatorForComparableByReference.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java
@@ -1,6 +1,7 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 
+import org.apache.isis.extensions.base.dom.with.WithReferenceComparable;
 import org.apache.isis.unittestsupport.bidir.Instantiator;
 
 public class InstantiatorForComparableByReference implements Instantiator {
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/InstantiatorForWithStartDate.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java
similarity index 85%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/InstantiatorForWithStartDate.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java
index a67ac16..5a15895 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/InstantiatorForWithStartDate.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java
@@ -1,5 +1,6 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
+import org.apache.isis.extensions.base.dom.with.WithStartDate;
 import org.joda.time.LocalDate;
 
 import org.apache.isis.unittestsupport.bidir.Instantiator;
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java
similarity index 75%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java
index e9258bd..78936dd 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java
@@ -1,8 +1,9 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
+import org.apache.isis.extensions.base.dom.with.*;
 import org.junit.Test;
 
-import org.incode.module.base.dom.testing.PrivateConstructorTester;
+import org.apache.isis.extensions.base.dom.testing.PrivateConstructorTester;
 
 public class StaticHelperClassesContractTest_privateConstructor {
 
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/WithFieldUniqueContractTestAllAbstract.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java
similarity index 98%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/WithFieldUniqueContractTestAllAbstract.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java
index f865414..6b65165 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/WithFieldUniqueContractTestAllAbstract.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
 import java.lang.annotation.Annotation;
 import java.util.Set;
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
similarity index 94%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
index ff30fba..54ecc4d 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
@@ -1,5 +1,6 @@
-package org.incode.module.base.dom.with;
+package org.apache.isis.extensions.base.dom.with;
 
+import org.apache.isis.extensions.base.dom.with.WithIntervalMutable;
 import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
 import org.jmock.Expectations;
 import org.jmock.auto.Mock;
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/services/calendar/CalendarServiceTest_beginningOfMonth.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/services/calendar/CalendarServiceTest_beginningOfMonth.java
similarity index 92%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/services/calendar/CalendarServiceTest_beginningOfMonth.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/services/calendar/CalendarServiceTest_beginningOfMonth.java
index 99d6f49..09895f7 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/services/calendar/CalendarServiceTest_beginningOfMonth.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/services/calendar/CalendarServiceTest_beginningOfMonth.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.services.calendar;
+package org.apache.isis.extensions.base.services.calendar;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -12,7 +12,7 @@ import org.junit.runners.Parameterized.Parameters;
 
 import org.apache.isis.applib.services.clock.ClockService;
 
-import org.incode.module.base.services.calendar.CalendarService;
+import org.apache.isis.extensions.base.services.calendar.CalendarService;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/services/calendar/CalendarServiceTest_beginningOfQuarter.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/services/calendar/CalendarServiceTest_beginningOfQuarter.java
similarity index 95%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/base/services/calendar/CalendarServiceTest_beginningOfQuarter.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/services/calendar/CalendarServiceTest_beginningOfQuarter.java
index cade1b2..6f1333d 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/services/calendar/CalendarServiceTest_beginningOfQuarter.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/services/calendar/CalendarServiceTest_beginningOfQuarter.java
@@ -1,4 +1,4 @@
-package org.incode.module.base.services.calendar;
+package org.apache.isis.extensions.base.services.calendar;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -12,7 +12,7 @@ import org.junit.runners.Parameterized.Parameters;
 
 import org.apache.isis.applib.services.clock.ClockService;
 
-import org.incode.module.base.services.calendar.CalendarService;
+import org.apache.isis.extensions.base.services.calendar.CalendarService;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/titled/TitledEnumContractTestAbstract_title.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/titled/TitledEnumContractTestAbstract_title.java
similarity index 58%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/titled/TitledEnumContractTestAbstract_title.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/titled/TitledEnumContractTestAbstract_title.java
index 3c34b14..81d9d36 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/titled/TitledEnumContractTestAbstract_title.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/titled/TitledEnumContractTestAbstract_title.java
@@ -1,6 +1,6 @@
-package org.incode.module.unittestsupport.dom.titled;
+package org.apache.isis.extensions.base.unittestsupport.dom.titled;
 
-import org.incode.module.base.dom.TitledEnum;
+import org.apache.isis.extensions.base.dom.TitledEnum;
 
 /**
  * Automatically tests all enums implementing {@link TitledEnum}.
@@ -9,7 +9,7 @@ import org.incode.module.base.dom.TitledEnum;
  */
 @Deprecated
 public abstract class TitledEnumContractTestAbstract_title extends
-        org.incode.module.base.dom.titled.TitledEnumContractTestAbstract_title {
+        org.apache.isis.extensions.base.dom.titled.TitledEnumContractTestAbstract_title {
 
     protected TitledEnumContractTestAbstract_title(final String prefix) {
         super(prefix);
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/titled/TitledEnumContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/titled/TitledEnumContractTester.java
similarity index 58%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/titled/TitledEnumContractTester.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/titled/TitledEnumContractTester.java
index a6277a2..c8f8d8b 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/titled/TitledEnumContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/titled/TitledEnumContractTester.java
@@ -1,6 +1,6 @@
-package org.incode.module.unittestsupport.dom.titled;
+package org.apache.isis.extensions.base.unittestsupport.dom.titled;
 
-import org.incode.module.base.dom.TitledEnum;
+import org.apache.isis.extensions.base.dom.TitledEnum;
 
 /**
  * @deprecated - use superclass
@@ -8,7 +8,7 @@ import org.incode.module.base.dom.TitledEnum;
  */
 @Deprecated
 public class TitledEnumContractTester<T extends TitledEnum> extends
-        org.incode.module.base.dom.titled.TitledEnumContractTester {
+        org.apache.isis.extensions.base.dom.titled.TitledEnumContractTester {
 
     /**
      * @param enumType
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
similarity index 73%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
index a6c3b96..c938c32 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
@@ -1,8 +1,8 @@
-package org.incode.module.unittestsupport.dom.with;
+package org.apache.isis.extensions.base.unittestsupport.dom.with;
 
 import com.google.common.collect.ImmutableMap;
 
-import org.incode.module.base.dom.with.WithCodeComparable;
+import org.apache.isis.extensions.base.dom.with.WithCodeComparable;
 
 /**
  * Automatically tests all domain objects implementing {@link WithCodeComparable}.
@@ -15,7 +15,7 @@ import org.incode.module.base.dom.with.WithCodeComparable;
  */
 @Deprecated
 public abstract class ComparableByCodeContractTestAbstract_compareTo extends
-        org.incode.module.base.dom.with.ComparableByCodeContractTestAbstract_compareTo {
+        org.apache.isis.extensions.base.dom.with.ComparableByCodeContractTestAbstract_compareTo {
 
     protected ComparableByCodeContractTestAbstract_compareTo(
             final String packagePrefix,
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByCodeContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java
similarity index 50%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByCodeContractTester.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java
index 43eebe2..a5f1363 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByCodeContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java
@@ -1,13 +1,13 @@
-package org.incode.module.unittestsupport.dom.with;
+package org.apache.isis.extensions.base.unittestsupport.dom.with;
 
-import org.incode.module.base.dom.with.WithCodeComparable;
+import org.apache.isis.extensions.base.dom.with.WithCodeComparable;
 
 /**
  * @deprecated - use superclass
  */
 @Deprecated
 public class ComparableByCodeContractTester<T extends WithCodeComparable<T>> extends
-        org.incode.module.base.dom.with.ComparableByCodeContractTester<T> {
+        org.apache.isis.extensions.base.dom.with.ComparableByCodeContractTester<T> {
 
     public ComparableByCodeContractTester(Class<T> cls) {
         super(cls);
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
similarity index 73%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
index 0b8627c..fbd64fb 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
@@ -1,8 +1,8 @@
-package org.incode.module.unittestsupport.dom.with;
+package org.apache.isis.extensions.base.unittestsupport.dom.with;
 
 import com.google.common.collect.ImmutableMap;
 
-import org.incode.module.base.dom.with.WithDescriptionComparable;
+import org.apache.isis.extensions.base.dom.with.WithDescriptionComparable;
 
 /**
  * Automatically tests all domain objects implementing {@link WithDescriptionComparable}.
@@ -15,7 +15,7 @@ import org.incode.module.base.dom.with.WithDescriptionComparable;
  */
 @Deprecated
 public abstract class ComparableByDescriptionContractTestAbstract_compareTo extends
-        org.incode.module.base.dom.with.ComparableByDescriptionContractTestAbstract_compareTo {
+        org.apache.isis.extensions.base.dom.with.ComparableByDescriptionContractTestAbstract_compareTo {
 
     protected ComparableByDescriptionContractTestAbstract_compareTo(
             final String packagePrefix,
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByDescriptionContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java
similarity index 52%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByDescriptionContractTester.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java
index 0b22b4d..2e911d8 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByDescriptionContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java
@@ -1,6 +1,6 @@
-package org.incode.module.unittestsupport.dom.with;
+package org.apache.isis.extensions.base.unittestsupport.dom.with;
 
-import org.incode.module.base.dom.with.WithDescriptionComparable;
+import org.apache.isis.extensions.base.dom.with.WithDescriptionComparable;
 
 /**
  *
@@ -8,7 +8,7 @@ import org.incode.module.base.dom.with.WithDescriptionComparable;
  */
 @Deprecated
 public class ComparableByDescriptionContractTester<T extends WithDescriptionComparable<T>> extends
-        org.incode.module.base.dom.with.ComparableByDescriptionContractTester<T> {
+        org.apache.isis.extensions.base.dom.with.ComparableByDescriptionContractTester<T> {
 
     public ComparableByDescriptionContractTester(Class<T> cls) {
         super(cls);
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java
similarity index 73%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java
index 364a717..663fef3 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java
@@ -1,8 +1,8 @@
-package org.incode.module.unittestsupport.dom.with;
+package org.apache.isis.extensions.base.unittestsupport.dom.with;
 
 import com.google.common.collect.ImmutableMap;
 
-import org.incode.module.base.dom.with.WithNameComparable;
+import org.apache.isis.extensions.base.dom.with.WithNameComparable;
 
 /**
  * Automatically tests all domain objects implementing {@link WithNameComparable}.
@@ -15,7 +15,7 @@ import org.incode.module.base.dom.with.WithNameComparable;
  */
 @Deprecated
 public abstract class ComparableByNameContractTestAbstract_compareTo extends
-        org.incode.module.base.dom.with.ComparableByNameContractTestAbstract_compareTo {
+        org.apache.isis.extensions.base.dom.with.ComparableByNameContractTestAbstract_compareTo {
 
     protected ComparableByNameContractTestAbstract_compareTo(
             final String packagePrefix,
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByNameContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java
similarity index 51%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByNameContractTester.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java
index 0d965de..5a08157 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByNameContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java
@@ -1,6 +1,6 @@
-package org.incode.module.unittestsupport.dom.with;
+package org.apache.isis.extensions.base.unittestsupport.dom.with;
 
-import org.incode.module.base.dom.with.WithNameComparable;
+import org.apache.isis.extensions.base.dom.with.WithNameComparable;
 
 /**
  *
@@ -8,7 +8,7 @@ import org.incode.module.base.dom.with.WithNameComparable;
  */
 @Deprecated
 public class ComparableByNameContractTester<T extends WithNameComparable<T>> extends
-        org.incode.module.base.dom.with.ComparableByNameContractTester<T> {
+        org.apache.isis.extensions.base.dom.with.ComparableByNameContractTester<T> {
 
     public ComparableByNameContractTester(Class<T> cls) {
         super(cls);
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
similarity index 73%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
index 1268a67..bc2f3da 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
@@ -1,8 +1,8 @@
-package org.incode.module.unittestsupport.dom.with;
+package org.apache.isis.extensions.base.unittestsupport.dom.with;
 
 import com.google.common.collect.ImmutableMap;
 
-import org.incode.module.base.dom.with.WithReferenceComparable;
+import org.apache.isis.extensions.base.dom.with.WithReferenceComparable;
 
 /**
  * Automatically tests all domain objects implementing {@link WithReferenceComparable}.
@@ -15,7 +15,7 @@ import org.incode.module.base.dom.with.WithReferenceComparable;
  */
 @Deprecated
 public abstract class ComparableByReferenceContractTestAbstract_compareTo extends
-        org.incode.module.base.dom.with.ComparableByReferenceContractTestAbstract_compareTo {
+        org.apache.isis.extensions.base.dom.with.ComparableByReferenceContractTestAbstract_compareTo {
 
     protected ComparableByReferenceContractTestAbstract_compareTo(
             final String packagePrefix,
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByReferenceContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java
similarity index 51%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByReferenceContractTester.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java
index 7ac408c..8ca2029 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByReferenceContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java
@@ -1,6 +1,6 @@
-package org.incode.module.unittestsupport.dom.with;
+package org.apache.isis.extensions.base.unittestsupport.dom.with;
 
-import org.incode.module.base.dom.with.WithReferenceComparable;
+import org.apache.isis.extensions.base.dom.with.WithReferenceComparable;
 
 /**
  *
@@ -8,7 +8,7 @@ import org.incode.module.base.dom.with.WithReferenceComparable;
  */
 @Deprecated
 public class ComparableByReferenceContractTester<T extends WithReferenceComparable<T>> extends
-        org.incode.module.base.dom.with.ComparableByReferenceContractTester<T> {
+        org.apache.isis.extensions.base.dom.with.ComparableByReferenceContractTester<T> {
 
     public ComparableByReferenceContractTester(Class<T> cls) {
         super(cls);
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
similarity index 73%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
index fa1dd54..e2b9d19 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
@@ -1,8 +1,8 @@
-package org.incode.module.unittestsupport.dom.with;
+package org.apache.isis.extensions.base.unittestsupport.dom.with;
 
 import com.google.common.collect.ImmutableMap;
 
-import org.incode.module.base.dom.with.WithTitleComparable;
+import org.apache.isis.extensions.base.dom.with.WithTitleComparable;
 
 /**
  * Automatically tests all domain objects implementing {@link WithTitleComparable}.
@@ -15,7 +15,7 @@ import org.incode.module.base.dom.with.WithTitleComparable;
  */
 @Deprecated
 public abstract class ComparableByTitleContractTestAbstract_compareTo extends
-        org.incode.module.base.dom.with.ComparableByTitleContractTestAbstract_compareTo {
+        org.apache.isis.extensions.base.dom.with.ComparableByTitleContractTestAbstract_compareTo {
 
     protected ComparableByTitleContractTestAbstract_compareTo(
             final String packagePrefix,
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByTitleContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java
similarity index 51%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByTitleContractTester.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java
index 9c9d9d7..aded581 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/ComparableByTitleContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java
@@ -1,6 +1,6 @@
-package org.incode.module.unittestsupport.dom.with;
+package org.apache.isis.extensions.base.unittestsupport.dom.with;
 
-import org.incode.module.base.dom.with.WithTitleComparable;
+import org.apache.isis.extensions.base.dom.with.WithTitleComparable;
 
 /**
  *
@@ -8,7 +8,7 @@ import org.incode.module.base.dom.with.WithTitleComparable;
  */
 @Deprecated
 public class ComparableByTitleContractTester<T extends WithTitleComparable<T>> extends
-        org.incode.module.base.dom.with.ComparableByTitleContractTester<T> {
+        org.apache.isis.extensions.base.dom.with.ComparableByTitleContractTester<T> {
 
     public ComparableByTitleContractTester(Class<T> cls) {
         super(cls);
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/InstantiatorForComparableByCode.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java
similarity index 53%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/InstantiatorForComparableByCode.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java
index 4f331af..21d240e 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/InstantiatorForComparableByCode.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java
@@ -1,13 +1,13 @@
-package org.incode.module.unittestsupport.dom.with;
+package org.apache.isis.extensions.base.unittestsupport.dom.with;
 
-import org.incode.module.base.dom.with.WithCodeComparable;
+import org.apache.isis.extensions.base.dom.with.WithCodeComparable;
 
 /**
  *
  * @deprecated - use superclass
  */
 @Deprecated
-public class InstantiatorForComparableByCode extends org.incode.module.base.dom.with.InstantiatorForComparableByCode {
+public class InstantiatorForComparableByCode extends org.apache.isis.extensions.base.dom.with.InstantiatorForComparableByCode {
 
     public InstantiatorForComparableByCode(Class<? extends WithCodeComparable<?>> cls) {
         super(cls);
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/InstantiatorForComparableByDescription.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java
similarity index 52%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/InstantiatorForComparableByDescription.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java
index 40f0171..615e904 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/InstantiatorForComparableByDescription.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java
@@ -1,6 +1,6 @@
-package org.incode.module.unittestsupport.dom.with;
+package org.apache.isis.extensions.base.unittestsupport.dom.with;
 
-import org.incode.module.base.dom.with.WithDescriptionComparable;
+import org.apache.isis.extensions.base.dom.with.WithDescriptionComparable;
 
 /**
  *
@@ -8,7 +8,7 @@ import org.incode.module.base.dom.with.WithDescriptionComparable;
  */
 @Deprecated
 public class InstantiatorForComparableByDescription extends
-        org.incode.module.base.dom.with.InstantiatorForComparableByDescription {
+        org.apache.isis.extensions.base.dom.with.InstantiatorForComparableByDescription {
 
     public InstantiatorForComparableByDescription(Class<? extends WithDescriptionComparable<?>> cls) {
         super(cls);
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java
new file mode 100644
index 0000000..70f87b8
--- /dev/null
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java
@@ -0,0 +1,16 @@
+package org.apache.isis.extensions.base.unittestsupport.dom.with;
+
+import org.apache.isis.extensions.base.dom.with.WithNameComparable;
+
+/**
+ *
+ * @deprecated - use superclass
+ */
+@Deprecated
+public class InstantiatorForComparableByName extends org.apache.isis.extensions.base.dom.with.InstantiatorForComparableByName {
+
+    public InstantiatorForComparableByName(Class<? extends WithNameComparable<?>> cls) {
+        super(cls);
+    }
+
+}
\ No newline at end of file
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/InstantiatorForComparableByReference.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java
similarity index 51%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/InstantiatorForComparableByReference.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java
index cd47f6b..34d1594 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/InstantiatorForComparableByReference.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java
@@ -1,6 +1,6 @@
-package org.incode.module.unittestsupport.dom.with;
+package org.apache.isis.extensions.base.unittestsupport.dom.with;
 
-import org.incode.module.base.dom.with.WithReferenceComparable;
+import org.apache.isis.extensions.base.dom.with.WithReferenceComparable;
 
 /**
  *
@@ -8,7 +8,7 @@ import org.incode.module.base.dom.with.WithReferenceComparable;
  */
 @Deprecated
 public class InstantiatorForComparableByReference extends
-        org.incode.module.base.dom.with.InstantiatorForComparableByReference {
+        org.apache.isis.extensions.base.dom.with.InstantiatorForComparableByReference {
 
     public InstantiatorForComparableByReference(Class<? extends WithReferenceComparable<?>> cls) {
         super(cls);
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java
new file mode 100644
index 0000000..10a05d5
--- /dev/null
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java
@@ -0,0 +1,16 @@
+package org.apache.isis.extensions.base.unittestsupport.dom.with;
+
+import org.apache.isis.extensions.base.dom.with.WithStartDate;
+
+/**
+ *
+ * @deprecated - use superclass
+ */
+@Deprecated
+public class InstantiatorForWithStartDate extends org.apache.isis.extensions.base.dom.with.InstantiatorForWithStartDate {
+
+    public InstantiatorForWithStartDate(Class<? extends WithStartDate> cls) {
+        super(cls);
+    }
+
+}
\ No newline at end of file
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java
similarity index 68%
rename from extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java
index 98029ca..753ff70 100644
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java
@@ -1,4 +1,4 @@
-package org.incode.module.unittestsupport.dom.with;
+package org.apache.isis.extensions.base.unittestsupport.dom.with;
 
 /**
  *
@@ -6,7 +6,7 @@ package org.incode.module.unittestsupport.dom.with;
  */
 @Deprecated
 public abstract class WithFieldUniqueContractTestAllAbstract<T> extends
-        org.incode.module.base.dom.with.WithFieldUniqueContractTestAllAbstract<T> {
+        org.apache.isis.extensions.base.dom.with.WithFieldUniqueContractTestAllAbstract<T> {
 
     public WithFieldUniqueContractTestAllAbstract(
             final String prefix,
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
new file mode 100644
index 0000000..707f007
--- /dev/null
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
@@ -0,0 +1,13 @@
+package org.apache.isis.extensions.base.unittestsupport.dom.with;
+
+import org.apache.isis.extensions.base.dom.with.WithIntervalMutable;
+
+/**
+ *
+ * @deprecated - use superclass
+ */
+@Deprecated
+public abstract class WithIntervalMutableContractTestAbstract_changeDates<T extends WithIntervalMutable<T>> extends
+        org.apache.isis.extensions.base.dom.with.WithIntervalMutableContractTestAbstract_changeDates<T> {
+
+}
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/IncodeApplicationExceptionTest.java b/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/IncodeApplicationExceptionTest.java
deleted file mode 100644
index ffb6d64..0000000
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/base/dom/IncodeApplicationExceptionTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.incode.module.base.dom;
-
-import org.junit.Test;
-
-import org.incode.module.base.dom.IncodeApplicationException;
-
-public class IncodeApplicationExceptionTest {
-
-    private Class<? extends Exception> cls;
-
-
-    @Test
-    public void testName() throws Exception {
-        final IncodeApplicationException ex = new IncodeApplicationException("dummy");
-
-    }
-}
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/InstantiatorForComparableByName.java b/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/InstantiatorForComparableByName.java
deleted file mode 100644
index 3b580d9..0000000
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/InstantiatorForComparableByName.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.incode.module.unittestsupport.dom.with;
-
-import org.incode.module.base.dom.with.WithNameComparable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class InstantiatorForComparableByName extends org.incode.module.base.dom.with.InstantiatorForComparableByName {
-
-    public InstantiatorForComparableByName(Class<? extends WithNameComparable<?>> cls) {
-        super(cls);
-    }
-
-}
\ No newline at end of file
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/InstantiatorForWithStartDate.java b/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/InstantiatorForWithStartDate.java
deleted file mode 100644
index 6b85af3..0000000
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/InstantiatorForWithStartDate.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.incode.module.unittestsupport.dom.with;
-
-import org.incode.module.base.dom.with.WithStartDate;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class InstantiatorForWithStartDate extends org.incode.module.base.dom.with.InstantiatorForWithStartDate {
-
-    public InstantiatorForWithStartDate(Class<? extends WithStartDate> cls) {
-        super(cls);
-    }
-
-}
\ No newline at end of file
diff --git a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java b/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
deleted file mode 100644
index 8203da3..0000000
--- a/extensions/lib/base/impl/src/test/java/org/incode/module/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.incode.module.unittestsupport.dom.with;
-
-import org.incode.module.base.dom.with.WithIntervalMutable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public abstract class WithIntervalMutableContractTestAbstract_changeDates<T extends WithIntervalMutable<T>> extends
-        org.incode.module.base.dom.with.WithIntervalMutableContractTestAbstract_changeDates<T> {
-
-}