You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/10 11:18:00 UTC
[isis] 11/21: ISIS-2259: renames package for base subdomain
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ba1179e48ead000acbc43f52f9a2fa85d712a598
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 07:11:49 2020 +0000
ISIS-2259: renames package for base subdomain
---
.../{extensions/base/dom => subdomains/base/applib}/Chained.java | 6 +++---
.../isis/{extensions/base/dom => subdomains/base/applib}/Dflt.java | 2 +-
.../base/dom => subdomains/base/applib}/IsisModuleExtBase.java | 2 +-
.../{extensions/base/dom => subdomains/base/applib}/PowerType.java | 2 +-
.../{extensions/base/dom => subdomains/base/applib}/Titled.java | 2 +-
.../{extensions/base/dom => subdomains/base/applib}/TitledEnum.java | 4 ++--
.../dom => subdomains/base/applib}/services/BaseServicesModule.java | 2 +-
.../base/applib}/services/calendar/CalendarService.java | 2 +-
.../base/dom => subdomains/base/applib}/types/DescriptionType.java | 2 +-
.../base/dom => subdomains/base/applib}/types/FqcnType.java | 2 +-
.../base/dom => subdomains/base/applib}/types/MoneyType.java | 2 +-
.../base/dom => subdomains/base/applib}/types/NameType.java | 2 +-
.../base/dom => subdomains/base/applib}/types/NotesType.java | 2 +-
.../dom => subdomains/base/applib}/types/ObjectIdentifierType.java | 2 +-
.../base/dom => subdomains/base/applib}/types/PercentageType.java | 2 +-
.../base/dom => subdomains/base/applib}/types/ProperNameType.java | 2 +-
.../base/dom => subdomains/base/applib}/types/ReferenceType.java | 2 +-
.../base/dom => subdomains/base/applib}/types/TitleType.java | 2 +-
.../base/dom => subdomains/base/applib}/types/UrlTemplateType.java | 2 +-
.../base/dom => subdomains/base/applib}/types/UserNameType.java | 2 +-
.../base/dom => subdomains/base/applib}/types/XxxType.java | 2 +-
.../base/dom => subdomains/base/applib}/utils/ClassUtils.java | 2 +-
.../base/dom => subdomains/base/applib}/utils/JodaPeriodUtils.java | 2 +-
.../base/dom => subdomains/base/applib}/utils/MathUtils.java | 2 +-
.../base/dom => subdomains/base/applib}/utils/MessageUtils.java | 2 +-
.../base/dom => subdomains/base/applib}/utils/StringUtils.java | 2 +-
.../base/dom => subdomains/base/applib}/utils/TitleBuilder.java | 2 +-
.../dom => subdomains/base/applib}/valuetypes/AbstractInterval.java | 2 +-
.../base/applib}/valuetypes/LocalDateInterval.java | 2 +-
.../base/dom => subdomains/base/applib}/valuetypes/VT.java | 2 +-
.../dom => subdomains/base/applib}/with/WithCodeComparable.java | 2 +-
.../base/dom => subdomains/base/applib}/with/WithCodeGetter.java | 2 +-
.../base/dom => subdomains/base/applib}/with/WithCodeUnique.java | 2 +-
.../base/applib}/with/WithDescriptionComparable.java | 2 +-
.../dom => subdomains/base/applib}/with/WithDescriptionGetter.java | 2 +-
.../dom => subdomains/base/applib}/with/WithDescriptionUnique.java | 2 +-
.../base/dom => subdomains/base/applib}/with/WithInterval.java | 4 ++--
.../dom => subdomains/base/applib}/with/WithIntervalContiguous.java | 4 ++--
.../dom => subdomains/base/applib}/with/WithIntervalMutable.java | 4 ++--
.../dom => subdomains/base/applib}/with/WithNameComparable.java | 2 +-
.../base/dom => subdomains/base/applib}/with/WithNameGetter.java | 2 +-
.../base/dom => subdomains/base/applib}/with/WithNameUnique.java | 2 +-
.../base/applib}/with/WithReferenceComparable.java | 2 +-
.../dom => subdomains/base/applib}/with/WithReferenceGetter.java | 2 +-
.../dom => subdomains/base/applib}/with/WithReferenceUnique.java | 2 +-
.../base/dom => subdomains/base/applib}/with/WithSequence.java | 2 +-
.../base/dom => subdomains/base/applib}/with/WithStartDate.java | 2 +-
.../dom => subdomains/base/applib}/with/WithTitleComparable.java | 2 +-
.../base/dom => subdomains/base/applib}/with/WithTitleGetter.java | 2 +-
.../base/dom => subdomains/base/applib}/with/WithTitleUnique.java | 2 +-
.../dom/with/ComparableByCodeContractTestAbstract_compareTo.java | 4 ++--
.../unittestsupport/dom/with/ComparableByCodeContractTester.java | 4 ++--
.../with/ComparableByDescriptionContractTestAbstract_compareTo.java | 4 ++--
.../dom/with/ComparableByDescriptionContractTester.java | 4 ++--
.../dom/with/ComparableByNameContractTestAbstract_compareTo.java | 4 ++--
.../unittestsupport/dom/with/ComparableByNameContractTester.java | 4 ++--
.../with/ComparableByReferenceContractTestAbstract_compareTo.java | 4 ++--
.../dom/with/ComparableByReferenceContractTester.java | 4 ++--
.../dom/with/ComparableByTitleContractTestAbstract_compareTo.java | 4 ++--
.../unittestsupport/dom/with/ComparableByTitleContractTester.java | 4 ++--
.../unittestsupport/dom/with/InstantiatorForComparableByCode.java | 4 ++--
.../dom/with/InstantiatorForComparableByDescription.java | 4 ++--
.../unittestsupport/dom/with/InstantiatorForComparableByName.java | 4 ++--
.../dom/with/InstantiatorForComparableByReference.java | 4 ++--
.../base/unittestsupport/dom/with/InstantiatorForWithStartDate.java | 4 ++--
.../dom/with/WithFieldUniqueContractTestAllAbstract.java | 2 +-
.../with/WithIntervalMutableContractTestAbstract_changeDates.java | 4 ++--
.../base/applib}/TitledEnumContractTestAbstract_title.java | 4 ++--
.../dom => subdomains/base/applib}/TitledEnumContractTester.java | 4 ++--
.../base/dom => subdomains/base/applib}/matchers/IsisMatchers.java | 2 +-
.../services/calendar/CalendarServiceTest_beginningOfMonth.java | 2 +-
.../services/calendar/CalendarServiceTest_beginningOfQuarter.java | 2 +-
.../base/applib}/testing/PrivateConstructorTester.java | 2 +-
.../base/applib}/titled/TitledEnumContractTestAbstract_title.java | 6 +++---
.../base/applib}/titled/TitledEnumContractTester.java | 4 ++--
.../base/dom => subdomains/base/applib}/utils/ClassUtilsTest.java | 2 +-
.../dom => subdomains/base/applib}/utils/JodaPeriodUtilsTest.java | 2 +-
.../base/dom => subdomains/base/applib}/utils/MathUtilsTest.java | 2 +-
.../dom => subdomains/base/applib}/utils/MessageUtils_Test.java | 2 +-
.../base/dom => subdomains/base/applib}/utils/StringUtilsTest.java | 4 ++--
.../base/dom => subdomains/base/applib}/utils/TitleBuilderTest.java | 4 ++--
.../base/applib}/valuetypes/LocalDateIntervalTest.java | 6 ++----
.../with/ComparableByCodeContractTestAbstract_compareTo.java | 2 +-
.../base/applib}/with/ComparableByCodeContractTester.java | 2 +-
.../with/ComparableByDescriptionContractTestAbstract_compareTo.java | 2 +-
.../base/applib}/with/ComparableByDescriptionContractTester.java | 2 +-
.../with/ComparableByNameContractTestAbstract_compareTo.java | 2 +-
.../base/applib}/with/ComparableByNameContractTester.java | 2 +-
.../with/ComparableByReferenceContractTestAbstract_compareTo.java | 2 +-
.../base/applib}/with/ComparableByReferenceContractTester.java | 2 +-
.../with/ComparableByTitleContractTestAbstract_compareTo.java | 2 +-
.../base/applib}/with/ComparableByTitleContractTester.java | 2 +-
.../base/applib}/with/InstantiatorForComparableByCode.java | 2 +-
.../base/applib}/with/InstantiatorForComparableByDescription.java | 2 +-
.../base/applib}/with/InstantiatorForComparableByName.java | 2 +-
.../base/applib}/with/InstantiatorForComparableByReference.java | 2 +-
.../base/applib}/with/InstantiatorForWithStartDate.java | 2 +-
.../with/StaticHelperClassesContractTest_privateConstructor.java | 4 ++--
.../base/applib}/with/WithFieldUniqueContractTestAllAbstract.java | 2 +-
.../with/WithIntervalMutableContractTestAbstract_changeDates.java | 2 +-
100 files changed, 131 insertions(+), 133 deletions(-)
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/Chained.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/Chained.java
similarity index 85%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/Chained.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/Chained.java
index 24ba5b3..bd29567 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/Chained.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/Chained.java
@@ -1,11 +1,11 @@
-package org.apache.isis.extensions.base.dom;
+package org.apache.isis.subdomains.base.applib;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.extensions.base.dom.with.WithInterval;
-import org.apache.isis.extensions.base.dom.with.WithIntervalContiguous;
+import org.apache.isis.subdomains.base.applib.with.WithInterval;
+import org.apache.isis.subdomains.base.applib.with.WithIntervalContiguous;
public interface Chained<T extends Chained<T>> {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/Dflt.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/Dflt.java
similarity index 88%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/Dflt.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/Dflt.java
index 4b00b2a..6b6f721 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/Dflt.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/Dflt.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom;
+package org.apache.isis.subdomains.base.applib;
import java.util.Collection;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/IsisModuleExtBase.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleExtBase.java
similarity index 70%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/IsisModuleExtBase.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleExtBase.java
index 09a17ce..4998757 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/IsisModuleExtBase.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleExtBase.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom;
+package org.apache.isis.subdomains.base.applib;
import org.springframework.context.annotation.Configuration;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/PowerType.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/PowerType.java
similarity index 85%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/PowerType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/PowerType.java
index ae5d42c..76bb1c4 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/PowerType.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/PowerType.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom;
+package org.apache.isis.subdomains.base.applib;
import org.apache.isis.applib.services.factory.FactoryService;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/Titled.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/Titled.java
similarity index 53%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/Titled.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/Titled.java
index 30ce763..6a51da8 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/Titled.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/Titled.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom;
+package org.apache.isis.subdomains.base.applib;
public interface Titled {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/TitledEnum.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/TitledEnum.java
similarity index 65%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/TitledEnum.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/TitledEnum.java
index 346f4c6..d16dd74 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/TitledEnum.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/TitledEnum.java
@@ -1,6 +1,6 @@
-package org.apache.isis.extensions.base.dom;
+package org.apache.isis.subdomains.base.applib;
-import org.apache.isis.extensions.base.dom.utils.StringUtils;
+import org.apache.isis.subdomains.base.applib.utils.StringUtils;
/**
* An enum that implements {@link Titled} and moreover its {@link #title()}
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/services/BaseServicesModule.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/services/BaseServicesModule.java
similarity index 76%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/services/BaseServicesModule.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/services/BaseServicesModule.java
index a5f12cb..637fda6 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/services/BaseServicesModule.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/services/BaseServicesModule.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.services;
+package org.apache.isis.subdomains.base.applib.services;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarService.java
similarity index 96%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarService.java
index 82a40fb..41ea363 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarService.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.services.calendar;
+package org.apache.isis.subdomains.base.applib.services.calendar;
import java.time.LocalDate;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/DescriptionType.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/DescriptionType.java
similarity index 81%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/DescriptionType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/DescriptionType.java
index b1a955f..ccf3844 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/DescriptionType.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/DescriptionType.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.types;
+package org.apache.isis.subdomains.base.applib.types;
public class DescriptionType {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/FqcnType.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/FqcnType.java
similarity index 75%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/FqcnType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/FqcnType.java
index f126318..17cfd5f 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/FqcnType.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/FqcnType.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.types;
+package org.apache.isis.subdomains.base.applib.types;
public class FqcnType {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/MoneyType.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/MoneyType.java
similarity index 75%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/MoneyType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/MoneyType.java
index ef27f52..afaaa7d 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/MoneyType.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/MoneyType.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.types;
+package org.apache.isis.subdomains.base.applib.types;
public class MoneyType {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/NameType.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/NameType.java
similarity index 75%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/NameType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/NameType.java
index 9acfe26..c4b0b3d 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/NameType.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/NameType.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.types;
+package org.apache.isis.subdomains.base.applib.types;
public class NameType {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/NotesType.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/NotesType.java
similarity index 76%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/NotesType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/NotesType.java
index 9fe41ae..e0f4f6f 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/NotesType.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/NotesType.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.types;
+package org.apache.isis.subdomains.base.applib.types;
public class NotesType {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/ObjectIdentifierType.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ObjectIdentifierType.java
similarity index 78%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/ObjectIdentifierType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ObjectIdentifierType.java
index 9f2fbbe..11a0eb8 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/ObjectIdentifierType.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ObjectIdentifierType.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.types;
+package org.apache.isis.subdomains.base.applib.types;
public class ObjectIdentifierType {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/PercentageType.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/PercentageType.java
similarity index 76%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/PercentageType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/PercentageType.java
index f8cbbb1..655de63 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/PercentageType.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/PercentageType.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.types;
+package org.apache.isis.subdomains.base.applib.types;
public class PercentageType {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/ProperNameType.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ProperNameType.java
similarity index 76%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/ProperNameType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ProperNameType.java
index acef836..2ecc267 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/ProperNameType.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ProperNameType.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.types;
+package org.apache.isis.subdomains.base.applib.types;
public class ProperNameType {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/ReferenceType.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ReferenceType.java
similarity index 87%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/ReferenceType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ReferenceType.java
index 376c4e7..6687ea2 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/ReferenceType.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/ReferenceType.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.types;
+package org.apache.isis.subdomains.base.applib.types;
public class ReferenceType {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/TitleType.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/TitleType.java
similarity index 75%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/TitleType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/TitleType.java
index c75e6dc..da7131b 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/TitleType.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/TitleType.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.types;
+package org.apache.isis.subdomains.base.applib.types;
public class TitleType {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/UrlTemplateType.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/UrlTemplateType.java
similarity index 77%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/UrlTemplateType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/UrlTemplateType.java
index 6159d6e..0fc8493 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/UrlTemplateType.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/UrlTemplateType.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.types;
+package org.apache.isis.subdomains.base.applib.types;
public class UrlTemplateType {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/UserNameType.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/UserNameType.java
similarity index 76%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/UserNameType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/UserNameType.java
index 1c96e75..f07a64c 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/UserNameType.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/UserNameType.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.types;
+package org.apache.isis.subdomains.base.applib.types;
public class UserNameType {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/XxxType.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/XxxType.java
similarity index 68%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/XxxType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/XxxType.java
index 8f3a8f5..41799d5 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/XxxType.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/types/XxxType.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.types;
+package org.apache.isis.subdomains.base.applib.types;
public class XxxType {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/ClassUtils.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/ClassUtils.java
similarity index 92%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/ClassUtils.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/ClassUtils.java
index eb7c7b1..75b4615 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/ClassUtils.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/ClassUtils.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.utils;
+package org.apache.isis.subdomains.base.applib.utils;
public final class ClassUtils {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtils.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/JodaPeriodUtils.java
similarity index 97%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtils.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/JodaPeriodUtils.java
index 9ccea0b..7adab53 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtils.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/JodaPeriodUtils.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.utils;
+package org.apache.isis.subdomains.base.applib.utils;
import org.joda.time.Period;
import org.joda.time.format.PeriodFormatter;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/MathUtils.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/MathUtils.java
similarity index 97%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/MathUtils.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/MathUtils.java
index d83244e..e9e0b4d 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/MathUtils.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/MathUtils.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.utils;
+package org.apache.isis.subdomains.base.applib.utils;
import java.math.BigDecimal;
import java.math.MathContext;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/MessageUtils.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/MessageUtils.java
similarity index 92%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/MessageUtils.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/MessageUtils.java
index 5c7a08b..012c184 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/MessageUtils.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/MessageUtils.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.utils;
+package org.apache.isis.subdomains.base.applib.utils;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/StringUtils.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/StringUtils.java
similarity index 97%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/StringUtils.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/StringUtils.java
index 30fd67c..fb2d1ca 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/StringUtils.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/StringUtils.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.utils;
+package org.apache.isis.subdomains.base.applib.utils;
import com.google.common.base.Function;
import com.google.common.base.Joiner;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/TitleBuilder.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/TitleBuilder.java
similarity index 98%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/TitleBuilder.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/TitleBuilder.java
index fe51335..0613eae 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/TitleBuilder.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/TitleBuilder.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.utils;
+package org.apache.isis.subdomains.base.applib.utils;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/AbstractInterval.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/valuetypes/AbstractInterval.java
similarity index 99%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/AbstractInterval.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/valuetypes/AbstractInterval.java
index 9299599..7c56d3d 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/AbstractInterval.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/valuetypes/AbstractInterval.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.valuetypes;
+package org.apache.isis.subdomains.base.applib.valuetypes;
import org.joda.time.Interval;
import org.joda.time.LocalDate;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateInterval.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/valuetypes/LocalDateInterval.java
similarity index 98%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateInterval.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/valuetypes/LocalDateInterval.java
index 4cb67a8..a38be6f 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateInterval.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/valuetypes/LocalDateInterval.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.valuetypes;
+package org.apache.isis.subdomains.base.applib.valuetypes;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/valuetypes/VT.java
similarity index 98%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/valuetypes/VT.java
index e21a1c2..6aa5cc3 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/valuetypes/VT.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.valuetypes;
+package org.apache.isis.subdomains.base.applib.valuetypes;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeComparable.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithCodeComparable.java
similarity index 72%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeComparable.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithCodeComparable.java
index fd28f90..20fba08 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeComparable.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithCodeComparable.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeGetter.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithCodeGetter.java
similarity index 94%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeGetter.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithCodeGetter.java
index 57899e0..a2ef9a7 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeGetter.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithCodeGetter.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import org.apache.isis.applib.util.ObjectContracts.ToStringEvaluator;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeUnique.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithCodeUnique.java
similarity index 53%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeUnique.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithCodeUnique.java
index 4830733..6023016 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeUnique.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithCodeUnique.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
public interface WithCodeUnique extends WithCodeGetter {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionComparable.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithDescriptionComparable.java
similarity index 77%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionComparable.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithDescriptionComparable.java
index d6c79c3..9ed4643 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionComparable.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithDescriptionComparable.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionGetter.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithDescriptionGetter.java
similarity index 94%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionGetter.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithDescriptionGetter.java
index e12629d..58df7ee 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionGetter.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithDescriptionGetter.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import org.apache.isis.applib.util.ObjectContracts.ToStringEvaluator;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionUnique.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithDescriptionUnique.java
similarity index 58%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionUnique.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithDescriptionUnique.java
index 57e2708..397b0f1 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionUnique.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithDescriptionUnique.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
public interface WithDescriptionUnique extends WithDescriptionGetter {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithInterval.java
similarity index 97%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithInterval.java
index 69ba04d..cde09eb 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithInterval.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import java.util.Iterator;
import java.util.SortedSet;
@@ -12,7 +12,7 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.extensions.base.dom.valuetypes.LocalDateInterval;
+import org.apache.isis.subdomains.base.applib.valuetypes.LocalDateInterval;
public interface WithInterval<T extends WithInterval<T>> extends WithStartDate {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithIntervalContiguous.java
similarity index 98%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithIntervalContiguous.java
index f62f779..8fdd038 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithIntervalContiguous.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import java.util.SortedSet;
@@ -13,7 +13,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.extensions.base.dom.Chained;
+import org.apache.isis.subdomains.base.applib.Chained;
public interface WithIntervalContiguous<T extends WithIntervalContiguous<T>>
extends WithIntervalMutable<T>, Comparable<T> {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithIntervalMutable.java
similarity index 94%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithIntervalMutable.java
index ceea67a..8ee6990 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithIntervalMutable.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import org.joda.time.LocalDate;
@@ -6,7 +6,7 @@ import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.extensions.base.dom.valuetypes.LocalDateInterval;
+import org.apache.isis.subdomains.base.applib.valuetypes.LocalDateInterval;
public interface WithIntervalMutable<T extends WithIntervalMutable<T>> extends WithInterval<T> {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameComparable.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithNameComparable.java
similarity index 73%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameComparable.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithNameComparable.java
index d62fe47..ffdf9e1 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameComparable.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithNameComparable.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameGetter.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithNameGetter.java
similarity index 94%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameGetter.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithNameGetter.java
index 7d3ddaa..210c958 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameGetter.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithNameGetter.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import org.apache.isis.applib.util.ObjectContracts;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameUnique.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithNameUnique.java
similarity index 53%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameUnique.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithNameUnique.java
index 9238e91..39e64df 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameUnique.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithNameUnique.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
public interface WithNameUnique extends WithNameGetter {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceComparable.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithReferenceComparable.java
similarity index 76%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceComparable.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithReferenceComparable.java
index 7ce040f..7512aa3 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceComparable.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithReferenceComparable.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceGetter.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithReferenceGetter.java
similarity index 94%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceGetter.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithReferenceGetter.java
index 1b430aa..46229b4 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceGetter.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithReferenceGetter.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import org.apache.isis.applib.util.ObjectContracts.ToStringEvaluator;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceUnique.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithReferenceUnique.java
similarity index 57%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceUnique.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithReferenceUnique.java
index d2ec7a4..fe5c1bc 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceUnique.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithReferenceUnique.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
public interface WithReferenceUnique extends WithReferenceGetter {
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithSequence.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithSequence.java
similarity index 74%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithSequence.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithSequence.java
index b1007e2..a96703a 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithSequence.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithSequence.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import java.math.BigInteger;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithStartDate.java
similarity index 85%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithStartDate.java
index 13d088e..9c70d0f 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithStartDate.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import org.joda.time.LocalDate;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleComparable.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithTitleComparable.java
similarity index 73%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleComparable.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithTitleComparable.java
index a5f2feb..b3f1200 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleComparable.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithTitleComparable.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleGetter.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithTitleGetter.java
similarity index 94%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleGetter.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithTitleGetter.java
index fbc8aa1..8a64b23 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleGetter.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithTitleGetter.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import org.apache.isis.applib.util.ObjectContracts.ToStringEvaluator;
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleUnique.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithTitleUnique.java
similarity index 54%
rename from subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleUnique.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithTitleUnique.java
index 115239c..8f915dc 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleUnique.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/with/WithTitleUnique.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
public interface WithTitleUnique extends WithTitleGetter {
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
index c938c32..73b947f 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
@@ -2,7 +2,7 @@ package org.apache.isis.extensions.base.unittestsupport.dom.with;
import com.google.common.collect.ImmutableMap;
-import org.apache.isis.extensions.base.dom.with.WithCodeComparable;
+import org.apache.isis.subdomains.base.applib.with.WithCodeComparable;
/**
* Automatically tests all domain objects implementing {@link WithCodeComparable}.
@@ -15,7 +15,7 @@ import org.apache.isis.extensions.base.dom.with.WithCodeComparable;
*/
@Deprecated
public abstract class ComparableByCodeContractTestAbstract_compareTo extends
- org.apache.isis.extensions.base.dom.with.ComparableByCodeContractTestAbstract_compareTo {
+ org.apache.isis.subdomains.base.applib.with.ComparableByCodeContractTestAbstract_compareTo {
protected ComparableByCodeContractTestAbstract_compareTo(
final String packagePrefix,
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java
index a5f1363..f237abb 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java
@@ -1,13 +1,13 @@
package org.apache.isis.extensions.base.unittestsupport.dom.with;
-import org.apache.isis.extensions.base.dom.with.WithCodeComparable;
+import org.apache.isis.subdomains.base.applib.with.WithCodeComparable;
/**
* @deprecated - use superclass
*/
@Deprecated
public class ComparableByCodeContractTester<T extends WithCodeComparable<T>> extends
- org.apache.isis.extensions.base.dom.with.ComparableByCodeContractTester<T> {
+ org.apache.isis.subdomains.base.applib.with.ComparableByCodeContractTester<T> {
public ComparableByCodeContractTester(Class<T> cls) {
super(cls);
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
index fbd64fb..c51dd83 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
@@ -2,7 +2,7 @@ package org.apache.isis.extensions.base.unittestsupport.dom.with;
import com.google.common.collect.ImmutableMap;
-import org.apache.isis.extensions.base.dom.with.WithDescriptionComparable;
+import org.apache.isis.subdomains.base.applib.with.WithDescriptionComparable;
/**
* Automatically tests all domain objects implementing {@link WithDescriptionComparable}.
@@ -15,7 +15,7 @@ import org.apache.isis.extensions.base.dom.with.WithDescriptionComparable;
*/
@Deprecated
public abstract class ComparableByDescriptionContractTestAbstract_compareTo extends
- org.apache.isis.extensions.base.dom.with.ComparableByDescriptionContractTestAbstract_compareTo {
+ org.apache.isis.subdomains.base.applib.with.ComparableByDescriptionContractTestAbstract_compareTo {
protected ComparableByDescriptionContractTestAbstract_compareTo(
final String packagePrefix,
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java
index 2e911d8..52a3ab2 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java
@@ -1,6 +1,6 @@
package org.apache.isis.extensions.base.unittestsupport.dom.with;
-import org.apache.isis.extensions.base.dom.with.WithDescriptionComparable;
+import org.apache.isis.subdomains.base.applib.with.WithDescriptionComparable;
/**
*
@@ -8,7 +8,7 @@ import org.apache.isis.extensions.base.dom.with.WithDescriptionComparable;
*/
@Deprecated
public class ComparableByDescriptionContractTester<T extends WithDescriptionComparable<T>> extends
- org.apache.isis.extensions.base.dom.with.ComparableByDescriptionContractTester<T> {
+ org.apache.isis.subdomains.base.applib.with.ComparableByDescriptionContractTester<T> {
public ComparableByDescriptionContractTester(Class<T> cls) {
super(cls);
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java
index 663fef3..e7f86d5 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java
@@ -2,7 +2,7 @@ package org.apache.isis.extensions.base.unittestsupport.dom.with;
import com.google.common.collect.ImmutableMap;
-import org.apache.isis.extensions.base.dom.with.WithNameComparable;
+import org.apache.isis.subdomains.base.applib.with.WithNameComparable;
/**
* Automatically tests all domain objects implementing {@link WithNameComparable}.
@@ -15,7 +15,7 @@ import org.apache.isis.extensions.base.dom.with.WithNameComparable;
*/
@Deprecated
public abstract class ComparableByNameContractTestAbstract_compareTo extends
- org.apache.isis.extensions.base.dom.with.ComparableByNameContractTestAbstract_compareTo {
+ org.apache.isis.subdomains.base.applib.with.ComparableByNameContractTestAbstract_compareTo {
protected ComparableByNameContractTestAbstract_compareTo(
final String packagePrefix,
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java
index 5a08157..00a586f 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java
@@ -1,6 +1,6 @@
package org.apache.isis.extensions.base.unittestsupport.dom.with;
-import org.apache.isis.extensions.base.dom.with.WithNameComparable;
+import org.apache.isis.subdomains.base.applib.with.WithNameComparable;
/**
*
@@ -8,7 +8,7 @@ import org.apache.isis.extensions.base.dom.with.WithNameComparable;
*/
@Deprecated
public class ComparableByNameContractTester<T extends WithNameComparable<T>> extends
- org.apache.isis.extensions.base.dom.with.ComparableByNameContractTester<T> {
+ org.apache.isis.subdomains.base.applib.with.ComparableByNameContractTester<T> {
public ComparableByNameContractTester(Class<T> cls) {
super(cls);
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
index bc2f3da..b466b30 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
@@ -2,7 +2,7 @@ package org.apache.isis.extensions.base.unittestsupport.dom.with;
import com.google.common.collect.ImmutableMap;
-import org.apache.isis.extensions.base.dom.with.WithReferenceComparable;
+import org.apache.isis.subdomains.base.applib.with.WithReferenceComparable;
/**
* Automatically tests all domain objects implementing {@link WithReferenceComparable}.
@@ -15,7 +15,7 @@ import org.apache.isis.extensions.base.dom.with.WithReferenceComparable;
*/
@Deprecated
public abstract class ComparableByReferenceContractTestAbstract_compareTo extends
- org.apache.isis.extensions.base.dom.with.ComparableByReferenceContractTestAbstract_compareTo {
+ org.apache.isis.subdomains.base.applib.with.ComparableByReferenceContractTestAbstract_compareTo {
protected ComparableByReferenceContractTestAbstract_compareTo(
final String packagePrefix,
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java
index 8ca2029..20beecd 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java
@@ -1,6 +1,6 @@
package org.apache.isis.extensions.base.unittestsupport.dom.with;
-import org.apache.isis.extensions.base.dom.with.WithReferenceComparable;
+import org.apache.isis.subdomains.base.applib.with.WithReferenceComparable;
/**
*
@@ -8,7 +8,7 @@ import org.apache.isis.extensions.base.dom.with.WithReferenceComparable;
*/
@Deprecated
public class ComparableByReferenceContractTester<T extends WithReferenceComparable<T>> extends
- org.apache.isis.extensions.base.dom.with.ComparableByReferenceContractTester<T> {
+ org.apache.isis.subdomains.base.applib.with.ComparableByReferenceContractTester<T> {
public ComparableByReferenceContractTester(Class<T> cls) {
super(cls);
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
index e2b9d19..b5a47cb 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
@@ -2,7 +2,7 @@ package org.apache.isis.extensions.base.unittestsupport.dom.with;
import com.google.common.collect.ImmutableMap;
-import org.apache.isis.extensions.base.dom.with.WithTitleComparable;
+import org.apache.isis.subdomains.base.applib.with.WithTitleComparable;
/**
* Automatically tests all domain objects implementing {@link WithTitleComparable}.
@@ -15,7 +15,7 @@ import org.apache.isis.extensions.base.dom.with.WithTitleComparable;
*/
@Deprecated
public abstract class ComparableByTitleContractTestAbstract_compareTo extends
- org.apache.isis.extensions.base.dom.with.ComparableByTitleContractTestAbstract_compareTo {
+ org.apache.isis.subdomains.base.applib.with.ComparableByTitleContractTestAbstract_compareTo {
protected ComparableByTitleContractTestAbstract_compareTo(
final String packagePrefix,
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java
index aded581..935c777 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java
@@ -1,6 +1,6 @@
package org.apache.isis.extensions.base.unittestsupport.dom.with;
-import org.apache.isis.extensions.base.dom.with.WithTitleComparable;
+import org.apache.isis.subdomains.base.applib.with.WithTitleComparable;
/**
*
@@ -8,7 +8,7 @@ import org.apache.isis.extensions.base.dom.with.WithTitleComparable;
*/
@Deprecated
public class ComparableByTitleContractTester<T extends WithTitleComparable<T>> extends
- org.apache.isis.extensions.base.dom.with.ComparableByTitleContractTester<T> {
+ org.apache.isis.subdomains.base.applib.with.ComparableByTitleContractTester<T> {
public ComparableByTitleContractTester(Class<T> cls) {
super(cls);
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java
index 21d240e..7ec2559 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java
@@ -1,13 +1,13 @@
package org.apache.isis.extensions.base.unittestsupport.dom.with;
-import org.apache.isis.extensions.base.dom.with.WithCodeComparable;
+import org.apache.isis.subdomains.base.applib.with.WithCodeComparable;
/**
*
* @deprecated - use superclass
*/
@Deprecated
-public class InstantiatorForComparableByCode extends org.apache.isis.extensions.base.dom.with.InstantiatorForComparableByCode {
+public class InstantiatorForComparableByCode extends org.apache.isis.subdomains.base.applib.with.InstantiatorForComparableByCode {
public InstantiatorForComparableByCode(Class<? extends WithCodeComparable<?>> cls) {
super(cls);
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java
index 615e904..e10baff 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java
@@ -1,6 +1,6 @@
package org.apache.isis.extensions.base.unittestsupport.dom.with;
-import org.apache.isis.extensions.base.dom.with.WithDescriptionComparable;
+import org.apache.isis.subdomains.base.applib.with.WithDescriptionComparable;
/**
*
@@ -8,7 +8,7 @@ import org.apache.isis.extensions.base.dom.with.WithDescriptionComparable;
*/
@Deprecated
public class InstantiatorForComparableByDescription extends
- org.apache.isis.extensions.base.dom.with.InstantiatorForComparableByDescription {
+ org.apache.isis.subdomains.base.applib.with.InstantiatorForComparableByDescription {
public InstantiatorForComparableByDescription(Class<? extends WithDescriptionComparable<?>> cls) {
super(cls);
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java
index 70f87b8..0d0818a 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java
@@ -1,13 +1,13 @@
package org.apache.isis.extensions.base.unittestsupport.dom.with;
-import org.apache.isis.extensions.base.dom.with.WithNameComparable;
+import org.apache.isis.subdomains.base.applib.with.WithNameComparable;
/**
*
* @deprecated - use superclass
*/
@Deprecated
-public class InstantiatorForComparableByName extends org.apache.isis.extensions.base.dom.with.InstantiatorForComparableByName {
+public class InstantiatorForComparableByName extends org.apache.isis.subdomains.base.applib.with.InstantiatorForComparableByName {
public InstantiatorForComparableByName(Class<? extends WithNameComparable<?>> cls) {
super(cls);
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java
index 34d1594..37cfc18 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java
@@ -1,6 +1,6 @@
package org.apache.isis.extensions.base.unittestsupport.dom.with;
-import org.apache.isis.extensions.base.dom.with.WithReferenceComparable;
+import org.apache.isis.subdomains.base.applib.with.WithReferenceComparable;
/**
*
@@ -8,7 +8,7 @@ import org.apache.isis.extensions.base.dom.with.WithReferenceComparable;
*/
@Deprecated
public class InstantiatorForComparableByReference extends
- org.apache.isis.extensions.base.dom.with.InstantiatorForComparableByReference {
+ org.apache.isis.subdomains.base.applib.with.InstantiatorForComparableByReference {
public InstantiatorForComparableByReference(Class<? extends WithReferenceComparable<?>> cls) {
super(cls);
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java
index 10a05d5..e33c04b 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java
@@ -1,13 +1,13 @@
package org.apache.isis.extensions.base.unittestsupport.dom.with;
-import org.apache.isis.extensions.base.dom.with.WithStartDate;
+import org.apache.isis.subdomains.base.applib.with.WithStartDate;
/**
*
* @deprecated - use superclass
*/
@Deprecated
-public class InstantiatorForWithStartDate extends org.apache.isis.extensions.base.dom.with.InstantiatorForWithStartDate {
+public class InstantiatorForWithStartDate extends org.apache.isis.subdomains.base.applib.with.InstantiatorForWithStartDate {
public InstantiatorForWithStartDate(Class<? extends WithStartDate> cls) {
super(cls);
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java
index 753ff70..ed84d72 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java
@@ -6,7 +6,7 @@ package org.apache.isis.extensions.base.unittestsupport.dom.with;
*/
@Deprecated
public abstract class WithFieldUniqueContractTestAllAbstract<T> extends
- org.apache.isis.extensions.base.dom.with.WithFieldUniqueContractTestAllAbstract<T> {
+ org.apache.isis.subdomains.base.applib.with.WithFieldUniqueContractTestAllAbstract<T> {
public WithFieldUniqueContractTestAllAbstract(
final String prefix,
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
index 707f007..a2d2533 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
@@ -1,6 +1,6 @@
package org.apache.isis.extensions.base.unittestsupport.dom.with;
-import org.apache.isis.extensions.base.dom.with.WithIntervalMutable;
+import org.apache.isis.subdomains.base.applib.with.WithIntervalMutable;
/**
*
@@ -8,6 +8,6 @@ import org.apache.isis.extensions.base.dom.with.WithIntervalMutable;
*/
@Deprecated
public abstract class WithIntervalMutableContractTestAbstract_changeDates<T extends WithIntervalMutable<T>> extends
- org.apache.isis.extensions.base.dom.with.WithIntervalMutableContractTestAbstract_changeDates<T> {
+ org.apache.isis.subdomains.base.applib.with.WithIntervalMutableContractTestAbstract_changeDates<T> {
}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/TitledEnumContractTestAbstract_title.java
similarity index 67%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/TitledEnumContractTestAbstract_title.java
index 13ea9d8..a2cb165 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/TitledEnumContractTestAbstract_title.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom;
+package org.apache.isis.subdomains.base.applib;
/**
* Automatically tests all enums implementing {@link TitledEnum}.
@@ -7,7 +7,7 @@ package org.apache.isis.extensions.base.dom;
*/
@Deprecated
public abstract class TitledEnumContractTestAbstract_title extends
- org.apache.isis.extensions.base.dom.titled.TitledEnumContractTestAbstract_title {
+ org.apache.isis.subdomains.base.applib.titled.TitledEnumContractTestAbstract_title {
protected TitledEnumContractTestAbstract_title(final String prefix) {
super(prefix);
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/TitledEnumContractTester.java
similarity index 68%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/TitledEnumContractTester.java
index 3a820e2..cae21f7 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/TitledEnumContractTester.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom;
+package org.apache.isis.subdomains.base.applib;
/**
* @deprecated - use superclass
@@ -6,7 +6,7 @@ package org.apache.isis.extensions.base.dom;
*/
@Deprecated
public class TitledEnumContractTester<T extends TitledEnum> extends
- org.apache.isis.extensions.base.dom.titled.TitledEnumContractTester {
+ org.apache.isis.subdomains.base.applib.titled.TitledEnumContractTester {
/**
* @param enumType
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/matchers/IsisMatchers.java
similarity index 99%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/matchers/IsisMatchers.java
index 65f02dc..126a2c3 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/matchers/IsisMatchers.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.matchers;
+package org.apache.isis.subdomains.base.applib.matchers;
import java.io.File;
import java.io.IOException;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarServiceTest_beginningOfMonth.java
similarity index 96%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarServiceTest_beginningOfMonth.java
index b40c299..4b78a1e 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarServiceTest_beginningOfMonth.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.services.calendar;
+package org.apache.isis.subdomains.base.applib.services.calendar;
import java.time.LocalDate;
import java.util.Arrays;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarServiceTest_beginningOfQuarter.java
similarity index 97%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarServiceTest_beginningOfQuarter.java
index 19d3c2c..91c65d6 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarServiceTest_beginningOfQuarter.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.services.calendar;
+package org.apache.isis.subdomains.base.applib.services.calendar;
import java.time.LocalDate;
import java.util.Arrays;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/testing/PrivateConstructorTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/testing/PrivateConstructorTester.java
similarity index 87%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/testing/PrivateConstructorTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/testing/PrivateConstructorTester.java
index bb313c9..8c319bf 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/testing/PrivateConstructorTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/testing/PrivateConstructorTester.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.testing;
+package org.apache.isis.subdomains.base.applib.testing;
import java.lang.reflect.Constructor;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/titled/TitledEnumContractTestAbstract_title.java
similarity index 82%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/titled/TitledEnumContractTestAbstract_title.java
index 82a3196..d72bfe4 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/titled/TitledEnumContractTestAbstract_title.java
@@ -1,12 +1,12 @@
-package org.apache.isis.extensions.base.dom.titled;
+package org.apache.isis.subdomains.base.applib.titled;
import java.util.Set;
import org.junit.Test;
import org.reflections.Reflections;
-import org.apache.isis.extensions.base.dom.TitledEnum;
-import org.apache.isis.extensions.base.dom.TitledEnumContractTester;
+import org.apache.isis.subdomains.base.applib.TitledEnum;
+import org.apache.isis.subdomains.base.applib.TitledEnumContractTester;
public abstract class TitledEnumContractTestAbstract_title {
protected final String prefix;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/titled/TitledEnumContractTester.java
similarity index 89%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/titled/TitledEnumContractTester.java
index d40b15d..0fda2c8 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/titled/TitledEnumContractTester.java
@@ -1,11 +1,11 @@
-package org.apache.isis.extensions.base.dom.titled;
+package org.apache.isis.subdomains.base.applib.titled;
import org.hamcrest.CoreMatchers;
import static org.junit.Assert.assertThat;
import org.apache.isis.applib.util.Enums;
-import org.apache.isis.extensions.base.dom.TitledEnum;
+import org.apache.isis.subdomains.base.applib.TitledEnum;
public class TitledEnumContractTester {
protected Enum<?>[] enumValues;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/ClassUtilsTest.java
similarity index 97%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/ClassUtilsTest.java
index 2f43d48..02633f0 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/ClassUtilsTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.utils;
+package org.apache.isis.subdomains.base.applib.utils;
import org.junit.Rule;
import org.junit.Test;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtilsTest.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/JodaPeriodUtilsTest.java
similarity index 97%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtilsTest.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/JodaPeriodUtilsTest.java
index 0a43f4c..5d32e93 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtilsTest.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/JodaPeriodUtilsTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.utils;
+package org.apache.isis.subdomains.base.applib.utils;
import org.hamcrest.core.Is;
import org.joda.time.LocalDate;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/MathUtilsTest.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/MathUtilsTest.java
similarity index 97%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/MathUtilsTest.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/MathUtilsTest.java
index 9753e3d..ed92ca8 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/MathUtilsTest.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/MathUtilsTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.utils;
+package org.apache.isis.subdomains.base.applib.utils;
import java.math.BigDecimal;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/MessageUtils_Test.java
similarity index 97%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/MessageUtils_Test.java
index afc145c..200e0e5 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/MessageUtils_Test.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.utils;
+package org.apache.isis.subdomains.base.applib.utils;
import org.assertj.core.api.Assertions;
import org.junit.Test;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/StringUtilsTest.java
similarity index 96%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/StringUtilsTest.java
index d3624d6..4245057 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/StringUtilsTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.utils;
+package org.apache.isis.subdomains.base.applib.utils;
import java.util.Arrays;
import java.util.Collection;
@@ -9,7 +9,7 @@ import org.junit.runners.Parameterized;
import static org.junit.Assert.assertEquals;
-import org.apache.isis.extensions.base.dom.testing.PrivateConstructorTester;
+import org.apache.isis.subdomains.base.applib.testing.PrivateConstructorTester;
public class StringUtilsTest {
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/TitleBuilderTest.java
similarity index 90%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/TitleBuilderTest.java
index 53972a3..44a85b2 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/TitleBuilderTest.java
@@ -1,10 +1,10 @@
-package org.apache.isis.extensions.base.dom.utils;
+package org.apache.isis.subdomains.base.applib.utils;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.isis.extensions.base.dom.valuetypes.LocalDateInterval;
+import org.apache.isis.subdomains.base.applib.valuetypes.LocalDateInterval;
public class TitleBuilderTest {
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/valuetypes/LocalDateIntervalTest.java
similarity index 97%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/valuetypes/LocalDateIntervalTest.java
index 5c41bda..d1a29e7 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/valuetypes/LocalDateIntervalTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.valuetypes;
+package org.apache.isis.subdomains.base.applib.valuetypes;
import org.joda.time.Interval;
import org.joda.time.LocalDate;
@@ -11,8 +11,6 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
-import org.apache.isis.extensions.base.dom.valuetypes.AbstractInterval.IntervalEnding;
-
public class LocalDateIntervalTest {
LocalDateInterval interval120101to120401 = LocalDateInterval.excluding(new LocalDate(2012, 1, 1), new LocalDate(2012, 4, 1));
@@ -211,7 +209,7 @@ public class LocalDateIntervalTest {
@Test
public void testEquals() {
assertTrue(new LocalDateInterval().equals(new LocalDateInterval()));
- assertTrue(new LocalDateInterval(null, null, IntervalEnding.EXCLUDING_END_DATE).equals(new LocalDateInterval(null, null, IntervalEnding.INCLUDING_END_DATE)));
+ assertTrue(new LocalDateInterval(null, null, AbstractInterval.IntervalEnding.EXCLUDING_END_DATE).equals(new LocalDateInterval(null, null, AbstractInterval.IntervalEnding.INCLUDING_END_DATE)));
}
}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByCodeContractTestAbstract_compareTo.java
similarity index 97%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByCodeContractTestAbstract_compareTo.java
index 65c1e8c..aa9864f 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByCodeContractTestAbstract_compareTo.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import java.util.Map;
import java.util.Set;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByCodeContractTester.java
similarity index 96%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByCodeContractTester.java
index eca8690..9bbfda0 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByCodeContractTester.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import java.util.List;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByDescriptionContractTestAbstract_compareTo.java
similarity index 97%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByDescriptionContractTestAbstract_compareTo.java
index 3867d56..3a6f16e 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByDescriptionContractTestAbstract_compareTo.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import java.util.Map;
import java.util.Set;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByDescriptionContractTester.java
similarity index 97%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByDescriptionContractTester.java
index 9f78682..1a31874 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByDescriptionContractTester.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import java.util.List;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByNameContractTestAbstract_compareTo.java
similarity index 97%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByNameContractTestAbstract_compareTo.java
index 50a920b..63a3010 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByNameContractTestAbstract_compareTo.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import java.util.Map;
import java.util.Set;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByNameContractTester.java
similarity index 96%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByNameContractTester.java
index 521d6a1..5fed387 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByNameContractTester.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import java.util.List;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByReferenceContractTestAbstract_compareTo.java
similarity index 97%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByReferenceContractTestAbstract_compareTo.java
index 0c032cb..3f4f21a 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByReferenceContractTestAbstract_compareTo.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import java.util.Map;
import java.util.Set;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByReferenceContractTester.java
similarity index 97%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByReferenceContractTester.java
index 84fc89e..f13d1d6 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByReferenceContractTester.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import java.util.List;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTestAbstract_compareTo.java
similarity index 97%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTestAbstract_compareTo.java
index 8c0759f..69938ad 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTestAbstract_compareTo.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import java.util.Map;
import java.util.Set;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTester.java
similarity index 97%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTester.java
index 3540544..e50f07f 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTester.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import java.util.List;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByCode.java
similarity index 92%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByCode.java
index b50d7be..fc26dd8 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByCode.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import org.apache.isis.unittestsupport.bidir.Instantiator;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByDescription.java
similarity index 93%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByDescription.java
index b83c719..51ba406 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByDescription.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import org.apache.isis.unittestsupport.bidir.Instantiator;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByName.java
similarity index 92%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByName.java
index 9d37bf6..b5bb7a6 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByName.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import org.apache.isis.unittestsupport.bidir.Instantiator;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByReference.java
similarity index 92%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByReference.java
index 04de1f6..10b1dd5 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByReference.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import org.apache.isis.unittestsupport.bidir.Instantiator;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForWithStartDate.java
similarity index 92%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForWithStartDate.java
index 2c3ea59..f8fe5c9 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForWithStartDate.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import org.joda.time.LocalDate;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/StaticHelperClassesContractTest_privateConstructor.java
similarity index 80%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/StaticHelperClassesContractTest_privateConstructor.java
index 0f9d49c..e1a2730 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/StaticHelperClassesContractTest_privateConstructor.java
@@ -1,8 +1,8 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import org.junit.Test;
-import org.apache.isis.extensions.base.dom.testing.PrivateConstructorTester;
+import org.apache.isis.subdomains.base.applib.testing.PrivateConstructorTester;
public class StaticHelperClassesContractTest_privateConstructor {
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/WithFieldUniqueContractTestAllAbstract.java
similarity index 98%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/WithFieldUniqueContractTestAllAbstract.java
index c00a0cc..6ea8816 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/WithFieldUniqueContractTestAllAbstract.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import java.lang.annotation.Annotation;
import java.util.Set;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/WithIntervalMutableContractTestAbstract_changeDates.java
similarity index 97%
rename from subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/WithIntervalMutableContractTestAbstract_changeDates.java
index 05c460d..b4cef04 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/WithIntervalMutableContractTestAbstract_changeDates.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.dom.with;
+package org.apache.isis.subdomains.base.applib.with;
import org.jmock.Expectations;
import org.jmock.auto.Mock;