You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/12/04 18:45:17 UTC
[isis] 02/02: ISIS-2213: updates git.propertiesDir where necessary
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9273e069e21a986b13a62f093d2cf3225b71da9e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 18:32:27 2019 +0000
ISIS-2213: updates git.propertiesDir where necessary
Also
- adds "-dom" for h2console and hsqldbmgr, to allow for future fixtures or integtests of these extensions, and moves classes accordingly
- removes some duplicated tests
- moved all classes in o.a.isis.extensions.base to reside under .base.dom
- moves core/testsupport/mavenplugin to legacy/testsupport/mavenplugin
---
core/codegen-bytebuddy/pom.xml | 2 +-
core/detached-tests/pom.xml | 2 +-
core/persistence/jdo/common/pom.xml | 2 +-
core/persistence/jdo/datanucleus-5/pom.xml | 2 +-
core/runtime-services/pom.xml | 2 +-
core/runtime-spring/pom.xml | 4 ++--
core/security/keycloak/pom.xml | 2 +-
core/security/shiro/pom.xml | 2 +-
core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml | 2 +-
core/webapp/pom.xml | 4 ++--
.../isis/testdomain/bootstrapping/builtin-IsisBoot.list | 2 +-
.../isis/testdomain/bootstrapping/builtin-singleton.list | 1 -
extensions/lib/base/impl/pom.xml | 4 ++--
.../base/{ => dom}/services/BaseServicesModule.java | 2 +-
.../base/{ => dom}/services/calendar/CalendarService.java | 2 +-
.../extensions/base/{integtests => dom/valuetypes}/VT.java | 2 +-
.../TitledEnumContractTestAbstract_title.java | 2 +-
.../dom/titled => dom}/TitledEnumContractTester.java | 2 +-
.../extensions/base/{ => dom/matchers}/IsisMatchers.java | 2 +-
.../calendar/CalendarServiceTest_beginningOfMonth.java | 4 ++--
.../calendar/CalendarServiceTest_beginningOfQuarter.java | 4 ++--
.../dom/titled/TitledEnumContractTestAbstract_title.java | 2 +-
.../ComparableByCodeContractTestAbstract_compareTo.java | 1 -
...mparableByDescriptionContractTestAbstract_compareTo.java | 1 -
.../ComparableByNameContractTestAbstract_compareTo.java | 1 -
...ComparableByReferenceContractTestAbstract_compareTo.java | 2 --
extensions/lib/excel/fixture/pom.xml | 4 ++--
extensions/lib/excel/impl/pom.xml | 4 ++--
extensions/lib/excel/integtests/pom.xml | 4 ++--
extensions/persistence/h2console/pom.xml | 6 +++---
.../h2console/{ => dom}/IsisExtH2ConsoleModule.java | 4 +---
.../h2console/{ => dom}/services/H2ManagerMenu.java | 4 ++--
.../h2console/{ => dom}/webmodule/WebModuleH2Console.java | 2 +-
extensions/persistence/hsqldbmgr/pom.xml | 6 +++---
.../hsqldbmgr/{ => dom}/IsisExtHsqldbMgrModule.java | 2 +-
.../hsqldbmgr/{ => dom}/services/HsqlDbManagerMenu.java | 2 +-
extensions/pom.xml | 4 ++--
extensions/security/secman/api/pom.xml | 2 +-
extensions/security/secman/encryption-jbcrypt/pom.xml | 2 +-
extensions/security/secman/model/pom.xml | 2 +-
extensions/security/secman/persistence-jdo/pom.xml | 2 +-
extensions/security/secman/realm-shiro/pom.xml | 2 +-
{core => legacy}/testsupport/mavenplugin/pom.xml | 0
.../testsupport/mavenplugin/src/main/doc/antora.yml | 0
.../mavenplugin/src/main/doc/modules/mvn/_attributes.adoc | 0
.../src/main/doc/modules/mvn/attachments}/.gitkeep | 0
.../mavenplugin/src/main/doc/modules/mvn/examples}/.gitkeep | 0
.../main/doc/modules/mvn/images/maven-plugin/xsd-goal.png | Bin
.../main/doc/modules/mvn/images/maven-plugin/xsd-goal.pptx | Bin
.../mavenplugin/src/main/doc/modules/mvn/nav.adoc | 0
.../src/main/doc/modules/mvn/pages}/_attributes.adoc | 0
.../mavenplugin/src/main/doc/modules/mvn/pages/about.adoc | 0
.../mavenplugin/src/main/doc/modules/mvn/pages/intro.adoc | 0
.../mavenplugin/src/main/doc/modules/mvn/pages/swagger.adoc | 0
.../src/main/doc/modules/mvn/pages/validate.adoc | 0
.../mavenplugin/src/main/doc/modules/mvn/pages/xsd.adoc | 0
.../src/main/doc/modules/mvn/partials}/_attributes.adoc | 0
.../mavenplugin/src/main/doc/modules/mvn/partials/nav.adoc | 0
.../java/org/apache/isis/mavenplugin/IsisMojoAbstract.java | 0
.../java/org/apache/isis/mavenplugin/IsisMojoSwagger.java | 0
.../java/org/apache/isis/mavenplugin/IsisMojoValidate.java | 0
.../main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java | 0
.../org/apache/isis/mavenplugin/MetaModelProcessor.java | 0
.../spring/IsisMavenPlugin_SpringContextConfig.java | 0
.../spring/IsisMavenPlugin_SpringContextLauncher.java | 0
65 files changed, 51 insertions(+), 59 deletions(-)
diff --git a/core/codegen-bytebuddy/pom.xml b/core/codegen-bytebuddy/pom.xml
index 5f99d04..c012841 100644
--- a/core/codegen-bytebuddy/pom.xml
+++ b/core/codegen-bytebuddy/pom.xml
@@ -31,7 +31,7 @@
<objenesis.version>2.6</objenesis.version>
<jar-plugin.automaticModuleName>org.apache.isis.codegen.bytebuddy</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/codegen-bytebuddy</git-plugin.propertiesDir>
+ <git-plugin.propertiesDir>org/apache/isis/codegen/bytebuddy</git-plugin.propertiesDir>
</properties>
<build>
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index da6ea08..eca33ff 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -25,7 +25,7 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.detachedtests</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/detached-tests</git-plugin.propertiesDir>
+ <git-plugin.propertiesDir>org/apache/isis/detachedtests</git-plugin.propertiesDir>
<!-- to support the ParameterNameFacet Test -->
<compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument>
diff --git a/core/persistence/jdo/common/pom.xml b/core/persistence/jdo/common/pom.xml
index 15c7445..014b36e 100644
--- a/core/persistence/jdo/common/pom.xml
+++ b/core/persistence/jdo/common/pom.xml
@@ -29,7 +29,7 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.persistence.jdo.common</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/persistence/jdo-common</git-plugin.propertiesDir>
+ <git-plugin.propertiesDir>org/apache/isis/persistence/jdo.common</git-plugin.propertiesDir>
</properties>
<build>
diff --git a/core/persistence/jdo/datanucleus-5/pom.xml b/core/persistence/jdo/datanucleus-5/pom.xml
index b4d7890..99ccb8b 100644
--- a/core/persistence/jdo/datanucleus-5/pom.xml
+++ b/core/persistence/jdo/datanucleus-5/pom.xml
@@ -29,7 +29,7 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.persistence.jdo.datanucleus5</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/persistence/jdo-datanucleus-5</git-plugin.propertiesDir>
+ <git-plugin.propertiesDir>org/apache/isis/persistence/jdo.datanucleus5</git-plugin.propertiesDir>
</properties>
<build>
diff --git a/core/runtime-services/pom.xml b/core/runtime-services/pom.xml
index 19c306f..a3bd910 100644
--- a/core/runtime-services/pom.xml
+++ b/core/runtime-services/pom.xml
@@ -32,7 +32,7 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.runtime.services</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/runtime-services</git-plugin.propertiesDir>
+ <git-plugin.propertiesDir>org/apache/isis/runtime/services</git-plugin.propertiesDir>
</properties>
<build>
diff --git a/core/runtime-spring/pom.xml b/core/runtime-spring/pom.xml
index 3aff589..bbfe42e 100644
--- a/core/runtime-spring/pom.xml
+++ b/core/runtime-spring/pom.xml
@@ -31,8 +31,8 @@
<description>Defines the main Spring @Configuration, which transitively depends on the rest of core. Viewers don't have dependencies on this module.</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.runtime.extensions</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/runtime-extensions</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.runtime.spring</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/runtime/spring</git-plugin.propertiesDir>
</properties>
<build>
diff --git a/core/security/keycloak/pom.xml b/core/security/keycloak/pom.xml
index 10dd565..aa5a461 100644
--- a/core/security/keycloak/pom.xml
+++ b/core/security/keycloak/pom.xml
@@ -35,7 +35,7 @@
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.plugins.security.keycloak</jar-plugin.automaticModuleName>
+ <jar-plugin.automaticModuleName>org.apache.isis.security.keycloak</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/security/keycloak</git-plugin.propertiesDir>
</properties>
diff --git a/core/security/shiro/pom.xml b/core/security/shiro/pom.xml
index 715bf5b..5724c9a 100644
--- a/core/security/shiro/pom.xml
+++ b/core/security/shiro/pom.xml
@@ -35,7 +35,7 @@
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.plugins.security.shiro</jar-plugin.automaticModuleName>
+ <jar-plugin.automaticModuleName>org.apache.isis.security.shiro</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/security/shiro</git-plugin.propertiesDir>
</properties>
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml b/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
index f97b2a8..2564841 100644
--- a/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
+++ b/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
@@ -30,7 +30,7 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.viewer.restfulobjects.jaxrsresteasy4</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/viewer-restfulobjects/jaxrs-resteasy-4</git-plugin.propertiesDir>
+ <git-plugin.propertiesDir>org/apache/isis/viewer.restfulobjects/jaxrsresteasy4</git-plugin.propertiesDir>
</properties>
<build>
diff --git a/core/webapp/pom.xml b/core/webapp/pom.xml
index 90845b4..deffbf4 100644
--- a/core/webapp/pom.xml
+++ b/core/webapp/pom.xml
@@ -34,8 +34,8 @@
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.runtime.web</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/runtime-web</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.webapp</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/webapp</git-plugin.propertiesDir>
</properties>
<build>
diff --git a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-IsisBoot.list b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-IsisBoot.list
index d4f4079..3662e84 100644
--- a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-IsisBoot.list
+++ b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-IsisBoot.list
@@ -57,7 +57,7 @@ org.apache.isis.runtime.services.email.EmailServiceDefault
org.apache.isis.runtime.services.eventbus.EventBusServiceSpring
org.apache.isis.runtime.services.factory.FactoryServiceInternalDefault
org.apache.isis.runtime.services.homepage.HomePageResolverServiceDefault
-org.apache.isis.extensions.hsqldbmgr.services.HsqlDbManagerMenu
+org.apache.isis.extensions.hsqldbmgr.dom.services.HsqlDbManagerMenu
org.apache.isis.runtime.services.i18n.po.TranslationServicePo
org.apache.isis.runtime.services.i18n.po.TranslationServicePoMenu
org.apache.isis.runtime.services.ixn.InteractionDtoServiceInternalDefault
diff --git a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list
index aaf422d..fa74578 100644
--- a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list
+++ b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-singleton.list
@@ -59,7 +59,6 @@ org.apache.isis.runtime.services.email.EmailServiceDefault
org.apache.isis.runtime.services.eventbus.EventBusServiceSpring
org.apache.isis.runtime.services.factory.FactoryServiceInternalDefault
org.apache.isis.runtime.services.homepage.HomePageResolverServiceDefault
-#org.apache.isis.extensions.hsqldbmgr.services.HsqlDbManagerMenu
org.apache.isis.runtime.services.i18n.po.TranslationServicePo
org.apache.isis.runtime.services.i18n.po.TranslationServicePoMenu
org.apache.isis.runtime.services.ixn.InteractionDtoServiceInternalDefault
diff --git a/extensions/lib/base/impl/pom.xml b/extensions/lib/base/impl/pom.xml
index 3098ac1..b39b44f 100644
--- a/extensions/lib/base/impl/pom.xml
+++ b/extensions/lib/base/impl/pom.xml
@@ -19,8 +19,8 @@
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.lib.base</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/lib/base</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.base</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/base</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/services/BaseServicesModule.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/BaseServicesModule.java
similarity index 77%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/services/BaseServicesModule.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/BaseServicesModule.java
index 4c66230..a5f12cb 100644
--- a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/services/BaseServicesModule.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/BaseServicesModule.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.services;
+package org.apache.isis.extensions.base.dom.services;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/services/calendar/CalendarService.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java
similarity index 96%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/services/calendar/CalendarService.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java
index 010c4e6..004e7d3 100644
--- a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/services/calendar/CalendarService.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.services.calendar;
+package org.apache.isis.extensions.base.dom.services.calendar;
import java.time.LocalDate;
diff --git a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/integtests/VT.java b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java
similarity index 98%
rename from extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/integtests/VT.java
rename to extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java
index 9a7a174..251905e 100644
--- a/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/integtests/VT.java
+++ b/extensions/lib/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.integtests;
+package org.apache.isis.extensions.base.dom.valuetypes;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/titled/TitledEnumContractTestAbstract_title.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java
similarity index 86%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/titled/TitledEnumContractTestAbstract_title.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java
index 81d9d36..505de97 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/titled/TitledEnumContractTestAbstract_title.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.titled;
+package org.apache.isis.extensions.base.dom;
import org.apache.isis.extensions.base.dom.TitledEnum;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/titled/TitledEnumContractTester.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java
similarity index 85%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/titled/TitledEnumContractTester.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java
index c8f8d8b..ab935ef 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/titled/TitledEnumContractTester.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.titled;
+package org.apache.isis.extensions.base.dom;
import org.apache.isis.extensions.base.dom.TitledEnum;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/IsisMatchers.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java
similarity index 99%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/IsisMatchers.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java
index e98779a..8ccacdf 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/IsisMatchers.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base;
+package org.apache.isis.extensions.base.dom.matchers;
import java.io.File;
import java.io.IOException;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/services/calendar/CalendarServiceTest_beginningOfMonth.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java
similarity index 92%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/services/calendar/CalendarServiceTest_beginningOfMonth.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java
index f228974..1393c30 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/services/calendar/CalendarServiceTest_beginningOfMonth.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.services.calendar;
+package org.apache.isis.extensions.base.dom.services.calendar;
import java.time.LocalDate;
import java.util.Arrays;
@@ -12,7 +12,7 @@ import org.junit.runners.Parameterized.Parameters;
import org.apache.isis.applib.services.clock.ClockService;
-import org.apache.isis.extensions.base.services.calendar.CalendarService;
+import org.apache.isis.extensions.base.dom.services.calendar.CalendarService;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/services/calendar/CalendarServiceTest_beginningOfQuarter.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java
similarity index 95%
rename from extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/services/calendar/CalendarServiceTest_beginningOfQuarter.java
rename to extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java
index f6dc4df..f4117ee 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/services/calendar/CalendarServiceTest_beginningOfQuarter.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.base.services.calendar;
+package org.apache.isis.extensions.base.dom.services.calendar;
import java.time.LocalDate;
import java.util.Arrays;
@@ -12,7 +12,7 @@ import org.junit.runners.Parameterized.Parameters;
import org.apache.isis.applib.services.clock.ClockService;
-import org.apache.isis.extensions.base.services.calendar.CalendarService;
+import org.apache.isis.extensions.base.dom.services.calendar.CalendarService;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java
index 5e1da29..82a3196 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java
@@ -6,7 +6,7 @@ import org.junit.Test;
import org.reflections.Reflections;
import org.apache.isis.extensions.base.dom.TitledEnum;
-import org.apache.isis.extensions.base.unittestsupport.dom.titled.TitledEnumContractTester;
+import org.apache.isis.extensions.base.dom.TitledEnumContractTester;
public abstract class TitledEnumContractTestAbstract_title {
protected final String prefix;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
index 84b30fa..65c1e8c 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
@@ -8,7 +8,6 @@ import com.google.common.collect.ImmutableMap;
import org.junit.Test;
import org.reflections.Reflections;
-import org.apache.isis.extensions.base.unittestsupport.dom.with.ComparableByCodeContractTester;
public abstract class ComparableByCodeContractTestAbstract_compareTo {
protected final String packagePrefix;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
index 15ea681..3867d56 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
@@ -8,7 +8,6 @@ import com.google.common.collect.ImmutableMap;
import org.junit.Test;
import org.reflections.Reflections;
-import org.apache.isis.extensions.base.unittestsupport.dom.with.ComparableByDescriptionContractTester;
public abstract class ComparableByDescriptionContractTestAbstract_compareTo {
protected final String packagePrefix;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java
index d0cd489..50a920b 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java
@@ -8,7 +8,6 @@ import com.google.common.collect.ImmutableMap;
import org.junit.Test;
import org.reflections.Reflections;
-import org.apache.isis.extensions.base.unittestsupport.dom.with.ComparableByNameContractTester;
public abstract class ComparableByNameContractTestAbstract_compareTo {
protected final String packagePrefix;
diff --git a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
index cf6be31..0c032cb 100644
--- a/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
+++ b/extensions/lib/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
@@ -8,8 +8,6 @@ import com.google.common.collect.ImmutableMap;
import org.junit.Test;
import org.reflections.Reflections;
-import org.apache.isis.extensions.base.unittestsupport.dom.with.ComparableByReferenceContractTester;
-
public abstract class ComparableByReferenceContractTestAbstract_compareTo {
protected final String packagePrefix;
protected Map<Class<?>, Class<?>> noninstantiableSubstitutes;
diff --git a/extensions/lib/excel/fixture/pom.xml b/extensions/lib/excel/fixture/pom.xml
index 671ceac..9e36950 100644
--- a/extensions/lib/excel/fixture/pom.xml
+++ b/extensions/lib/excel/fixture/pom.xml
@@ -13,8 +13,8 @@
<name>Apache Isis Ext - Excel (Fixtures)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.lib.excel.fixtures</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/lib/excel/fixtures</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.excel.fixtures</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/excel/fixtures</git-plugin.propertiesDir>
</properties>
<build>
diff --git a/extensions/lib/excel/impl/pom.xml b/extensions/lib/excel/impl/pom.xml
index 110a851..1aee5aa 100644
--- a/extensions/lib/excel/impl/pom.xml
+++ b/extensions/lib/excel/impl/pom.xml
@@ -19,8 +19,8 @@
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.lib.excel.dom</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/lib/excel/dom</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.excel.dom</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/excel/dom</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/extensions/lib/excel/integtests/pom.xml b/extensions/lib/excel/integtests/pom.xml
index d23b28f..02189ba 100644
--- a/extensions/lib/excel/integtests/pom.xml
+++ b/extensions/lib/excel/integtests/pom.xml
@@ -14,8 +14,8 @@
<name>Apache Isis Ext - Excel (Integ Tests)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.lib.excel.integtests</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/lib/excel/integtests</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.excel.integtests</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/excel/integtests</git-plugin.propertiesDir>
<skipTests>true</skipTests>
</properties>
diff --git a/extensions/persistence/h2console/pom.xml b/extensions/persistence/h2console/pom.xml
index 5e20c5c..13e3cff 100644
--- a/extensions/persistence/h2console/pom.xml
+++ b/extensions/persistence/h2console/pom.xml
@@ -21,13 +21,13 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-extensions-h2console</artifactId>
+ <artifactId>isis-extensions-h2console-dom</artifactId>
<name>Apache Isis Ext - H2 Console</name>
<description>Menu and configuration to open up H2 Console</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.h2console</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/h2console</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.h2console.dom</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/h2console/dom</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/IsisExtH2ConsoleModule.java b/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/dom/IsisExtH2ConsoleModule.java
similarity index 86%
rename from extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/IsisExtH2ConsoleModule.java
rename to extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/dom/IsisExtH2ConsoleModule.java
index f4b6e1b..b886290 100644
--- a/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/IsisExtH2ConsoleModule.java
+++ b/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/dom/IsisExtH2ConsoleModule.java
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.h2console;
+package org.apache.isis.extensions.h2console.dom;
-import org.apache.isis.extensions.h2console.services.H2ManagerMenu;
-import org.apache.isis.extensions.h2console.webmodule.WebModuleH2Console;
import org.apache.isis.webapp.IsisBootWebApp;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
diff --git a/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/services/H2ManagerMenu.java b/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/dom/services/H2ManagerMenu.java
similarity index 95%
rename from extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/services/H2ManagerMenu.java
rename to extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/dom/services/H2ManagerMenu.java
index 8f9f716..8bb5690 100644
--- a/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/services/H2ManagerMenu.java
+++ b/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/dom/services/H2ManagerMenu.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.h2console.services;
+package org.apache.isis.extensions.h2console.dom.services;
import javax.inject.Inject;
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.value.LocalResourcePath;
-import org.apache.isis.extensions.h2console.webmodule.WebModuleH2Console;
+import org.apache.isis.extensions.h2console.dom.webmodule.WebModuleH2Console;
@DomainService(
nature = NatureOfService.VIEW,
diff --git a/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/webmodule/WebModuleH2Console.java b/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java
similarity index 98%
rename from extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/webmodule/WebModuleH2Console.java
rename to extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java
index 6bd99e8..2ede2ed 100644
--- a/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/webmodule/WebModuleH2Console.java
+++ b/extensions/persistence/h2console/src/main/java/org/apache/isis/extensions/h2console/dom/webmodule/WebModuleH2Console.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.h2console.webmodule;
+package org.apache.isis.extensions.h2console.dom.webmodule;
import javax.inject.Inject;
import javax.servlet.ServletContext;
diff --git a/extensions/persistence/hsqldbmgr/pom.xml b/extensions/persistence/hsqldbmgr/pom.xml
index e4a0bf8..3ec20eb 100644
--- a/extensions/persistence/hsqldbmgr/pom.xml
+++ b/extensions/persistence/hsqldbmgr/pom.xml
@@ -21,13 +21,13 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-extensions-hsqldbmgr</artifactId>
+ <artifactId>isis-extensions-hsqldbmgr-dom</artifactId>
<name>Apache Isis Ext - HSQLDB Manager</name>
<description>Menu and configuration to open up HSQLDB Manager</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.hsqldbmgr</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/hsqldbmgr</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.hsqldbmgr.dom</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/hsqldbmgr/dom</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/IsisExtHsqldbMgrModule.java b/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisExtHsqldbMgrModule.java
similarity index 95%
rename from extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/IsisExtHsqldbMgrModule.java
rename to extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisExtHsqldbMgrModule.java
index c789093..5d71d5f1 100644
--- a/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/IsisExtHsqldbMgrModule.java
+++ b/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisExtHsqldbMgrModule.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.hsqldbmgr;
+package org.apache.isis.extensions.hsqldbmgr.dom;
import org.apache.isis.webapp.IsisBootWebApp;
import org.springframework.context.annotation.ComponentScan;
diff --git a/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/services/HsqlDbManagerMenu.java b/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
similarity index 98%
rename from extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/services/HsqlDbManagerMenu.java
rename to extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
index c0e649e..065d998 100644
--- a/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/services/HsqlDbManagerMenu.java
+++ b/extensions/persistence/hsqldbmgr/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.hsqldbmgr.services;
+package org.apache.isis.extensions.hsqldbmgr.dom.services;
import javax.inject.Inject;
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 97953a6..671998f 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -133,12 +133,12 @@
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-h2console</artifactId>
+ <artifactId>isis-extensions-h2console-dom</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-hsqldbmgr</artifactId>
+ <artifactId>isis-extensions-hsqldbmgr-dom</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/extensions/security/secman/api/pom.xml b/extensions/security/secman/api/pom.xml
index dfb1af4..27ed775 100644
--- a/extensions/security/secman/api/pom.xml
+++ b/extensions/security/secman/api/pom.xml
@@ -33,7 +33,7 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.extensions.secman.api</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/secman-api</git-plugin.propertiesDir>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/secman/api</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/extensions/security/secman/encryption-jbcrypt/pom.xml b/extensions/security/secman/encryption-jbcrypt/pom.xml
index 749d6d3..76bdd86 100644
--- a/extensions/security/secman/encryption-jbcrypt/pom.xml
+++ b/extensions/security/secman/encryption-jbcrypt/pom.xml
@@ -33,7 +33,7 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.extensions.secman.encryption.jbcrypt</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/secman-encryption-jbcrypt</git-plugin.propertiesDir>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/secman/encryption/jbcrypt</git-plugin.propertiesDir>
<jbcrypt.version>0.4</jbcrypt.version>
</properties>
diff --git a/extensions/security/secman/model/pom.xml b/extensions/security/secman/model/pom.xml
index 9715398..ef20120 100644
--- a/extensions/security/secman/model/pom.xml
+++ b/extensions/security/secman/model/pom.xml
@@ -33,7 +33,7 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.extensions.secman.model</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/secman-model</git-plugin.propertiesDir>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/secman/model</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/extensions/security/secman/persistence-jdo/pom.xml b/extensions/security/secman/persistence-jdo/pom.xml
index 0c3a449..0e3ebc4 100644
--- a/extensions/security/secman/persistence-jdo/pom.xml
+++ b/extensions/security/secman/persistence-jdo/pom.xml
@@ -33,7 +33,7 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.extensions.secman.persistence.jdo</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/secman-persistence-jdo</git-plugin.propertiesDir>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/secman/persistence/jdo</git-plugin.propertiesDir>
</properties>
diff --git a/extensions/security/secman/realm-shiro/pom.xml b/extensions/security/secman/realm-shiro/pom.xml
index dad7f02..78dfb65 100644
--- a/extensions/security/secman/realm-shiro/pom.xml
+++ b/extensions/security/secman/realm-shiro/pom.xml
@@ -33,7 +33,7 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.extensions.secman.realm.shiro</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/secman-realm-shiro</git-plugin.propertiesDir>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/secman/realm/shiro</git-plugin.propertiesDir>
</properties>
diff --git a/core/testsupport/mavenplugin/pom.xml b/legacy/testsupport/mavenplugin/pom.xml
similarity index 100%
rename from core/testsupport/mavenplugin/pom.xml
rename to legacy/testsupport/mavenplugin/pom.xml
diff --git a/core/testsupport/mavenplugin/src/main/doc/antora.yml b/legacy/testsupport/mavenplugin/src/main/doc/antora.yml
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/doc/antora.yml
rename to legacy/testsupport/mavenplugin/src/main/doc/antora.yml
diff --git a/core/testsupport/mavenplugin/src/main/doc/modules/mvn/_attributes.adoc b/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/_attributes.adoc
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/doc/modules/mvn/_attributes.adoc
rename to legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/_attributes.adoc
diff --git a/core/testsupport/mavenplugin/src/main/doc/modules/mvn/examples/.gitkeep b/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/attachments/.gitkeep
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/doc/modules/mvn/examples/.gitkeep
rename to legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/attachments/.gitkeep
diff --git a/core/testsupport/mavenplugin/src/main/doc/modules/mvn/attachments/.gitkeep b/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/examples/.gitkeep
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/doc/modules/mvn/attachments/.gitkeep
rename to legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/examples/.gitkeep
diff --git a/core/testsupport/mavenplugin/src/main/doc/modules/mvn/images/maven-plugin/xsd-goal.png b/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/images/maven-plugin/xsd-goal.png
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/doc/modules/mvn/images/maven-plugin/xsd-goal.png
rename to legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/images/maven-plugin/xsd-goal.png
diff --git a/core/testsupport/mavenplugin/src/main/doc/modules/mvn/images/maven-plugin/xsd-goal.pptx b/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/images/maven-plugin/xsd-goal.pptx
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/doc/modules/mvn/images/maven-plugin/xsd-goal.pptx
rename to legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/images/maven-plugin/xsd-goal.pptx
diff --git a/core/testsupport/mavenplugin/src/main/doc/modules/mvn/nav.adoc b/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/nav.adoc
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/doc/modules/mvn/nav.adoc
rename to legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/nav.adoc
diff --git a/core/testsupport/mavenplugin/src/main/doc/modules/mvn/partials/_attributes.adoc b/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/_attributes.adoc
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/doc/modules/mvn/partials/_attributes.adoc
rename to legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/_attributes.adoc
diff --git a/core/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/about.adoc b/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/about.adoc
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/about.adoc
rename to legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/about.adoc
diff --git a/core/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/intro.adoc b/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/intro.adoc
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/intro.adoc
rename to legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/intro.adoc
diff --git a/core/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/swagger.adoc b/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/swagger.adoc
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/swagger.adoc
rename to legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/swagger.adoc
diff --git a/core/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/validate.adoc b/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/validate.adoc
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/validate.adoc
rename to legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/validate.adoc
diff --git a/core/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/xsd.adoc b/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/xsd.adoc
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/xsd.adoc
rename to legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/xsd.adoc
diff --git a/core/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/_attributes.adoc b/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/partials/_attributes.adoc
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/doc/modules/mvn/pages/_attributes.adoc
rename to legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/partials/_attributes.adoc
diff --git a/core/testsupport/mavenplugin/src/main/doc/modules/mvn/partials/nav.adoc b/legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/partials/nav.adoc
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/doc/modules/mvn/partials/nav.adoc
rename to legacy/testsupport/mavenplugin/src/main/doc/modules/mvn/partials/nav.adoc
diff --git a/core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java b/legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java
rename to legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java
diff --git a/core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java b/legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java
rename to legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java
diff --git a/core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java b/legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java
rename to legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java
diff --git a/core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java b/legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java
rename to legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java
diff --git a/core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java b/legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java
rename to legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java
diff --git a/core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java b/legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
rename to legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
diff --git a/core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java b/legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
similarity index 100%
rename from core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
rename to legacy/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java