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:17:49 UTC
[isis] branch ISIS-2259 created (now c1c20d9)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git.
at c1c20d9 ISIS-2259: reorg fixtures testing module.
This branch includes the following new commits:
new 26afedd ISIS-2062: combines the secman docs together.
new f27a282 ISIS-2062: renames secman:ROOT to security:secman
new 8c56359 ISIS-2062: moves secman and shiro-realm-ldap from extensions to security module.
new 6837ce1 ISIS-2062: moves other modules from extensions to pjdo, vw and vro
new e5214ca ISIS-2259: adds in parent module for shiro-realm-ldap
new 8858558 ISIS-2259: adds in parent module for cors extension module
new 984b7e8 ISIS-2259: scaffolding for jaxrsclient mapping
new 3c45d34 ISIS-2259: adds in parent module for restclient and jaxrsclient (in mappings)
new decedce ISIS-2062; moves location of docs for mappings modules.
new 4081233 ISIS-2259: renames base subdomain dom to applib.
new ba1179e ISIS-2259: renames package for base subdomain
new bd378c1 ISIS-2259: adds parent for base subdomain
new 805156b ISIS-2062: moves base subdomains doc
new 7083dd4 ISIS-2259: adds parent for docx subdomain.
new 4295ffb ISIS-2259: reorganises excel subdomain, factors out excel.applib vs excel.testing
new 7e2b011 ISIS-2259: freemarker subdomain structure
new e0f1458 ISIS-2259: reorg pdfbox module
new 7ff9bb9 ISIS-2259: reorg spring subdomains module
new f788b25 ISIS-2259: reorg xdocreport module
new e570062 ISIS-2259: reorg fakedata module
new c1c20d9 ISIS-2259: reorg fixtures testing module.
The 21 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[isis] 16/21: ISIS-2259: freemarker subdomain structure
Posted by da...@apache.org.
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 7e2b01112d4ec95f74ec215a515494cad568931d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 10:01:19 2020 +0000
ISIS-2259: freemarker subdomain structure
also adds in compile dependency to core-commons from core-config (since dependency in applib is only "provided")
ditto for persistence/jdo/applib
---
antora/playbooks/site-subdomains.yml | 4 ++--
antora/playbooks/site.yml | 4 ++--
core/config/pom.xml | 6 +++++-
core/persistence/jdo/applib/pom.xml | 4 ++++
subdomains/docx/applib/pom.xml | 6 ++++++
subdomains/excel/applib/pom.xml | 1 +
subdomains/freemarker/{impl => applib}/pom.xml | 16 +++++++++-------
.../applib/IsisModuleSubFreemarkerApplib.java} | 4 ++--
subdomains/freemarker/{impl => }/pom.xml | 15 +++++----------
subdomains/freemarker/{impl => }/src/main/doc/antora.yml | 0
.../{impl => }/src/main/doc/modules/freemarker/nav.adoc | 0
.../src/main/doc/modules/freemarker/pages/about.adoc | 0
.../main/doc/modules/freemarker/partials/module-nav.adoc | 0
subdomains/pom.xml | 10 +++++++---
14 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index 26a1050..a1589f7 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -23,10 +23,10 @@ content:
start_path: subdomains/docx/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/excel/impl/src/main/doc # subdomains
+ start_path: subdomains/excel/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/freemarker/impl/src/main/doc # subdomains
+ start_path: subdomains/freemarker/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/ognl/impl/src/main/doc # subdomains
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 4580422..b881bd1 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -197,10 +197,10 @@ content:
start_path: subdomains/docx/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/excel/impl/src/main/doc # subdomains
+ start_path: subdomains/excel/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/freemarker/impl/src/main/doc # subdomains
+ start_path: subdomains/freemarker/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/ognl/impl/src/main/doc # subdomains
diff --git a/core/config/pom.xml b/core/config/pom.xml
index 06051a2..77abda1 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -63,7 +63,11 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-applib</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-commons</artifactId>
+ </dependency>
+
<!-- IDE support (optional) -->
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/core/persistence/jdo/applib/pom.xml b/core/persistence/jdo/applib/pom.xml
index 0029bdc..7a378e7 100644
--- a/core/persistence/jdo/applib/pom.xml
+++ b/core/persistence/jdo/applib/pom.xml
@@ -73,6 +73,10 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-applib</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-commons</artifactId>
+ </dependency>
<!-- JDO API (providing compile dependency) -->
<dependency>
diff --git a/subdomains/docx/applib/pom.xml b/subdomains/docx/applib/pom.xml
index 7270f29..842f7b8 100644
--- a/subdomains/docx/applib/pom.xml
+++ b/subdomains/docx/applib/pom.xml
@@ -30,9 +30,15 @@
<dependencies>
<dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
+ </dependency>
+<!--
+ <dependency>
<groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains-base-applib</artifactId>
</dependency>
+-->
</dependencies>
</project>
diff --git a/subdomains/excel/applib/pom.xml b/subdomains/excel/applib/pom.xml
index 20f0268..446cd6d 100644
--- a/subdomains/excel/applib/pom.xml
+++ b/subdomains/excel/applib/pom.xml
@@ -32,6 +32,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-applib</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-runtime</artifactId>
diff --git a/subdomains/freemarker/impl/pom.xml b/subdomains/freemarker/applib/pom.xml
similarity index 78%
copy from subdomains/freemarker/impl/pom.xml
copy to subdomains/freemarker/applib/pom.xml
index 2f29698..65514f5 100644
--- a/subdomains/freemarker/impl/pom.xml
+++ b/subdomains/freemarker/applib/pom.xml
@@ -16,22 +16,24 @@
<parent>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
+ <artifactId>isis-subdomains-freemarker</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-freemarker-dom</artifactId>
- <name>Apache Isis Sub - Freemarker</name>
- <description>Integrates Freemarker Library</description>
+ <artifactId>isis-subdomains-freemarker-applib</artifactId>
+ <name>Apache Isis Sub - Freemarker (applib)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.freemarker.dom</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/freemarker/dom</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.subdomains.freemarker.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/subdomains/freemarker/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/subdomains/freemarker/impl/src/main/java/org/apache/isis/extensions/freemarker/dom/IsisModuleExtFreemarker.java b/subdomains/freemarker/applib/src/main/java/org/apache/isis/subdomains/freemarker/applib/IsisModuleSubFreemarkerApplib.java
similarity index 90%
rename from subdomains/freemarker/impl/src/main/java/org/apache/isis/extensions/freemarker/dom/IsisModuleExtFreemarker.java
rename to subdomains/freemarker/applib/src/main/java/org/apache/isis/subdomains/freemarker/applib/IsisModuleSubFreemarkerApplib.java
index 5454736..4e69c2a 100644
--- a/subdomains/freemarker/impl/src/main/java/org/apache/isis/extensions/freemarker/dom/IsisModuleExtFreemarker.java
+++ b/subdomains/freemarker/applib/src/main/java/org/apache/isis/subdomains/freemarker/applib/IsisModuleSubFreemarkerApplib.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.freemarker.dom;
+package org.apache.isis.subdomains.freemarker.applib;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleExtFreemarker {
+public class IsisModuleSubFreemarkerApplib {
}
diff --git a/subdomains/freemarker/impl/pom.xml b/subdomains/freemarker/pom.xml
similarity index 75%
rename from subdomains/freemarker/impl/pom.xml
rename to subdomains/freemarker/pom.xml
index 2f29698..f3991d8 100644
--- a/subdomains/freemarker/impl/pom.xml
+++ b/subdomains/freemarker/pom.xml
@@ -18,20 +18,15 @@
<groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-freemarker-dom</artifactId>
- <name>Apache Isis Sub - Freemarker</name>
+ <artifactId>isis-subdomains-freemarker</artifactId>
+ <name>Apache Isis Sub - Freemarker (parent)</name>
<description>Integrates Freemarker Library</description>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.freemarker.dom</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/freemarker/dom</git-plugin.propertiesDir>
- </properties>
+ <modules>
+ <module>applib</module>
+ </modules>
- <dependencies>
-
- </dependencies>
</project>
diff --git a/subdomains/freemarker/impl/src/main/doc/antora.yml b/subdomains/freemarker/src/main/doc/antora.yml
similarity index 100%
rename from subdomains/freemarker/impl/src/main/doc/antora.yml
rename to subdomains/freemarker/src/main/doc/antora.yml
diff --git a/subdomains/freemarker/impl/src/main/doc/modules/freemarker/nav.adoc b/subdomains/freemarker/src/main/doc/modules/freemarker/nav.adoc
similarity index 100%
rename from subdomains/freemarker/impl/src/main/doc/modules/freemarker/nav.adoc
rename to subdomains/freemarker/src/main/doc/modules/freemarker/nav.adoc
diff --git a/subdomains/freemarker/impl/src/main/doc/modules/freemarker/pages/about.adoc b/subdomains/freemarker/src/main/doc/modules/freemarker/pages/about.adoc
similarity index 100%
rename from subdomains/freemarker/impl/src/main/doc/modules/freemarker/pages/about.adoc
rename to subdomains/freemarker/src/main/doc/modules/freemarker/pages/about.adoc
diff --git a/subdomains/freemarker/impl/src/main/doc/modules/freemarker/partials/module-nav.adoc b/subdomains/freemarker/src/main/doc/modules/freemarker/partials/module-nav.adoc
similarity index 100%
rename from subdomains/freemarker/impl/src/main/doc/modules/freemarker/partials/module-nav.adoc
rename to subdomains/freemarker/src/main/doc/modules/freemarker/partials/module-nav.adoc
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 8fbf1d3..fdafe7d 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -97,6 +97,12 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-freemarker-applib</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains-spring</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -126,11 +132,9 @@
<modules>
<module>base</module>
-<!--
<module>docx</module>
--->
-
<module>excel</module>
+ <module>freemarker</module>
<module>spring/impl</module>
[isis] 19/21: ISIS-2259: reorg xdocreport module
Posted by da...@apache.org.
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 f788b2577e3830dad95bae04a8b052c3e6f14dcf
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 10:24:28 2020 +0000
ISIS-2259: reorg xdocreport module
---
antora/playbooks/site-subdomains.yml | 2 +-
antora/playbooks/site.yml | 2 +-
subdomains/pom.xml | 5 ++--
subdomains/xdocreport/{impl => applib}/pom.xml | 10 +++----
.../applib/IsisModuleSubXDocReportApplib.java} | 4 +--
.../xdocreport/applib/service/OutputType.java | 6 ++++
.../applib/service}/XDocReportModel.java | 2 +-
.../applib/service}/XDocReportService.java | 2 +-
.../applib}/service/XDocReportServiceTest.java | 12 ++++----
.../applib/service}/example/Generate0Fields.java | 6 ++--
.../applib/service}/example/Generate1Docx.java | 6 ++--
.../applib/service}/example/Generate2Pdf.java | 2 +-
.../applib/service}/example/models/Developer.java | 2 +-
.../applib/service}/example/models/Project.java | 2 +-
.../example/models/ProjectDevelopersModel.java | 4 +--
.../example/template/Project-template.docx | Bin
.../service}/example/template/project.fields.xml | 0
.../extensions/xdocreport/dom/impl/OutputType.java | 6 ----
subdomains/xdocreport/pom.xml | 33 +++++++++++++++++++++
.../xdocreport/{impl => }/src/main/doc/antora.yml | 0
.../src/main/doc/modules/xdocreport/nav.adoc | 0
.../main/doc/modules/xdocreport/pages/about.adoc | 0
.../modules/xdocreport/partials/module-nav.adoc | 0
23 files changed, 68 insertions(+), 38 deletions(-)
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index f02c176..6b05fc2 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -38,7 +38,7 @@ content:
start_path: subdomains/spring/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/xdocreport/impl/src/main/doc # subdomains
+ start_path: subdomains/xdocreport/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/zip/impl/src/main/doc # subdomains
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 2eab173..803986f 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -212,7 +212,7 @@ content:
start_path: subdomains/spring/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/xdocreport/impl/src/main/doc # subdomains
+ start_path: subdomains/xdocreport/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/zip/impl/src/main/doc # subdomains
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 6ce8e1a..9f831ca 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -121,7 +121,7 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-xdocreport-dom</artifactId>
+ <artifactId>isis-subdomains-xdocreport-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -150,8 +150,7 @@
<module>ognl</module>
<module>pdfbox</module>
<module>spring</module>
-
- <module>xdocreport/impl</module>
+ <module>xdocreport</module>
<module>zip/impl</module>
</modules>
diff --git a/subdomains/xdocreport/impl/pom.xml b/subdomains/xdocreport/applib/pom.xml
similarity index 90%
rename from subdomains/xdocreport/impl/pom.xml
rename to subdomains/xdocreport/applib/pom.xml
index f61aa12..5799bbe 100644
--- a/subdomains/xdocreport/impl/pom.xml
+++ b/subdomains/xdocreport/applib/pom.xml
@@ -16,18 +16,16 @@
<parent>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
+ <artifactId>isis-subdomains-xdocreport</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-xdocreport-dom</artifactId>
+ <artifactId>isis-subdomains-xdocreport-applib</artifactId>
<name>Apache Isis Sub - xdocreport (applib)</name>
- <description>Integrates XDoc Report Library</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.xdocreport.dom</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/xdocreport/dom</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.subdomains.xdocreport.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/subdomains/xdocreport/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/IsisModuleExtXDocReport.java b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/IsisModuleSubXDocReportApplib.java
similarity index 90%
rename from subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/IsisModuleExtXDocReport.java
rename to subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/IsisModuleSubXDocReportApplib.java
index 38352eb..19cb83d 100644
--- a/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/IsisModuleExtXDocReport.java
+++ b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/IsisModuleSubXDocReportApplib.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.xdocreport.dom;
+package org.apache.isis.subdomains.xdocreport.applib;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleExtXDocReport {
+public class IsisModuleSubXDocReportApplib {
}
diff --git a/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/OutputType.java b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/OutputType.java
new file mode 100644
index 0000000..dfa4375
--- /dev/null
+++ b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/OutputType.java
@@ -0,0 +1,6 @@
+package org.apache.isis.subdomains.xdocreport.applib.service;
+
+public enum OutputType {
+ DOCX,
+ PDF
+}
diff --git a/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportModel.java b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportModel.java
similarity index 89%
rename from subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportModel.java
rename to subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportModel.java
index f4253d0..4124887 100644
--- a/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportModel.java
+++ b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportModel.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.xdocreport.dom.impl;
+package org.apache.isis.subdomains.xdocreport.applib.service;
import java.util.List;
import java.util.Map;
diff --git a/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportService.java b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportService.java
similarity index 98%
rename from subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportService.java
rename to subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportService.java
index 94703b4..f40dae0 100644
--- a/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/XDocReportService.java
+++ b/subdomains/xdocreport/applib/src/main/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportService.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.xdocreport.dom.impl;
+package org.apache.isis.subdomains.xdocreport.applib.service;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/service/XDocReportServiceTest.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
similarity index 77%
rename from subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/service/XDocReportServiceTest.java
rename to subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
index 6431ffe..e41ccf6 100644
--- a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/service/XDocReportServiceTest.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.xdocreport.dom.impl.service;
+package org.apache.isis.subdomains.xdocreport.applib.service;
import java.io.File;
import java.io.FileInputStream;
@@ -12,11 +12,11 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.apache.isis.extensions.xdocreport.dom.impl.OutputType;
-import org.apache.isis.extensions.xdocreport.dom.impl.XDocReportService;
-import org.apache.isis.extensions.xdocreport.dom.impl.example.models.Developer;
-import org.apache.isis.extensions.xdocreport.dom.impl.example.models.Project;
-import org.apache.isis.extensions.xdocreport.dom.impl.example.models.ProjectDevelopersModel;
+import org.apache.isis.subdomains.xdocreport.applib.service.OutputType;
+import org.apache.isis.subdomains.xdocreport.applib.service.XDocReportService;
+import org.apache.isis.subdomains.xdocreport.applib.service.example.models.Developer;
+import org.apache.isis.subdomains.xdocreport.applib.service.example.models.Project;
+import org.apache.isis.subdomains.xdocreport.applib.service.example.models.ProjectDevelopersModel;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import fr.opensagres.xdocreport.core.io.IOUtils;
diff --git a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate0Fields.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate0Fields.java
similarity index 83%
rename from subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate0Fields.java
rename to subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate0Fields.java
index e92e073..4063f6c 100644
--- a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate0Fields.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate0Fields.java
@@ -1,11 +1,11 @@
-package org.apache.isis.extensions.xdocreport.dom.impl.example;
+package org.apache.isis.subdomains.xdocreport.applib.service.example;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import org.apache.isis.extensions.xdocreport.dom.impl.example.models.Developer;
-import org.apache.isis.extensions.xdocreport.dom.impl.example.models.Project;
+import org.apache.isis.subdomains.xdocreport.applib.service.example.models.Developer;
+import org.apache.isis.subdomains.xdocreport.applib.service.example.models.Project;
import fr.opensagres.xdocreport.core.XDocReportException;
import fr.opensagres.xdocreport.template.TemplateEngineKind;
diff --git a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate1Docx.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate1Docx.java
similarity index 90%
rename from subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate1Docx.java
rename to subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate1Docx.java
index eb9d128..d396182 100644
--- a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate1Docx.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate1Docx.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.xdocreport.dom.impl.example;
+package org.apache.isis.subdomains.xdocreport.applib.service.example;
import java.io.File;
import java.io.FileInputStream;
@@ -9,8 +9,8 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
-import org.apache.isis.extensions.xdocreport.dom.impl.example.models.Developer;
-import org.apache.isis.extensions.xdocreport.dom.impl.example.models.Project;
+import org.apache.isis.subdomains.xdocreport.applib.service.example.models.Developer;
+import org.apache.isis.subdomains.xdocreport.applib.service.example.models.Project;
import fr.opensagres.xdocreport.core.XDocReportException;
import fr.opensagres.xdocreport.document.IXDocReport;
diff --git a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate2Pdf.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate2Pdf.java
similarity index 93%
rename from subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate2Pdf.java
rename to subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate2Pdf.java
index 03e05ea..2c259dd 100644
--- a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/Generate2Pdf.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/Generate2Pdf.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.xdocreport.dom.impl.example;
+package org.apache.isis.subdomains.xdocreport.applib.service.example;
import java.io.File;
import java.io.FileInputStream;
diff --git a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Developer.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/Developer.java
similarity index 66%
rename from subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Developer.java
rename to subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/Developer.java
index 1768a4e..0f887c0 100644
--- a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Developer.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/Developer.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.xdocreport.dom.impl.example.models;
+package org.apache.isis.subdomains.xdocreport.applib.service.example.models;
import lombok.Data;
diff --git a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Project.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/Project.java
similarity index 53%
rename from subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Project.java
rename to subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/Project.java
index b2c793a..0a3d07b 100644
--- a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/Project.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/Project.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.xdocreport.dom.impl.example.models;
+package org.apache.isis.subdomains.xdocreport.applib.service.example.models;
import lombok.Data;
diff --git a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/ProjectDevelopersModel.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/ProjectDevelopersModel.java
similarity index 76%
rename from subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/ProjectDevelopersModel.java
rename to subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/ProjectDevelopersModel.java
index 634856a..ce23c1a 100644
--- a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/models/ProjectDevelopersModel.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/models/ProjectDevelopersModel.java
@@ -1,11 +1,11 @@
-package org.apache.isis.extensions.xdocreport.dom.impl.example.models;
+package org.apache.isis.subdomains.xdocreport.applib.service.example.models;
import java.util.List;
import java.util.Map;
import com.google.common.collect.ImmutableMap;
-import org.apache.isis.extensions.xdocreport.dom.impl.XDocReportModel;
+import org.apache.isis.subdomains.xdocreport.applib.service.XDocReportModel;
import lombok.Data;
diff --git a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/Project-template.docx b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/template/Project-template.docx
similarity index 100%
rename from subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/Project-template.docx
rename to subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/template/Project-template.docx
diff --git a/subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/project.fields.xml b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/template/project.fields.xml
similarity index 100%
rename from subdomains/xdocreport/impl/src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/project.fields.xml
rename to subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/template/project.fields.xml
diff --git a/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/OutputType.java b/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/OutputType.java
deleted file mode 100644
index 276eeaa..0000000
--- a/subdomains/xdocreport/impl/src/main/java/org/apache/isis/extensions/xdocreport/dom/impl/OutputType.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.apache.isis.extensions.xdocreport.dom.impl;
-
-public enum OutputType {
- DOCX,
- PDF
-}
diff --git a/subdomains/xdocreport/pom.xml b/subdomains/xdocreport/pom.xml
new file mode 100644
index 0000000..8068baf
--- /dev/null
+++ b/subdomains/xdocreport/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>isis-subdomains-xdocreport</artifactId>
+ <name>Apache Isis Sub - xdocreport (parent)</name>
+ <description>Integrates XDoc Report Library</description>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>applib</module>
+ </modules>
+
+</project>
diff --git a/subdomains/xdocreport/impl/src/main/doc/antora.yml b/subdomains/xdocreport/src/main/doc/antora.yml
similarity index 100%
rename from subdomains/xdocreport/impl/src/main/doc/antora.yml
rename to subdomains/xdocreport/src/main/doc/antora.yml
diff --git a/subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/nav.adoc b/subdomains/xdocreport/src/main/doc/modules/xdocreport/nav.adoc
similarity index 100%
rename from subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/nav.adoc
rename to subdomains/xdocreport/src/main/doc/modules/xdocreport/nav.adoc
diff --git a/subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/pages/about.adoc b/subdomains/xdocreport/src/main/doc/modules/xdocreport/pages/about.adoc
similarity index 100%
rename from subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/pages/about.adoc
rename to subdomains/xdocreport/src/main/doc/modules/xdocreport/pages/about.adoc
diff --git a/subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/partials/module-nav.adoc b/subdomains/xdocreport/src/main/doc/modules/xdocreport/partials/module-nav.adoc
similarity index 100%
rename from subdomains/xdocreport/impl/src/main/doc/modules/xdocreport/partials/module-nav.adoc
rename to subdomains/xdocreport/src/main/doc/modules/xdocreport/partials/module-nav.adoc
[isis] 06/21: ISIS-2259: adds in parent module for cors extension
module
Posted by da...@apache.org.
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 885855899a9a1eeb14ee4c686da51908b8b8e949
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 06:49:03 2020 +0000
ISIS-2259: adds in parent module for cors extension module
---
extensions/pom.xml | 5 ++--
extensions/vro/cors/impl/pom.xml | 12 ++++----
.../IsisModuleExtCorsImpl.java} | 6 ++--
.../cors/{ => impl}/webmodule/WebModuleCors.java | 2 +-
extensions/vro/cors/{impl => }/pom.xml | 35 ++++++----------------
5 files changed, 20 insertions(+), 40 deletions(-)
diff --git a/extensions/pom.xml b/extensions/pom.xml
index d263c93..425bb44 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -122,7 +122,7 @@
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-cors</artifactId>
+ <artifactId>isis-extensions-cors-impl</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -140,9 +140,8 @@
<modules>
<module>security/secman</module>
<module>security/shiro-realm-ldap</module>
- <module>security/shiro-realm-ldap/impl</module>
- <module>vro/cors/impl</module>
+ <module>vro/cors</module>
<module>vw/exceldownload</module>
<module>vw/pdfjs</module>
diff --git a/extensions/vro/cors/impl/pom.xml b/extensions/vro/cors/impl/pom.xml
index f0297b9..672894a 100644
--- a/extensions/vro/cors/impl/pom.xml
+++ b/extensions/vro/cors/impl/pom.xml
@@ -16,18 +16,16 @@
<parent>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions</artifactId>
+ <artifactId>isis-extensions-cors</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
</parent>
- <artifactId>isis-extensions-cors</artifactId>
- <name>Apache Isis Ext - CORS</name>
- <description></description>
+ <artifactId>isis-extensions-cors-impl</artifactId>
+ <name>Apache Isis Ext - CORS (impl)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.cors</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/cors</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.cors.impl</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/cors/impl</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/IsisModuleExtCors.java b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImpl.java
similarity index 87%
rename from extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/IsisModuleExtCors.java
rename to extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImpl.java
index 9916454..d8edba6 100644
--- a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/IsisModuleExtCors.java
+++ b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/IsisModuleExtCorsImpl.java
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.cors;
+package org.apache.isis.extensions.cors.impl;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.cors.webmodule.WebModuleCors;
+import org.apache.isis.extensions.cors.impl.webmodule.WebModuleCors;
@Configuration
@Import({
// @Service's
WebModuleCors.class
})
-public class IsisModuleExtCors {
+public class IsisModuleExtCorsImpl {
}
diff --git a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/webmodule/WebModuleCors.java b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
similarity index 98%
rename from extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/webmodule/WebModuleCors.java
rename to extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
index b81bcb9..3f3d1d4 100644
--- a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/webmodule/WebModuleCors.java
+++ b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.cors.webmodule;
+package org.apache.isis.extensions.cors.impl.webmodule;
import java.util.List;
diff --git a/extensions/vro/cors/impl/pom.xml b/extensions/vro/cors/pom.xml
similarity index 63%
copy from extensions/vro/cors/impl/pom.xml
copy to extensions/vro/cors/pom.xml
index f0297b9..d7e968f 100644
--- a/extensions/vro/cors/impl/pom.xml
+++ b/extensions/vro/cors/pom.xml
@@ -18,36 +18,19 @@
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>isis-extensions-cors</artifactId>
- <name>Apache Isis Ext - CORS</name>
- <description></description>
+ <name>Apache Isis Ext - CORS (parent)</name>
+ <description>
+ Implementation of CORS Filter (using ebay filter)
+ </description>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.cors</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/cors</git-plugin.propertiesDir>
- </properties>
+ <packaging>pom</packaging>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webapp</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ebaysf.web</groupId>
- <artifactId>cors-filter</artifactId>
- </dependency>
-
- </dependencies>
+ <modules>
+ <module>impl</module>
+ </modules>
</project>
[isis] 01/21: ISIS-2062: combines the secman docs together.
Posted by da...@apache.org.
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 26afedd309e9733dfd8dff14dc9957308e2c6cf6
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 06:11:45 2020 +0000
ISIS-2062: combines the secman docs together.
---
antora/playbooks/site-security.yml | 15 ---------------
antora/playbooks/site.yml | 15 ---------------
extensions/security/secman/api/src/main/doc/antora.yml | 2 --
.../secman/api/src/main/doc/modules/api/nav.adoc | 1 -
.../src/main/doc/modules/api/partials/module-nav.adoc | 1 -
.../secman/encryption-jbcrypt/src/main/doc/antora.yml | 2 --
.../src/main/doc/modules/encryption-jbcrypt/nav.adoc | 1 -
.../modules/encryption-jbcrypt/partials/module-nav.adoc | 1 -
extensions/security/secman/model/src/main/doc/antora.yml | 2 --
.../secman/model/src/main/doc/modules/model/nav.adoc | 1 -
.../src/main/doc/modules/model/partials/module-nav.adoc | 1 -
.../secman/persistence-jdo/src/main/doc/antora.yml | 2 --
.../src/main/doc/modules/persistence-jdo/nav.adoc | 1 -
.../doc/modules/persistence-jdo/partials/module-nav.adoc | 1 -
.../security/secman/shiro-realm/src/main/doc/antora.yml | 2 --
.../src/main/doc/modules/realm-shiro/nav.adoc | 1 -
.../doc/modules/realm-shiro/partials/module-nav.adoc | 1 -
...saddons-security-module-realm-with-delegate-realm.PNG | Bin
...ure-shiro-to-use-isisaddons-security-module-realm.PNG | Bin
.../main/doc/modules/ROOT/pages/api.adoc} | 0
.../main/doc/modules/ROOT/pages/jbcrypt-encryption.adoc} | 0
.../main/doc/modules/ROOT/pages/jdo-persistence.adoc} | 0
.../main/doc/modules/ROOT/pages/model.adoc} | 0
.../main/doc/modules/ROOT/pages/shiro-realm.adoc} | 0
.../main/doc/modules/ROOT/partials/component-nav.adoc | 1 -
.../src/main/doc/modules/ROOT/partials/module-nav.adoc | 5 +++++
26 files changed, 5 insertions(+), 51 deletions(-)
diff --git a/antora/playbooks/site-security.yml b/antora/playbooks/site-security.yml
index ec3676f..2557843 100644
--- a/antora/playbooks/site-security.yml
+++ b/antora/playbooks/site-security.yml
@@ -34,21 +34,6 @@ content:
start_path: extensions/security/secman/src/main/doc # security
branches: HEAD
- url: .
- start_path: extensions/security/secman/api/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: extensions/security/secman/encryption-jbcrypt/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: extensions/security/secman/model/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: extensions/security/secman/persistence-jdo/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: extensions/security/secman/shiro-realm/src/main/doc # security
- branches: HEAD
- - url: .
start_path: extensions/security/shiro-realm-ldap/src/main/doc # security
branches: HEAD
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index f82b4f8..434fcd9 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -127,21 +127,6 @@ content:
start_path: extensions/security/secman/src/main/doc # security
branches: HEAD
- url: .
- start_path: extensions/security/secman/api/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: extensions/security/secman/encryption-jbcrypt/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: extensions/security/secman/model/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: extensions/security/secman/persistence-jdo/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: extensions/security/secman/shiro-realm/src/main/doc # security
- branches: HEAD
- - url: .
start_path: extensions/security/shiro-realm-ldap/src/main/doc # security
branches: HEAD
diff --git a/extensions/security/secman/api/src/main/doc/antora.yml b/extensions/security/secman/api/src/main/doc/antora.yml
deleted file mode 100644
index a6ae987..0000000
--- a/extensions/security/secman/api/src/main/doc/antora.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: secman
-version: master
diff --git a/extensions/security/secman/api/src/main/doc/modules/api/nav.adoc b/extensions/security/secman/api/src/main/doc/modules/api/nav.adoc
deleted file mode 100644
index d87dda7..0000000
--- a/extensions/security/secman/api/src/main/doc/modules/api/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::secman:ROOT:partial$component-nav.adoc[]
\ No newline at end of file
diff --git a/extensions/security/secman/api/src/main/doc/modules/api/partials/module-nav.adoc b/extensions/security/secman/api/src/main/doc/modules/api/partials/module-nav.adoc
deleted file mode 100644
index c251b74..0000000
--- a/extensions/security/secman/api/src/main/doc/modules/api/partials/module-nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:secman:api:about.adoc[API]
diff --git a/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml b/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml
deleted file mode 100644
index a6ae987..0000000
--- a/extensions/security/secman/encryption-jbcrypt/src/main/doc/antora.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: secman
-version: master
diff --git a/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/nav.adoc b/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/nav.adoc
deleted file mode 100644
index d87dda7..0000000
--- a/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::secman:ROOT:partial$component-nav.adoc[]
\ No newline at end of file
diff --git a/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/partials/module-nav.adoc b/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/partials/module-nav.adoc
deleted file mode 100644
index 4cc0808..0000000
--- a/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/partials/module-nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:secman:encryption-jbcrypt:about.adoc[JBCrypt Encryption]
diff --git a/extensions/security/secman/model/src/main/doc/antora.yml b/extensions/security/secman/model/src/main/doc/antora.yml
deleted file mode 100644
index a6ae987..0000000
--- a/extensions/security/secman/model/src/main/doc/antora.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: secman
-version: master
diff --git a/extensions/security/secman/model/src/main/doc/modules/model/nav.adoc b/extensions/security/secman/model/src/main/doc/modules/model/nav.adoc
deleted file mode 100644
index d87dda7..0000000
--- a/extensions/security/secman/model/src/main/doc/modules/model/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::secman:ROOT:partial$component-nav.adoc[]
\ No newline at end of file
diff --git a/extensions/security/secman/model/src/main/doc/modules/model/partials/module-nav.adoc b/extensions/security/secman/model/src/main/doc/modules/model/partials/module-nav.adoc
deleted file mode 100644
index a25cb9d..0000000
--- a/extensions/security/secman/model/src/main/doc/modules/model/partials/module-nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:secman:model:about.adoc[Model]
diff --git a/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml b/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml
deleted file mode 100644
index a6ae987..0000000
--- a/extensions/security/secman/persistence-jdo/src/main/doc/antora.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: secman
-version: master
diff --git a/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/nav.adoc b/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/nav.adoc
deleted file mode 100644
index d87dda7..0000000
--- a/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::secman:ROOT:partial$component-nav.adoc[]
\ No newline at end of file
diff --git a/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/partials/module-nav.adoc b/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/partials/module-nav.adoc
deleted file mode 100644
index a005b5c..0000000
--- a/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/partials/module-nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:secman:persistence-jdo:about.adoc[JDO Persistence]
diff --git a/extensions/security/secman/shiro-realm/src/main/doc/antora.yml b/extensions/security/secman/shiro-realm/src/main/doc/antora.yml
deleted file mode 100644
index a6ae987..0000000
--- a/extensions/security/secman/shiro-realm/src/main/doc/antora.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: secman
-version: master
diff --git a/extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/nav.adoc b/extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/nav.adoc
deleted file mode 100644
index d87dda7..0000000
--- a/extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::secman:ROOT:partial$component-nav.adoc[]
\ No newline at end of file
diff --git a/extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/partials/module-nav.adoc b/extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/partials/module-nav.adoc
deleted file mode 100644
index b0a2d25..0000000
--- a/extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/partials/module-nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:secman:realm-shiro:about.adoc[Realm (for Shiro)]
diff --git a/extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG b/extensions/security/secman/src/main/doc/modules/ROOT/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
similarity index 100%
rename from extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
rename to extensions/security/secman/src/main/doc/modules/ROOT/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
diff --git a/extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm.PNG b/extensions/security/secman/src/main/doc/modules/ROOT/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG
similarity index 100%
rename from extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm.PNG
rename to extensions/security/secman/src/main/doc/modules/ROOT/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG
diff --git a/extensions/security/secman/api/src/main/doc/modules/api/pages/about.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/pages/api.adoc
similarity index 100%
rename from extensions/security/secman/api/src/main/doc/modules/api/pages/about.adoc
rename to extensions/security/secman/src/main/doc/modules/ROOT/pages/api.adoc
diff --git a/extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/pages/about.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/pages/jbcrypt-encryption.adoc
similarity index 100%
rename from extensions/security/secman/encryption-jbcrypt/src/main/doc/modules/encryption-jbcrypt/pages/about.adoc
rename to extensions/security/secman/src/main/doc/modules/ROOT/pages/jbcrypt-encryption.adoc
diff --git a/extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/pages/about.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/pages/jdo-persistence.adoc
similarity index 100%
rename from extensions/security/secman/persistence-jdo/src/main/doc/modules/persistence-jdo/pages/about.adoc
rename to extensions/security/secman/src/main/doc/modules/ROOT/pages/jdo-persistence.adoc
diff --git a/extensions/security/secman/model/src/main/doc/modules/model/pages/about.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/pages/model.adoc
similarity index 100%
rename from extensions/security/secman/model/src/main/doc/modules/model/pages/about.adoc
rename to extensions/security/secman/src/main/doc/modules/ROOT/pages/model.adoc
diff --git a/extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/pages/about.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/pages/shiro-realm.adoc
similarity index 100%
rename from extensions/security/secman/shiro-realm/src/main/doc/modules/realm-shiro/pages/about.adoc
rename to extensions/security/secman/src/main/doc/modules/ROOT/pages/shiro-realm.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/partials/component-nav.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/partials/component-nav.adoc
index 814c28c..422ebe1 100644
--- a/extensions/security/secman/src/main/doc/modules/ROOT/partials/component-nav.adoc
+++ b/extensions/security/secman/src/main/doc/modules/ROOT/partials/component-nav.adoc
@@ -1,7 +1,6 @@
include::secman:ROOT:partial$module-nav.adoc[]
include::secman:api:partial$module-nav.adoc[]
include::secman:model:partial$module-nav.adoc[]
-include::secman:realm-shiro:partial$module-nav.adoc[]
include::secman:persistence-jdo:partial$module-nav.adoc[]
include::secman:encryption-jbcrypt:partial$module-nav.adoc[]
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/partials/module-nav.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/partials/module-nav.adoc
index e69de29..0aa7514 100644
--- a/extensions/security/secman/src/main/doc/modules/ROOT/partials/module-nav.adoc
+++ b/extensions/security/secman/src/main/doc/modules/ROOT/partials/module-nav.adoc
@@ -0,0 +1,5 @@
+* xref:secman:ROOT:api.adoc[API]
+* xref:secman:ROOT:model.adoc[Model]
+* xref:secman:ROOT:jbcrypt-encryption.adoc[JBCrypt Encryption]
+* xref:secman:ROOT:jdo-persistence.adoc[JDO Persistence]
+* xref:secman:ROOT:shiro-realm.adoc[Realm (for Shiro)]
[isis] 04/21: ISIS-2062: moves other modules from extensions to
pjdo, vw and vro
Posted by da...@apache.org.
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 6837ce10c643ba647929aeef7e931f1aabe362d9
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 06:36:55 2020 +0000
ISIS-2062: moves other modules from extensions to pjdo, vw and vro
---
.../extensions/modules/ROOT/partials/component-nav.adoc | 15 ++++++++++++---
.../security/modules/ROOT/partials/component-nav.adoc | 2 +-
.../src/main/doc/modules/ROOT/partials/component-nav.adoc | 3 +++
.../src/main/doc/modules/ROOT/partials/component-nav.adoc | 2 +-
.../src/main/doc/modules/ROOT/partials/component-nav.adoc | 4 ++++
.../persistence/jdo/flywayjdo/src/main/doc/antora.yml | 2 +-
.../jdo/flywayjdo/src/main/doc/modules/flywayjdo/nav.adoc | 2 +-
.../main/doc/modules/flywayjdo/partials/module-nav.adoc | 2 +-
extensions/vro/cors/src/main/doc/antora.yml | 2 +-
extensions/vro/cors/src/main/doc/modules/cors/nav.adoc | 2 +-
.../src/main/doc/modules/cors/partials/module-nav.adoc | 2 +-
extensions/vw/exceldownload/src/main/doc/antora.yml | 2 +-
extensions/vw/pdfjs/src/main/doc/antora.yml | 2 +-
.../src/main/doc/modules/pdfjs/partials/module-nav.adoc | 2 +-
14 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
index a10d993..0d5cc71 100644
--- a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
@@ -1,9 +1,18 @@
include::extensions:ROOT:partial$module-nav.adoc[]
* JDO Persistence
-include::extensions:flywayjdo:partial$module-nav.adoc[]
+
+include::pjdo:flywayjdo:partial$module-nav.adoc[]
+
+* Security
+include::security:shiro-realm-ldap:partial$module-nav.adoc[]
+include::security:secman:partial$module-nav.adoc[]
+
+* Restful Objects Viewer
+
+include::vro:cors:partial$module-nav.adoc[]
* Wicket Viewer
-include::extensions:exceldownload:partial$module-nav.adoc[]
-include::extensions:pdfjs:partial$module-nav.adoc[]
+include::vw:exceldownload:partial$module-nav.adoc[]
+include::vw:pdfjs:partial$module-nav.adoc[]
diff --git a/antora/components/security/modules/ROOT/partials/component-nav.adoc b/antora/components/security/modules/ROOT/partials/component-nav.adoc
index eea4ff8..ddfab02 100644
--- a/antora/components/security/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/security/modules/ROOT/partials/component-nav.adoc
@@ -6,5 +6,5 @@ include::security:keycloak:partial$module-nav.adoc[]
include::security:ROOT:partial$module-nav2.adoc[]
* Extensions
-include::security:secman:partial$module-nav.adoc[]
include::security:shiro-realm-ldap:partial$module-nav.adoc[]
+include::security:secman:partial$module-nav.adoc[]
diff --git a/core/persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc b/core/persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc
index e56cfd1..6807b58 100644
--- a/core/persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc
+++ b/core/persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc
@@ -1 +1,4 @@
include::pjdo:ROOT:partial$module-nav.adoc[]
+
+* Extensions
+include::pjdo:flywayjdo:partial$module-nav.adoc[]
diff --git a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/component-nav.adoc b/core/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/component-nav.adoc
index 750f7e6..75aaff8 100644
--- a/core/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/component-nav.adoc
+++ b/core/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/component-nav.adoc
@@ -2,4 +2,4 @@ include::vro:ROOT:partial$module-nav.adoc[]
include::vro:jaxrs-resteasy-4:partial$module-nav.adoc[]
* Extensions
-** xref:vro:restclient:about.adoc[REST Client]
+include::vro:cors:partial$module-nav.adoc[]
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/partials/component-nav.adoc b/core/viewers/wicket/src/main/doc/modules/ROOT/partials/component-nav.adoc
index f3d4c85..8fac32c 100644
--- a/core/viewers/wicket/src/main/doc/modules/ROOT/partials/component-nav.adoc
+++ b/core/viewers/wicket/src/main/doc/modules/ROOT/partials/component-nav.adoc
@@ -1,2 +1,6 @@
include::vw:ROOT:partial$module-nav.adoc[]
+* Extensions
+include::vw:exceldownload:partial$module-nav.adoc[]
+include::vw:pdfjs:partial$module-nav.adoc[]
+
diff --git a/extensions/persistence/jdo/flywayjdo/src/main/doc/antora.yml b/extensions/persistence/jdo/flywayjdo/src/main/doc/antora.yml
index eeeeb1e..e805b25 100644
--- a/extensions/persistence/jdo/flywayjdo/src/main/doc/antora.yml
+++ b/extensions/persistence/jdo/flywayjdo/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: pjdo
version: master
diff --git a/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/nav.adoc b/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/nav.adoc
index 0d9fa23..4763d68 100644
--- a/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/nav.adoc
+++ b/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/nav.adoc
@@ -1,2 +1,2 @@
-include::pjdo:flywayjdo:partial$component-nav.adoc[]
+include::pjdo:ROOT:partial$component-nav.adoc[]
diff --git a/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/partials/module-nav.adoc b/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/partials/module-nav.adoc
index 13c46d1..dd0d54b 100644
--- a/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/partials/module-nav.adoc
+++ b/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-** xref:extensions:flywayjdo:about.adoc[Flyway for JDO]
+** xref:pjdo:flywayjdo:about.adoc[Flyway for JDO]
diff --git a/extensions/vro/cors/src/main/doc/antora.yml b/extensions/vro/cors/src/main/doc/antora.yml
index eeeeb1e..576eb80 100644
--- a/extensions/vro/cors/src/main/doc/antora.yml
+++ b/extensions/vro/cors/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: vro
version: master
diff --git a/extensions/vro/cors/src/main/doc/modules/cors/nav.adoc b/extensions/vro/cors/src/main/doc/modules/cors/nav.adoc
index e63c989..e4ac9a3 100644
--- a/extensions/vro/cors/src/main/doc/modules/cors/nav.adoc
+++ b/extensions/vro/cors/src/main/doc/modules/cors/nav.adoc
@@ -1,2 +1,2 @@
-include::vw:ROOT:partial$component-nav.adoc[]
+include::vro:ROOT:partial$component-nav.adoc[]
diff --git a/extensions/vro/cors/src/main/doc/modules/cors/partials/module-nav.adoc b/extensions/vro/cors/src/main/doc/modules/cors/partials/module-nav.adoc
index 2f3a6aa..8fd27ec 100644
--- a/extensions/vro/cors/src/main/doc/modules/cors/partials/module-nav.adoc
+++ b/extensions/vro/cors/src/main/doc/modules/cors/partials/module-nav.adoc
@@ -1,2 +1,2 @@
-* xref:vw:sse:about.adoc[SSE (Extension)]
+** xref:vw:vro:about.adoc[CORS]
diff --git a/extensions/vw/exceldownload/src/main/doc/antora.yml b/extensions/vw/exceldownload/src/main/doc/antora.yml
index eeeeb1e..cb832ae 100644
--- a/extensions/vw/exceldownload/src/main/doc/antora.yml
+++ b/extensions/vw/exceldownload/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: vw
version: master
diff --git a/extensions/vw/pdfjs/src/main/doc/antora.yml b/extensions/vw/pdfjs/src/main/doc/antora.yml
index eeeeb1e..cb832ae 100644
--- a/extensions/vw/pdfjs/src/main/doc/antora.yml
+++ b/extensions/vw/pdfjs/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: vw
version: master
diff --git a/extensions/vw/pdfjs/src/main/doc/modules/pdfjs/partials/module-nav.adoc b/extensions/vw/pdfjs/src/main/doc/modules/pdfjs/partials/module-nav.adoc
index 4472fc7..90019e5 100644
--- a/extensions/vw/pdfjs/src/main/doc/modules/pdfjs/partials/module-nav.adoc
+++ b/extensions/vw/pdfjs/src/main/doc/modules/pdfjs/partials/module-nav.adoc
@@ -1,2 +1,2 @@
-** xref:extensions:pdfjs:about.adoc[pdf.js]
+** xref:vw:pdfjs:about.adoc[pdf.js]
[isis] 13/21: ISIS-2062: moves base subdomains doc
Posted by da...@apache.org.
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 805156b03295183dc62f0ddf4ddad644d3acde66
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 07:15:37 2020 +0000
ISIS-2062: moves base subdomains doc
---
antora/playbooks/site-subdomains.yml | 2 +-
antora/playbooks/site.yml | 2 +-
subdomains/base/{applib => }/src/main/doc/antora.yml | 0
subdomains/base/{applib => }/src/main/doc/modules/base/nav.adoc | 0
subdomains/base/{applib => }/src/main/doc/modules/base/pages/about.adoc | 0
.../{applib => }/src/main/doc/modules/base/partials/module-nav.adoc | 0
6 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index cda7ae8..4a99fe7 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -17,7 +17,7 @@ content:
# subdomains
- url: .
- start_path: subdomains/base/impl/src/main/doc # subdomains
+ start_path: subdomains/base/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/docx/impl/src/main/doc # subdomains
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 4f66a05..edea0db 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -191,7 +191,7 @@ content:
# subdomains
- url: .
- start_path: subdomains/base/impl/src/main/doc # subdomains
+ start_path: subdomains/base/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/docx/impl/src/main/doc # subdomains
diff --git a/subdomains/base/applib/src/main/doc/antora.yml b/subdomains/base/src/main/doc/antora.yml
similarity index 100%
rename from subdomains/base/applib/src/main/doc/antora.yml
rename to subdomains/base/src/main/doc/antora.yml
diff --git a/subdomains/base/applib/src/main/doc/modules/base/nav.adoc b/subdomains/base/src/main/doc/modules/base/nav.adoc
similarity index 100%
rename from subdomains/base/applib/src/main/doc/modules/base/nav.adoc
rename to subdomains/base/src/main/doc/modules/base/nav.adoc
diff --git a/subdomains/base/applib/src/main/doc/modules/base/pages/about.adoc b/subdomains/base/src/main/doc/modules/base/pages/about.adoc
similarity index 100%
rename from subdomains/base/applib/src/main/doc/modules/base/pages/about.adoc
rename to subdomains/base/src/main/doc/modules/base/pages/about.adoc
diff --git a/subdomains/base/applib/src/main/doc/modules/base/partials/module-nav.adoc b/subdomains/base/src/main/doc/modules/base/partials/module-nav.adoc
similarity index 100%
rename from subdomains/base/applib/src/main/doc/modules/base/partials/module-nav.adoc
rename to subdomains/base/src/main/doc/modules/base/partials/module-nav.adoc
[isis] 14/21: ISIS-2259: adds parent for docx subdomain.
Posted by da...@apache.org.
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 7083dd480481c6dc8b53997670828f702c4d3d54
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 08:59:19 2020 +0000
ISIS-2259: adds parent for docx subdomain.
Also removes dependency on core-applib to
---
antora/playbooks/site-subdomains.yml | 2 +-
antora/playbooks/site.yml | 2 +-
core/schema/pom.xml | 6 ++++++
.../java/org/apache/isis/schema/IsisModuleSchema.java | 6 ------
.../schema/jaxbadapters/JodaDateTimeStringAdapter.java | 3 +--
.../schema/jaxbadapters/JodaLocalDateStringAdapter.java | 4 +---
.../jaxbadapters/JodaLocalDateTimeStringAdapter.java | 4 +---
.../schema/jaxbadapters/JodaLocalTimeStringAdapter.java | 4 +---
...sModuleExtBase.java => IsisModuleSubBaseApplib.java} | 2 +-
subdomains/docx/{impl => applib}/pom.xml | 17 +++++++++--------
.../docx/applib/IsisModuleSubDocxApplib.java} | 5 ++---
subdomains/docx/{impl => }/pom.xml | 16 +++++-----------
subdomains/docx/{impl => }/src/main/doc/antora.yml | 0
.../docx/{impl => }/src/main/doc/modules/docx/nav.adoc | 0
.../src/main/doc/modules/docx/pages/about.adoc | 0
.../src/main/doc/modules/docx/partials/module-nav.adoc | 0
subdomains/pom.xml | 10 ++++++++++
17 files changed, 39 insertions(+), 42 deletions(-)
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index 4a99fe7..26a1050 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -20,7 +20,7 @@ content:
start_path: subdomains/base/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/docx/impl/src/main/doc # subdomains
+ start_path: subdomains/docx/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/excel/impl/src/main/doc # subdomains
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index edea0db..4580422 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -194,7 +194,7 @@ content:
start_path: subdomains/base/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/docx/impl/src/main/doc # subdomains
+ start_path: subdomains/docx/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/excel/impl/src/main/doc # subdomains
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index 4169094..39eb8da 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -34,10 +34,16 @@
</properties>
<dependencies>
+<!--
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-commons</artifactId>
</dependency>
+-->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
diff --git a/core/schema/src/main/java/org/apache/isis/schema/IsisModuleSchema.java b/core/schema/src/main/java/org/apache/isis/schema/IsisModuleSchema.java
index e5c361d..312559b 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/IsisModuleSchema.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/IsisModuleSchema.java
@@ -21,13 +21,7 @@ package org.apache.isis.schema;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.commons.IsisModuleCommons;
-
@Configuration
-@Import({
- IsisModuleCommons.class
-})
public class IsisModuleSchema {
-
}
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java
index facaa11..a342e4f 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java
@@ -24,7 +24,6 @@ import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
-import org.apache.isis.commons.internal.base._Strings;
/**
* Note: not actually registered as a JAXB adapter.
@@ -36,7 +35,7 @@ public final class JodaDateTimeStringAdapter {
private static DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
public static DateTime parse(final String dateTimeStr) {
- return !_Strings.isNullOrEmpty(dateTimeStr) ? formatter.parseDateTime(dateTimeStr) : null;
+ return !Strings.isNullOrEmpty(dateTimeStr) ? formatter.parseDateTime(dateTimeStr) : null;
}
public static String print(final DateTime date) {
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java
index b708493..8cad02d 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java
@@ -22,8 +22,6 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.joda.time.LocalDate;
-import org.apache.isis.commons.internal.base._Strings;
-
/**
* Note: not actually registered as a JAXB adapter.
*/
@@ -32,7 +30,7 @@ public final class JodaLocalDateStringAdapter {
}
public static LocalDate parse(final String date) {
- if (_Strings.isNullOrEmpty(date)) {
+ if (Strings.isNullOrEmpty(date)) {
return null;
}
return LocalDate.parse(date);
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java
index ec7fb21..f571dd7 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java
@@ -22,8 +22,6 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.joda.time.LocalDateTime;
-import org.apache.isis.commons.internal.base._Strings;
-
/**
* Note: not actually registered as a JAXB adapter.
*/
@@ -32,7 +30,7 @@ public final class JodaLocalDateTimeStringAdapter {
}
public static LocalDateTime parse(final String localDateTimeStr) {
- if (_Strings.isNullOrEmpty(localDateTimeStr)) {
+ if (Strings.isNullOrEmpty(localDateTimeStr)) {
return null;
}
return LocalDateTime.parse(localDateTimeStr);
diff --git a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java
index ebbc743..47a600a 100644
--- a/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java
+++ b/core/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java
@@ -22,8 +22,6 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.joda.time.LocalTime;
-import org.apache.isis.commons.internal.base._Strings;
-
/**
* Note: not actually registered as a JAXB adapter.
*/
@@ -32,7 +30,7 @@ public final class JodaLocalTimeStringAdapter {
}
public static LocalTime parse(final String localTimeStr) {
- if (_Strings.isNullOrEmpty(localTimeStr)) {
+ if (Strings.isNullOrEmpty(localTimeStr)) {
return null;
}
return LocalTime.parse(localTimeStr);
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleExtBase.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleSubBaseApplib.java
similarity index 76%
rename from subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleExtBase.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleSubBaseApplib.java
index 4998757..0e82dcd 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleExtBase.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/IsisModuleSubBaseApplib.java
@@ -3,5 +3,5 @@ package org.apache.isis.subdomains.base.applib;
import org.springframework.context.annotation.Configuration;
@Configuration
-public class IsisModuleExtBase {
+public class IsisModuleSubBaseApplib {
}
diff --git a/subdomains/docx/impl/pom.xml b/subdomains/docx/applib/pom.xml
similarity index 75%
copy from subdomains/docx/impl/pom.xml
copy to subdomains/docx/applib/pom.xml
index d362e1b..7270f29 100644
--- a/subdomains/docx/impl/pom.xml
+++ b/subdomains/docx/applib/pom.xml
@@ -16,22 +16,23 @@
<parent>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
+ <artifactId>isis-subdomains-docx</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-docx-dom</artifactId>
- <name>Apache Isis Sub - Docx</name>
- <description>Uses the Apache POI library for mail merge functions of .docx Word documents</description>
+ <artifactId>isis-subdomains-docx-applib</artifactId>
+ <name>Apache Isis Sub - Docx (applib)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.docx.dom</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/docx/dom</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.subdomains.docx.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/subdomains/docx/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
-
+ <dependency>
+ <groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-base-applib</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/subdomains/docx/impl/src/main/java/org/apache/isis/extensions/docx/dom/IsisModuleExtDocx.java b/subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/IsisModuleSubDocxApplib.java
similarity index 91%
rename from subdomains/docx/impl/src/main/java/org/apache/isis/extensions/docx/dom/IsisModuleExtDocx.java
rename to subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/IsisModuleSubDocxApplib.java
index 1bbf415..a01a597 100644
--- a/subdomains/docx/impl/src/main/java/org/apache/isis/extensions/docx/dom/IsisModuleExtDocx.java
+++ b/subdomains/docx/applib/src/main/java/org/apache/isis/subdomains/docx/applib/IsisModuleSubDocxApplib.java
@@ -16,13 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.docx.dom;
+package org.apache.isis.subdomains.docx.applib;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
-@ComponentScan
-public class IsisModuleExtDocx {
+public class IsisModuleSubDocxApplib {
}
diff --git a/subdomains/docx/impl/pom.xml b/subdomains/docx/pom.xml
similarity index 77%
rename from subdomains/docx/impl/pom.xml
rename to subdomains/docx/pom.xml
index d362e1b..1597af8 100644
--- a/subdomains/docx/impl/pom.xml
+++ b/subdomains/docx/pom.xml
@@ -18,20 +18,14 @@
<groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-docx-dom</artifactId>
- <name>Apache Isis Sub - Docx</name>
+ <artifactId>isis-subdomains-docx</artifactId>
+ <name>Apache Isis Sub - Docx (parent)</name>
<description>Uses the Apache POI library for mail merge functions of .docx Word documents</description>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.docx.dom</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/docx/dom</git-plugin.propertiesDir>
- </properties>
-
- <dependencies>
-
- </dependencies>
+ <modules>
+ <module>applib</module>
+ </modules>
</project>
diff --git a/subdomains/docx/impl/src/main/doc/antora.yml b/subdomains/docx/src/main/doc/antora.yml
similarity index 100%
rename from subdomains/docx/impl/src/main/doc/antora.yml
rename to subdomains/docx/src/main/doc/antora.yml
diff --git a/subdomains/docx/impl/src/main/doc/modules/docx/nav.adoc b/subdomains/docx/src/main/doc/modules/docx/nav.adoc
similarity index 100%
rename from subdomains/docx/impl/src/main/doc/modules/docx/nav.adoc
rename to subdomains/docx/src/main/doc/modules/docx/nav.adoc
diff --git a/subdomains/docx/impl/src/main/doc/modules/docx/pages/about.adoc b/subdomains/docx/src/main/doc/modules/docx/pages/about.adoc
similarity index 100%
rename from subdomains/docx/impl/src/main/doc/modules/docx/pages/about.adoc
rename to subdomains/docx/src/main/doc/modules/docx/pages/about.adoc
diff --git a/subdomains/docx/impl/src/main/doc/modules/docx/partials/module-nav.adoc b/subdomains/docx/src/main/doc/modules/docx/partials/module-nav.adoc
similarity index 100%
rename from subdomains/docx/impl/src/main/doc/modules/docx/partials/module-nav.adoc
rename to subdomains/docx/src/main/doc/modules/docx/partials/module-nav.adoc
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 40338bc..3544fbf 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -70,6 +70,12 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-docx-applib</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains-excel-dom</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -116,6 +122,10 @@
<module>base</module>
<!--
+ <module>docx</module>
+-->
+
+<!--
<module>excel/fixture</module>
<module>excel/integtests</module>
-->
[isis] 08/21: ISIS-2259: adds in parent module for restclient and
jaxrsclient (in mappings)
Posted by da...@apache.org.
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 3c45d34c7eef5d1f077f5e9a45321d32e6a24de2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 07:05:13 2020 +0000
ISIS-2259: adds in parent module for restclient and jaxrsclient (in mappings)
---
examples/smoketests/pom.xml | 2 +-
mappings/jaxrsclient/{impl => api}/pom.xml | 14 +++++--------
.../api}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/jaxrsclient/nav.adoc | 0
.../main/doc/modules/jaxrsclient/pages/about.adoc | 0
.../modules/jaxrsclient/partials/module-nav.adoc | 0
.../api/IsisModuleExtJaxRsClientApi.java} | 4 ++--
mappings/jaxrsclient/{impl => }/pom.xml | 24 ++++++----------------
mappings/pom.xml | 10 ++++-----
mappings/restclient/{impl => api}/pom.xml | 9 +++++++-
.../api}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/restclient/nav.adoc | 0
.../main/doc/modules/restclient/pages/about.adoc | 0
.../modules/restclient/partials/module-nav.adoc | 0
.../restclient/ActionParameterListBuilder.java | 0
.../restclient/IsisModuleExtRestClient.java | 0
.../isis/extensions/restclient/ResponseDigest.java | 0
.../isis/extensions/restclient/RestfulClient.java | 0
.../extensions/restclient/RestfulClientConfig.java | 0
.../restclient/RestfulClientException.java | 0
.../isis/extensions/restclient/ScalarValueDto.java | 0
.../restclient/auth/BasicAuthFilter.java | 0
.../restclient/log/RestfulLoggingFilter.java | 0
mappings/restclient/{impl => }/pom.xml | 20 +++++-------------
24 files changed, 31 insertions(+), 52 deletions(-)
diff --git a/examples/smoketests/pom.xml b/examples/smoketests/pom.xml
index 4b71911..62b6289 100644
--- a/examples/smoketests/pom.xml
+++ b/examples/smoketests/pom.xml
@@ -80,7 +80,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings-restclient</artifactId>
+ <artifactId>isis-mappings-restclient-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
diff --git a/mappings/jaxrsclient/impl/pom.xml b/mappings/jaxrsclient/api/pom.xml
similarity index 82%
copy from mappings/jaxrsclient/impl/pom.xml
copy to mappings/jaxrsclient/api/pom.xml
index ff9d914..1c7ee0b 100644
--- a/mappings/jaxrsclient/impl/pom.xml
+++ b/mappings/jaxrsclient/api/pom.xml
@@ -16,23 +16,19 @@
<parent>
<groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings</artifactId>
+ <artifactId>isis-mappings-jaxrsclient</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-mappings-jaxrsclient-impl</artifactId>
- <name>Apache Isis Map - JaxRS Client</name>
-
- <description>Integrates JaxRS Client Library</description>
+ <artifactId>isis-mappings-jaxrsclient-api</artifactId>
+ <name>Apache Isis Map - JaxRS Client (api)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.mappings.jaxrsclient.impl</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/mappings/jaxrsclient/impl</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.mappings.jaxrsclient.api</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/mappings/jaxrsclient/api</git-plugin.propertiesDir>
</properties>
<dependencies>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
diff --git a/mappings/restclient/impl/src/main/doc/antora.yml b/mappings/jaxrsclient/api/src/main/doc/antora.yml
similarity index 100%
rename from mappings/restclient/impl/src/main/doc/antora.yml
rename to mappings/jaxrsclient/api/src/main/doc/antora.yml
diff --git a/mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/nav.adoc b/mappings/jaxrsclient/api/src/main/doc/modules/jaxrsclient/nav.adoc
similarity index 100%
rename from mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/nav.adoc
rename to mappings/jaxrsclient/api/src/main/doc/modules/jaxrsclient/nav.adoc
diff --git a/mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/pages/about.adoc b/mappings/jaxrsclient/api/src/main/doc/modules/jaxrsclient/pages/about.adoc
similarity index 100%
rename from mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/pages/about.adoc
rename to mappings/jaxrsclient/api/src/main/doc/modules/jaxrsclient/pages/about.adoc
diff --git a/mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc b/mappings/jaxrsclient/api/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc
similarity index 100%
rename from mappings/jaxrsclient/impl/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc
rename to mappings/jaxrsclient/api/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc
diff --git a/mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/IsisModuleExtJaxRsClientImpl.java b/mappings/jaxrsclient/api/src/main/java/org/apache/isis/extensions/jaxrsclient/api/IsisModuleExtJaxRsClientApi.java
similarity index 91%
rename from mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/IsisModuleExtJaxRsClientImpl.java
rename to mappings/jaxrsclient/api/src/main/java/org/apache/isis/extensions/jaxrsclient/api/IsisModuleExtJaxRsClientApi.java
index af8a507..57b4594 100644
--- a/mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/IsisModuleExtJaxRsClientImpl.java
+++ b/mappings/jaxrsclient/api/src/main/java/org/apache/isis/extensions/jaxrsclient/api/IsisModuleExtJaxRsClientApi.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.jaxrsclient.impl;
+package org.apache.isis.extensions.jaxrsclient.api;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleExtJaxRsClientImpl {
+public class IsisModuleExtJaxRsClientApi {
}
diff --git a/mappings/jaxrsclient/impl/pom.xml b/mappings/jaxrsclient/pom.xml
similarity index 68%
rename from mappings/jaxrsclient/impl/pom.xml
rename to mappings/jaxrsclient/pom.xml
index ff9d914..22a32b9 100644
--- a/mappings/jaxrsclient/impl/pom.xml
+++ b/mappings/jaxrsclient/pom.xml
@@ -18,27 +18,15 @@
<groupId>org.apache.isis.mappings</groupId>
<artifactId>isis-mappings</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-mappings-jaxrsclient-impl</artifactId>
- <name>Apache Isis Map - JaxRS Client</name>
-
+ <artifactId>isis-mappings-jaxrsclient</artifactId>
+ <name>Apache Isis Map - JaxRS Client (parent)</name>
<description>Integrates JaxRS Client Library</description>
+ <packaging>pom</packaging>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.mappings.jaxrsclient.impl</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/mappings/jaxrsclient/impl</git-plugin.propertiesDir>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>5.2.2.RELEASE</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
+ <modules>
+ <module>api</module>
+ </modules>
</project>
diff --git a/mappings/pom.xml b/mappings/pom.xml
index 56a086d..32953e7 100644
--- a/mappings/pom.xml
+++ b/mappings/pom.xml
@@ -64,13 +64,13 @@
<dependency>
<groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings-restclient</artifactId>
+ <artifactId>isis-mappings-restclient-api</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings-jaxrsclient-impl</artifactId>
+ <artifactId>isis-mappings-jaxrsclient-api</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -86,10 +86,8 @@
</dependencyManagement>
<modules>
-<!--
- <module>jaxrsclient/impl</module>
--->
- <module>restclient/impl</module>
+ <module>jaxrsclient/api</module>
+ <module>restclient</module>
</modules>
<profiles>
diff --git a/mappings/restclient/impl/pom.xml b/mappings/restclient/api/pom.xml
similarity index 88%
copy from mappings/restclient/impl/pom.xml
copy to mappings/restclient/api/pom.xml
index ab88f0f..1866235 100644
--- a/mappings/restclient/impl/pom.xml
+++ b/mappings/restclient/api/pom.xml
@@ -21,7 +21,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-mappings-restclient</artifactId>
+ <artifactId>isis-mappings-restclient-api</artifactId>
<name>Apache Isis Ext - REST Client</name>
<description>A client for the Restful Objects Viewer</description>
@@ -37,6 +37,13 @@
<artifactId>isis-applib</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>5.2.2.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+
</dependencies>
</project>
diff --git a/mappings/jaxrsclient/impl/src/main/doc/antora.yml b/mappings/restclient/api/src/main/doc/antora.yml
similarity index 100%
rename from mappings/jaxrsclient/impl/src/main/doc/antora.yml
rename to mappings/restclient/api/src/main/doc/antora.yml
diff --git a/mappings/restclient/impl/src/main/doc/modules/restclient/nav.adoc b/mappings/restclient/api/src/main/doc/modules/restclient/nav.adoc
similarity index 100%
rename from mappings/restclient/impl/src/main/doc/modules/restclient/nav.adoc
rename to mappings/restclient/api/src/main/doc/modules/restclient/nav.adoc
diff --git a/mappings/restclient/impl/src/main/doc/modules/restclient/pages/about.adoc b/mappings/restclient/api/src/main/doc/modules/restclient/pages/about.adoc
similarity index 100%
rename from mappings/restclient/impl/src/main/doc/modules/restclient/pages/about.adoc
rename to mappings/restclient/api/src/main/doc/modules/restclient/pages/about.adoc
diff --git a/mappings/restclient/impl/src/main/doc/modules/restclient/partials/module-nav.adoc b/mappings/restclient/api/src/main/doc/modules/restclient/partials/module-nav.adoc
similarity index 100%
rename from mappings/restclient/impl/src/main/doc/modules/restclient/partials/module-nav.adoc
rename to mappings/restclient/api/src/main/doc/modules/restclient/partials/module-nav.adoc
diff --git a/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/ActionParameterListBuilder.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/ActionParameterListBuilder.java
similarity index 100%
rename from mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/ActionParameterListBuilder.java
rename to mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/ActionParameterListBuilder.java
diff --git a/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/IsisModuleExtRestClient.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/IsisModuleExtRestClient.java
similarity index 100%
rename from mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/IsisModuleExtRestClient.java
rename to mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/IsisModuleExtRestClient.java
diff --git a/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java
similarity index 100%
rename from mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java
rename to mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/ResponseDigest.java
diff --git a/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/RestfulClient.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/RestfulClient.java
similarity index 100%
rename from mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/RestfulClient.java
rename to mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/RestfulClient.java
diff --git a/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/RestfulClientConfig.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/RestfulClientConfig.java
similarity index 100%
rename from mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/RestfulClientConfig.java
rename to mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/RestfulClientConfig.java
diff --git a/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/RestfulClientException.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/RestfulClientException.java
similarity index 100%
rename from mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/RestfulClientException.java
rename to mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/RestfulClientException.java
diff --git a/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/ScalarValueDto.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/ScalarValueDto.java
similarity index 100%
rename from mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/ScalarValueDto.java
rename to mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/ScalarValueDto.java
diff --git a/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java
similarity index 100%
rename from mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java
rename to mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java
diff --git a/mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/log/RestfulLoggingFilter.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/log/RestfulLoggingFilter.java
similarity index 100%
rename from mappings/restclient/impl/src/main/java/org/apache/isis/extensions/restclient/log/RestfulLoggingFilter.java
rename to mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/log/RestfulLoggingFilter.java
diff --git a/mappings/restclient/impl/pom.xml b/mappings/restclient/pom.xml
similarity index 74%
rename from mappings/restclient/impl/pom.xml
rename to mappings/restclient/pom.xml
index ab88f0f..e5f69fc 100644
--- a/mappings/restclient/impl/pom.xml
+++ b/mappings/restclient/pom.xml
@@ -18,25 +18,15 @@
<groupId>org.apache.isis.mappings</groupId>
<artifactId>isis-mappings</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>isis-mappings-restclient</artifactId>
- <name>Apache Isis Ext - REST Client</name>
+ <name>Apache Isis Ext - REST Client (parent)</name>
<description>A client for the Restful Objects Viewer</description>
+ <packaging>pom</packaging>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.mappings.restclient</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/mappings/restclient</git-plugin.propertiesDir>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
- </dependency>
-
- </dependencies>
+ <modules>
+ <module>api</module>
+ </modules>
</project>
[isis] 10/21: ISIS-2259: renames base subdomain dom to applib.
Posted by da...@apache.org.
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 4081233f82e7faa5536329edf87c785a4c85918b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 07:09:47 2020 +0000
ISIS-2259: renames base subdomain dom to applib.
---
subdomains/base/{impl => applib}/pom.xml | 2 +-
subdomains/base/{impl => applib}/src/main/doc/antora.yml | 0
subdomains/base/{impl => applib}/src/main/doc/modules/base/nav.adoc | 0
.../base/{impl => applib}/src/main/doc/modules/base/pages/about.adoc | 0
.../src/main/doc/modules/base/partials/module-nav.adoc | 0
.../src/main/java/org/apache/isis/extensions/base/dom/Chained.java | 0
.../src/main/java/org/apache/isis/extensions/base/dom/Dflt.java | 0
.../java/org/apache/isis/extensions/base/dom/IsisModuleExtBase.java | 0
.../src/main/java/org/apache/isis/extensions/base/dom/PowerType.java | 0
.../src/main/java/org/apache/isis/extensions/base/dom/Titled.java | 0
.../src/main/java/org/apache/isis/extensions/base/dom/TitledEnum.java | 0
.../apache/isis/extensions/base/dom/services/BaseServicesModule.java | 0
.../isis/extensions/base/dom/services/calendar/CalendarService.java | 0
.../org/apache/isis/extensions/base/dom/types/DescriptionType.java | 0
.../main/java/org/apache/isis/extensions/base/dom/types/FqcnType.java | 0
.../java/org/apache/isis/extensions/base/dom/types/MoneyType.java | 0
.../main/java/org/apache/isis/extensions/base/dom/types/NameType.java | 0
.../java/org/apache/isis/extensions/base/dom/types/NotesType.java | 0
.../apache/isis/extensions/base/dom/types/ObjectIdentifierType.java | 0
.../org/apache/isis/extensions/base/dom/types/PercentageType.java | 0
.../org/apache/isis/extensions/base/dom/types/ProperNameType.java | 0
.../java/org/apache/isis/extensions/base/dom/types/ReferenceType.java | 0
.../java/org/apache/isis/extensions/base/dom/types/TitleType.java | 0
.../org/apache/isis/extensions/base/dom/types/UrlTemplateType.java | 0
.../java/org/apache/isis/extensions/base/dom/types/UserNameType.java | 0
.../main/java/org/apache/isis/extensions/base/dom/types/XxxType.java | 0
.../java/org/apache/isis/extensions/base/dom/utils/ClassUtils.java | 0
.../org/apache/isis/extensions/base/dom/utils/JodaPeriodUtils.java | 0
.../java/org/apache/isis/extensions/base/dom/utils/MathUtils.java | 0
.../java/org/apache/isis/extensions/base/dom/utils/MessageUtils.java | 0
.../java/org/apache/isis/extensions/base/dom/utils/StringUtils.java | 0
.../java/org/apache/isis/extensions/base/dom/utils/TitleBuilder.java | 0
.../apache/isis/extensions/base/dom/valuetypes/AbstractInterval.java | 0
.../apache/isis/extensions/base/dom/valuetypes/LocalDateInterval.java | 0
.../main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java | 0
.../org/apache/isis/extensions/base/dom/with/WithCodeComparable.java | 0
.../java/org/apache/isis/extensions/base/dom/with/WithCodeGetter.java | 0
.../java/org/apache/isis/extensions/base/dom/with/WithCodeUnique.java | 0
.../isis/extensions/base/dom/with/WithDescriptionComparable.java | 0
.../apache/isis/extensions/base/dom/with/WithDescriptionGetter.java | 0
.../apache/isis/extensions/base/dom/with/WithDescriptionUnique.java | 0
.../java/org/apache/isis/extensions/base/dom/with/WithInterval.java | 0
.../apache/isis/extensions/base/dom/with/WithIntervalContiguous.java | 0
.../org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java | 0
.../org/apache/isis/extensions/base/dom/with/WithNameComparable.java | 0
.../java/org/apache/isis/extensions/base/dom/with/WithNameGetter.java | 0
.../java/org/apache/isis/extensions/base/dom/with/WithNameUnique.java | 0
.../apache/isis/extensions/base/dom/with/WithReferenceComparable.java | 0
.../org/apache/isis/extensions/base/dom/with/WithReferenceGetter.java | 0
.../org/apache/isis/extensions/base/dom/with/WithReferenceUnique.java | 0
.../java/org/apache/isis/extensions/base/dom/with/WithSequence.java | 0
.../java/org/apache/isis/extensions/base/dom/with/WithStartDate.java | 0
.../org/apache/isis/extensions/base/dom/with/WithTitleComparable.java | 0
.../org/apache/isis/extensions/base/dom/with/WithTitleGetter.java | 0
.../org/apache/isis/extensions/base/dom/with/WithTitleUnique.java | 0
.../extensions/base/dom/TitledEnumContractTestAbstract_title.java | 0
.../org/apache/isis/extensions/base/dom/TitledEnumContractTester.java | 0
.../org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java | 0
.../dom/services/calendar/CalendarServiceTest_beginningOfMonth.java | 0
.../dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java | 0
.../isis/extensions/base/dom/testing/PrivateConstructorTester.java | 0
.../base/dom/titled/TitledEnumContractTestAbstract_title.java | 0
.../isis/extensions/base/dom/titled/TitledEnumContractTester.java | 0
.../org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java | 0
.../apache/isis/extensions/base/dom/utils/JodaPeriodUtilsTest.java | 0
.../java/org/apache/isis/extensions/base/dom/utils/MathUtilsTest.java | 0
.../org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java | 0
.../org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java | 0
.../org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java | 0
.../isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java | 0
.../base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java | 0
.../isis/extensions/base/dom/with/ComparableByCodeContractTester.java | 0
.../with/ComparableByDescriptionContractTestAbstract_compareTo.java | 0
.../base/dom/with/ComparableByDescriptionContractTester.java | 0
.../base/dom/with/ComparableByNameContractTestAbstract_compareTo.java | 0
.../isis/extensions/base/dom/with/ComparableByNameContractTester.java | 0
.../dom/with/ComparableByReferenceContractTestAbstract_compareTo.java | 0
.../extensions/base/dom/with/ComparableByReferenceContractTester.java | 0
.../dom/with/ComparableByTitleContractTestAbstract_compareTo.java | 0
.../extensions/base/dom/with/ComparableByTitleContractTester.java | 0
.../extensions/base/dom/with/InstantiatorForComparableByCode.java | 0
.../base/dom/with/InstantiatorForComparableByDescription.java | 0
.../extensions/base/dom/with/InstantiatorForComparableByName.java | 0
.../base/dom/with/InstantiatorForComparableByReference.java | 0
.../isis/extensions/base/dom/with/InstantiatorForWithStartDate.java | 0
.../dom/with/StaticHelperClassesContractTest_privateConstructor.java | 0
.../base/dom/with/WithFieldUniqueContractTestAllAbstract.java | 0
.../dom/with/WithIntervalMutableContractTestAbstract_changeDates.java | 0
.../dom/with/ComparableByCodeContractTestAbstract_compareTo.java | 0
.../base/unittestsupport/dom/with/ComparableByCodeContractTester.java | 0
.../with/ComparableByDescriptionContractTestAbstract_compareTo.java | 0
.../dom/with/ComparableByDescriptionContractTester.java | 0
.../dom/with/ComparableByNameContractTestAbstract_compareTo.java | 0
.../base/unittestsupport/dom/with/ComparableByNameContractTester.java | 0
.../dom/with/ComparableByReferenceContractTestAbstract_compareTo.java | 0
.../unittestsupport/dom/with/ComparableByReferenceContractTester.java | 0
.../dom/with/ComparableByTitleContractTestAbstract_compareTo.java | 0
.../unittestsupport/dom/with/ComparableByTitleContractTester.java | 0
.../unittestsupport/dom/with/InstantiatorForComparableByCode.java | 0
.../dom/with/InstantiatorForComparableByDescription.java | 0
.../unittestsupport/dom/with/InstantiatorForComparableByName.java | 0
.../dom/with/InstantiatorForComparableByReference.java | 0
.../base/unittestsupport/dom/with/InstantiatorForWithStartDate.java | 0
.../dom/with/WithFieldUniqueContractTestAllAbstract.java | 0
.../dom/with/WithIntervalMutableContractTestAbstract_changeDates.java | 0
subdomains/excel/integtests/pom.xml | 2 +-
subdomains/pom.xml | 4 ++--
107 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/subdomains/base/impl/pom.xml b/subdomains/base/applib/pom.xml
similarity index 97%
rename from subdomains/base/impl/pom.xml
rename to subdomains/base/applib/pom.xml
index 184c702..c01e5bc 100644
--- a/subdomains/base/impl/pom.xml
+++ b/subdomains/base/applib/pom.xml
@@ -9,7 +9,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-base-dom</artifactId>
+ <artifactId>isis-subdomains-base-applib</artifactId>
<packaging>jar</packaging>
diff --git a/subdomains/base/impl/src/main/doc/antora.yml b/subdomains/base/applib/src/main/doc/antora.yml
similarity index 100%
rename from subdomains/base/impl/src/main/doc/antora.yml
rename to subdomains/base/applib/src/main/doc/antora.yml
diff --git a/subdomains/base/impl/src/main/doc/modules/base/nav.adoc b/subdomains/base/applib/src/main/doc/modules/base/nav.adoc
similarity index 100%
rename from subdomains/base/impl/src/main/doc/modules/base/nav.adoc
rename to subdomains/base/applib/src/main/doc/modules/base/nav.adoc
diff --git a/subdomains/base/impl/src/main/doc/modules/base/pages/about.adoc b/subdomains/base/applib/src/main/doc/modules/base/pages/about.adoc
similarity index 100%
rename from subdomains/base/impl/src/main/doc/modules/base/pages/about.adoc
rename to subdomains/base/applib/src/main/doc/modules/base/pages/about.adoc
diff --git a/subdomains/base/impl/src/main/doc/modules/base/partials/module-nav.adoc b/subdomains/base/applib/src/main/doc/modules/base/partials/module-nav.adoc
similarity index 100%
rename from subdomains/base/impl/src/main/doc/modules/base/partials/module-nav.adoc
rename to subdomains/base/applib/src/main/doc/modules/base/partials/module-nav.adoc
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Chained.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/Chained.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Chained.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/Chained.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Dflt.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/Dflt.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Dflt.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/Dflt.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/IsisModuleExtBase.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/IsisModuleExtBase.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/IsisModuleExtBase.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/IsisModuleExtBase.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/PowerType.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/PowerType.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/PowerType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/PowerType.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Titled.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/Titled.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/Titled.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/Titled.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/TitledEnum.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/TitledEnum.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/TitledEnum.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/TitledEnum.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/BaseServicesModule.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/services/BaseServicesModule.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/BaseServicesModule.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/services/BaseServicesModule.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarService.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/DescriptionType.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/DescriptionType.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/DescriptionType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/DescriptionType.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/FqcnType.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/FqcnType.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/FqcnType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/FqcnType.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/MoneyType.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/MoneyType.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/MoneyType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/MoneyType.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NameType.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/NameType.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NameType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/NameType.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NotesType.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/NotesType.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/NotesType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/NotesType.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ObjectIdentifierType.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/ObjectIdentifierType.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ObjectIdentifierType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/ObjectIdentifierType.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/PercentageType.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/PercentageType.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/PercentageType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/PercentageType.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ProperNameType.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/ProperNameType.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ProperNameType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/ProperNameType.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ReferenceType.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/ReferenceType.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/ReferenceType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/ReferenceType.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/TitleType.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/TitleType.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/TitleType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/TitleType.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UrlTemplateType.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/UrlTemplateType.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UrlTemplateType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/UrlTemplateType.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UserNameType.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/UserNameType.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/UserNameType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/UserNameType.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/XxxType.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/XxxType.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/types/XxxType.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/types/XxxType.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/ClassUtils.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/ClassUtils.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/ClassUtils.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/ClassUtils.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtils.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtils.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtils.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtils.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MathUtils.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/MathUtils.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MathUtils.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/MathUtils.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MessageUtils.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/MessageUtils.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/MessageUtils.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/MessageUtils.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/StringUtils.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/StringUtils.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/StringUtils.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/StringUtils.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/TitleBuilder.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/TitleBuilder.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/utils/TitleBuilder.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/utils/TitleBuilder.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/AbstractInterval.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/AbstractInterval.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/AbstractInterval.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/AbstractInterval.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateInterval.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateInterval.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateInterval.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateInterval.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/valuetypes/VT.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeComparable.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeComparable.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeComparable.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeComparable.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeGetter.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeGetter.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeGetter.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeGetter.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeUnique.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeUnique.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeUnique.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithCodeUnique.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionComparable.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionComparable.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionComparable.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionComparable.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionGetter.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionGetter.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionGetter.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionGetter.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionUnique.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionUnique.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionUnique.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithDescriptionUnique.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithInterval.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalContiguous.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutable.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameComparable.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameComparable.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameComparable.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameComparable.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameGetter.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameGetter.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameGetter.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameGetter.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameUnique.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameUnique.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameUnique.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithNameUnique.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceComparable.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceComparable.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceComparable.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceComparable.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceGetter.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceGetter.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceGetter.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceGetter.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceUnique.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceUnique.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceUnique.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithReferenceUnique.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithSequence.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithSequence.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithSequence.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithSequence.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithStartDate.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleComparable.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleComparable.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleComparable.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleComparable.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleGetter.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleGetter.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleGetter.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleGetter.java
diff --git a/subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleUnique.java b/subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleUnique.java
similarity index 100%
rename from subdomains/base/impl/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleUnique.java
rename to subdomains/base/applib/src/main/java/org/apache/isis/extensions/base/dom/with/WithTitleUnique.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTestAbstract_title.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/TitledEnumContractTester.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/matchers/IsisMatchers.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java
similarity index 100%
rename from subdomains/base/impl/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/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfMonth.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java
similarity index 100%
rename from subdomains/base/impl/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/extensions/base/dom/services/calendar/CalendarServiceTest_beginningOfQuarter.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/testing/PrivateConstructorTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/testing/PrivateConstructorTester.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/testing/PrivateConstructorTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/testing/PrivateConstructorTester.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTestAbstract_title.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/titled/TitledEnumContractTester.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/ClassUtilsTest.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtilsTest.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtilsTest.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtilsTest.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/JodaPeriodUtilsTest.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MathUtilsTest.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/MathUtilsTest.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MathUtilsTest.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/MathUtilsTest.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/MessageUtils_Test.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/StringUtilsTest.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/utils/TitleBuilderTest.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/valuetypes/LocalDateIntervalTest.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByCodeContractTester.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByDescriptionContractTester.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTestAbstract_compareTo.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByNameContractTester.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByReferenceContractTester.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/ComparableByTitleContractTester.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByCode.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByDescription.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByName.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForComparableByReference.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/InstantiatorForWithStartDate.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/StaticHelperClassesContractTest_privateConstructor.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/WithFieldUniqueContractTestAllAbstract.java
diff --git a/subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
diff --git a/subdomains/base/impl/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
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
diff --git a/subdomains/base/impl/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
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java
diff --git a/subdomains/base/impl/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
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
diff --git a/subdomains/base/impl/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
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java
diff --git a/subdomains/base/impl/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
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java
diff --git a/subdomains/base/impl/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
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java
diff --git a/subdomains/base/impl/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
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
diff --git a/subdomains/base/impl/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
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java
diff --git a/subdomains/base/impl/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
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
diff --git a/subdomains/base/impl/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
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java
diff --git a/subdomains/base/impl/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
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java
diff --git a/subdomains/base/impl/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
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java
diff --git a/subdomains/base/impl/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
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java
diff --git a/subdomains/base/impl/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
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java
diff --git a/subdomains/base/impl/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
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java
diff --git a/subdomains/base/impl/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
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java
diff --git a/subdomains/base/impl/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
similarity index 100%
rename from subdomains/base/impl/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
rename to subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
diff --git a/subdomains/excel/integtests/pom.xml b/subdomains/excel/integtests/pom.xml
index eb68439..1e896f0 100644
--- a/subdomains/excel/integtests/pom.xml
+++ b/subdomains/excel/integtests/pom.xml
@@ -87,7 +87,7 @@
<!--
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-base-dom</artifactId>
+ <artifactId>isis-subdomains-base-applib</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 13901f9..553eee1 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-base-dom</artifactId>
+ <artifactId>isis-subdomains-base-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -114,7 +114,7 @@
<modules>
- <module>base/impl</module>
+ <module>base/applib</module>
<!--
<module>excel/fixture</module>
<module>excel/integtests</module>
[isis] 12/21: ISIS-2259: adds parent for base subdomain
Posted by da...@apache.org.
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 bd378c124c8271b9333a5014ad0db87276aba7a9
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 07:14:19 2020 +0000
ISIS-2259: adds parent for base subdomain
---
subdomains/base/applib/pom.xml | 14 ++++----------
subdomains/base/pom.xml | 24 ++++++++++++++++++++++++
subdomains/pom.xml | 2 +-
3 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/subdomains/base/applib/pom.xml b/subdomains/base/applib/pom.xml
index c01e5bc..6526e50 100644
--- a/subdomains/base/applib/pom.xml
+++ b/subdomains/base/applib/pom.xml
@@ -4,23 +4,17 @@
<parent>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
+ <artifactId>isis-subdomains-base</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>isis-subdomains-base-applib</artifactId>
- <packaging>jar</packaging>
-
- <name>Apache Isis Sub - Base</name>
- <description>
- A module providing Base utilities for other subdomain modules
- </description>
+ <name>Apache Isis Sub - Base (applib)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.base</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/base</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.subdomains.base.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/subdomains/base/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/subdomains/base/pom.xml b/subdomains/base/pom.xml
new file mode 100644
index 0000000..efbe302
--- /dev/null
+++ b/subdomains/base/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>isis-subdomains-base</artifactId>
+
+ <packaging>pom</packaging>
+
+ <name>Apache Isis Sub - Base (applib)</name>
+ <description>
+ A module providing Base utilities for other subdomain modules
+ </description>
+
+ <modules>
+ <module>applib</module>
+ </modules>
+
+</project>
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 553eee1..40338bc 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -114,7 +114,7 @@
<modules>
- <module>base/applib</module>
+ <module>base</module>
<!--
<module>excel/fixture</module>
<module>excel/integtests</module>
[isis] 11/21: ISIS-2259: renames package for base subdomain
Posted by da...@apache.org.
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;
[isis] 17/21: ISIS-2259: reorg pdfbox module
Posted by da...@apache.org.
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 e0f1458d046746342042fe8b75c7cc80cf04e833
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 10:11:35 2020 +0000
ISIS-2259: reorg pdfbox module
---
antora/playbooks/site-subdomains.yml | 4 ++--
antora/playbooks/site.yml | 4 ++--
subdomains/base/pom.xml | 4 ++--
subdomains/docx/pom.xml | 2 ++
subdomains/freemarker/applib/pom.xml | 1 -
subdomains/freemarker/pom.xml | 2 ++
subdomains/ognl/{impl => applib}/pom.xml | 14 ++++++++------
.../subdomains/ognl/applib/IsisModuleSubOgnlApplib.java} | 4 ++--
subdomains/{freemarker => ognl}/pom.xml | 9 +++++----
subdomains/{pdfbox/impl => ognl}/src/main/doc/antora.yml | 0
.../pdfbox => ognl/src/main/doc/modules/ognl}/nav.adoc | 0
.../src/main/doc/modules/ognl/pages/about.adoc | 0
.../src/main/doc/modules/ognl/partials/module-nav.adoc | 0
subdomains/pdfbox/{impl => applib}/pom.xml | 16 +++++++++-------
.../pdfbox/applib/IsisModuleSubPdfBoxApplib.java} | 4 ++--
subdomains/{freemarker => pdfbox}/pom.xml | 7 +++----
subdomains/{ognl/impl => pdfbox}/src/main/doc/antora.yml | 0
.../ognl => pdfbox/src/main/doc/modules/pdfbox}/nav.adoc | 0
.../src/main/doc/modules/pdfbox/pages/about.adoc | 0
.../src/main/doc/modules/pdfbox/partials/module-nav.adoc | 0
subdomains/pom.xml | 14 ++++++++++++++
subdomains/spring/impl/pom.xml | 2 +-
subdomains/xdocreport/impl/pom.xml | 6 +-----
subdomains/zip/impl/pom.xml | 5 +----
24 files changed, 56 insertions(+), 42 deletions(-)
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index a1589f7..a283de3 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -29,10 +29,10 @@ content:
start_path: subdomains/freemarker/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/ognl/impl/src/main/doc # subdomains
+ start_path: subdomains/ognl/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/pdfbox/impl/src/main/doc # subdomains
+ start_path: subdomains/pdfbox/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/spring/impl/src/main/doc # subdomains
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index b881bd1..6d5d845 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -203,10 +203,10 @@ content:
start_path: subdomains/freemarker/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/ognl/impl/src/main/doc # subdomains
+ start_path: subdomains/ognl/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/pdfbox/impl/src/main/doc # subdomains
+ start_path: subdomains/pdfbox/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/spring/impl/src/main/doc # subdomains
diff --git a/subdomains/base/pom.xml b/subdomains/base/pom.xml
index efbe302..ec52bfe 100644
--- a/subdomains/base/pom.xml
+++ b/subdomains/base/pom.xml
@@ -10,13 +10,13 @@
<artifactId>isis-subdomains-base</artifactId>
- <packaging>pom</packaging>
-
<name>Apache Isis Sub - Base (applib)</name>
<description>
A module providing Base utilities for other subdomain modules
</description>
+ <packaging>pom</packaging>
+
<modules>
<module>applib</module>
</modules>
diff --git a/subdomains/docx/pom.xml b/subdomains/docx/pom.xml
index 1597af8..4c15f42 100644
--- a/subdomains/docx/pom.xml
+++ b/subdomains/docx/pom.xml
@@ -24,6 +24,8 @@
<name>Apache Isis Sub - Docx (parent)</name>
<description>Uses the Apache POI library for mail merge functions of .docx Word documents</description>
+ <packaging>pom</packaging>
+
<modules>
<module>applib</module>
</modules>
diff --git a/subdomains/freemarker/applib/pom.xml b/subdomains/freemarker/applib/pom.xml
index 65514f5..13e506a 100644
--- a/subdomains/freemarker/applib/pom.xml
+++ b/subdomains/freemarker/applib/pom.xml
@@ -29,7 +29,6 @@
</properties>
<dependencies>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-applib</artifactId>
diff --git a/subdomains/freemarker/pom.xml b/subdomains/freemarker/pom.xml
index f3991d8..6181054 100644
--- a/subdomains/freemarker/pom.xml
+++ b/subdomains/freemarker/pom.xml
@@ -24,6 +24,8 @@
<name>Apache Isis Sub - Freemarker (parent)</name>
<description>Integrates Freemarker Library</description>
+ <packaging>pom</packaging>
+
<modules>
<module>applib</module>
</modules>
diff --git a/subdomains/ognl/impl/pom.xml b/subdomains/ognl/applib/pom.xml
similarity index 79%
rename from subdomains/ognl/impl/pom.xml
rename to subdomains/ognl/applib/pom.xml
index c0bb171..c78194d 100644
--- a/subdomains/ognl/impl/pom.xml
+++ b/subdomains/ognl/applib/pom.xml
@@ -21,17 +21,19 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-ognl-dom</artifactId>
- <name>Apache Isis Sub - Ognl</name>
- <description>Integrates Ognl Library</description>
+ <artifactId>isis-subdomains-ognl-applib</artifactId>
+ <name>Apache Isis Sub - Ognl (applib)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.ognl.dom</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/ognl/dom</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.subdomains.ognl.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/subdomains/ognl/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
-
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/subdomains/ognl/impl/src/main/java/org/apache/isis/extensions/ognl/dom/IsisModuleExtOgnl.java b/subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubOgnlApplib.java
similarity index 91%
rename from subdomains/ognl/impl/src/main/java/org/apache/isis/extensions/ognl/dom/IsisModuleExtOgnl.java
rename to subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubOgnlApplib.java
index aa1c2fb..3dbee72 100644
--- a/subdomains/ognl/impl/src/main/java/org/apache/isis/extensions/ognl/dom/IsisModuleExtOgnl.java
+++ b/subdomains/ognl/applib/src/main/java/org/apache/isis/subdomains/ognl/applib/IsisModuleSubOgnlApplib.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.ognl.dom;
+package org.apache.isis.subdomains.ognl.applib;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleExtOgnl {
+public class IsisModuleSubOgnlApplib {
}
diff --git a/subdomains/freemarker/pom.xml b/subdomains/ognl/pom.xml
similarity index 88%
copy from subdomains/freemarker/pom.xml
copy to subdomains/ognl/pom.xml
index f3991d8..cd1081e 100644
--- a/subdomains/freemarker/pom.xml
+++ b/subdomains/ognl/pom.xml
@@ -20,13 +20,14 @@
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- <artifactId>isis-subdomains-freemarker</artifactId>
- <name>Apache Isis Sub - Freemarker (parent)</name>
- <description>Integrates Freemarker Library</description>
+ <artifactId>isis-subdomains-ognl</artifactId>
+ <name>Apache Isis Sub - Ognl (parent)</name>
+ <description>Integrates Ognl Library</description>
+
+ <packaging>pom</packaging>
<modules>
<module>applib</module>
</modules>
-
</project>
diff --git a/subdomains/pdfbox/impl/src/main/doc/antora.yml b/subdomains/ognl/src/main/doc/antora.yml
similarity index 100%
rename from subdomains/pdfbox/impl/src/main/doc/antora.yml
rename to subdomains/ognl/src/main/doc/antora.yml
diff --git a/subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/nav.adoc b/subdomains/ognl/src/main/doc/modules/ognl/nav.adoc
similarity index 100%
rename from subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/nav.adoc
rename to subdomains/ognl/src/main/doc/modules/ognl/nav.adoc
diff --git a/subdomains/ognl/impl/src/main/doc/modules/ognl/pages/about.adoc b/subdomains/ognl/src/main/doc/modules/ognl/pages/about.adoc
similarity index 100%
rename from subdomains/ognl/impl/src/main/doc/modules/ognl/pages/about.adoc
rename to subdomains/ognl/src/main/doc/modules/ognl/pages/about.adoc
diff --git a/subdomains/ognl/impl/src/main/doc/modules/ognl/partials/module-nav.adoc b/subdomains/ognl/src/main/doc/modules/ognl/partials/module-nav.adoc
similarity index 100%
rename from subdomains/ognl/impl/src/main/doc/modules/ognl/partials/module-nav.adoc
rename to subdomains/ognl/src/main/doc/modules/ognl/partials/module-nav.adoc
diff --git a/subdomains/pdfbox/impl/pom.xml b/subdomains/pdfbox/applib/pom.xml
similarity index 76%
rename from subdomains/pdfbox/impl/pom.xml
rename to subdomains/pdfbox/applib/pom.xml
index 8d961f4..6b984b7 100644
--- a/subdomains/pdfbox/impl/pom.xml
+++ b/subdomains/pdfbox/applib/pom.xml
@@ -16,22 +16,24 @@
<parent>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
+ <artifactId>isis-subdomains-pdfbox</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-pdfbox-dom</artifactId>
- <name>Apache Isis Sub - PDF Box</name>
+ <artifactId>isis-subdomains-pdfbox-applib</artifactId>
+ <name>Apache Isis Sub - PDF Box (applib)</name>
<description>Integrates PDF Box Library</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.pdfbox.dom</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/pdfbox/dom</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.subdomains.pdfbox.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/subdomains/pdfbox/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
-
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/subdomains/pdfbox/impl/src/main/java/org/apache/isis/extensions/pdfbox/dom/IsisModuleExtPdfBox.java b/subdomains/pdfbox/applib/src/main/java/org/apache/isis/subdomains/pdfbox/applib/IsisModuleSubPdfBoxApplib.java
similarity index 91%
rename from subdomains/pdfbox/impl/src/main/java/org/apache/isis/extensions/pdfbox/dom/IsisModuleExtPdfBox.java
rename to subdomains/pdfbox/applib/src/main/java/org/apache/isis/subdomains/pdfbox/applib/IsisModuleSubPdfBoxApplib.java
index 6555bb8..fe2733c 100644
--- a/subdomains/pdfbox/impl/src/main/java/org/apache/isis/extensions/pdfbox/dom/IsisModuleExtPdfBox.java
+++ b/subdomains/pdfbox/applib/src/main/java/org/apache/isis/subdomains/pdfbox/applib/IsisModuleSubPdfBoxApplib.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.pdfbox.dom;
+package org.apache.isis.subdomains.pdfbox.applib;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleExtPdfBox {
+public class IsisModuleSubPdfBoxApplib {
}
diff --git a/subdomains/freemarker/pom.xml b/subdomains/pdfbox/pom.xml
similarity index 88%
copy from subdomains/freemarker/pom.xml
copy to subdomains/pdfbox/pom.xml
index f3991d8..abc97e4 100644
--- a/subdomains/freemarker/pom.xml
+++ b/subdomains/pdfbox/pom.xml
@@ -20,13 +20,12 @@
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- <artifactId>isis-subdomains-freemarker</artifactId>
- <name>Apache Isis Sub - Freemarker (parent)</name>
- <description>Integrates Freemarker Library</description>
+ <artifactId>isis-subdomains-pdfbox</artifactId>
+ <name>Apache Isis Sub - PDF Box (parent)</name>
+ <description>Integrates PDF Box Library</description>
<modules>
<module>applib</module>
</modules>
-
</project>
diff --git a/subdomains/ognl/impl/src/main/doc/antora.yml b/subdomains/pdfbox/src/main/doc/antora.yml
similarity index 100%
rename from subdomains/ognl/impl/src/main/doc/antora.yml
rename to subdomains/pdfbox/src/main/doc/antora.yml
diff --git a/subdomains/ognl/impl/src/main/doc/modules/ognl/nav.adoc b/subdomains/pdfbox/src/main/doc/modules/pdfbox/nav.adoc
similarity index 100%
rename from subdomains/ognl/impl/src/main/doc/modules/ognl/nav.adoc
rename to subdomains/pdfbox/src/main/doc/modules/pdfbox/nav.adoc
diff --git a/subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/pages/about.adoc b/subdomains/pdfbox/src/main/doc/modules/pdfbox/pages/about.adoc
similarity index 100%
rename from subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/pages/about.adoc
rename to subdomains/pdfbox/src/main/doc/modules/pdfbox/pages/about.adoc
diff --git a/subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/partials/module-nav.adoc b/subdomains/pdfbox/src/main/doc/modules/pdfbox/partials/module-nav.adoc
similarity index 100%
rename from subdomains/pdfbox/impl/src/main/doc/modules/pdfbox/partials/module-nav.adoc
rename to subdomains/pdfbox/src/main/doc/modules/pdfbox/partials/module-nav.adoc
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index fdafe7d..aadd918 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -103,6 +103,18 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-ognl-applib</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-pdfbox-applib</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains-spring</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -135,6 +147,8 @@
<module>docx</module>
<module>excel</module>
<module>freemarker</module>
+ <module>ognl</module>
+ <module>pdfbox</module>
<module>spring/impl</module>
diff --git a/subdomains/spring/impl/pom.xml b/subdomains/spring/impl/pom.xml
index 9fe3cfa..76f3984 100644
--- a/subdomains/spring/impl/pom.xml
+++ b/subdomains/spring/impl/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>isis-subdomains-spring</artifactId>
- <name>Apache Isis Sin - Spring</name>
+ <name>Apache Isis Sub - Spring (applib)</name>
<description>Utility services for interacting with the Spring application context (that hosts the Apache Isis application itself)</description>
<properties>
diff --git a/subdomains/xdocreport/impl/pom.xml b/subdomains/xdocreport/impl/pom.xml
index c359d1d..f61aa12 100644
--- a/subdomains/xdocreport/impl/pom.xml
+++ b/subdomains/xdocreport/impl/pom.xml
@@ -22,7 +22,7 @@
</parent>
<artifactId>isis-subdomains-xdocreport-dom</artifactId>
- <name>Apache Isis Sub - xdocreport</name>
+ <name>Apache Isis Sub - xdocreport (applib)</name>
<description>Integrates XDoc Report Library</description>
<properties>
@@ -36,10 +36,6 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-applib</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
<dependency>
<groupId>fr.opensagres.xdocreport</groupId>
diff --git a/subdomains/zip/impl/pom.xml b/subdomains/zip/impl/pom.xml
index 2fcad09..e98e4cc 100644
--- a/subdomains/zip/impl/pom.xml
+++ b/subdomains/zip/impl/pom.xml
@@ -40,10 +40,7 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-applib</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
+
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
[isis] 02/21: ISIS-2062: renames secman:ROOT to security:secman
Posted by da...@apache.org.
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 f27a28276283f04e6b24a64c374e63b9584dcecb
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 06:15:57 2020 +0000
ISIS-2062: renames secman:ROOT to security:secman
---
README.adoc | 8 ++++----
.../extensions/modules/ROOT/partials/component-nav.adoc | 2 +-
antora/components/security/modules/ROOT/pages/about.adoc | 2 +-
.../security/modules/ROOT/partials/component-nav.adoc | 2 ++
antora/components/toc/modules/ROOT/pages/about.adoc | 2 +-
.../toc/modules/ROOT/pages/landing-page/guides.adoc | 2 +-
.../ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc | 10 +++++-----
antora/components/toc/modules/ROOT/partials/module-nav.adoc | 2 +-
.../modules/btb/pages/hints-and-tips/multi-tenancy.adoc | 4 ++--
.../pages/core-concepts/apache-isis-vs/mvc-server-side.adoc | 2 +-
.../modules/fun/pages/core-concepts/philosophy/aop.adoc | 2 +-
.../applib-cm/pages/classes/AppManifest-bootstrapping.adoc | 2 +-
.../applib-cm/pages/classes/contributee/HasUserName.adoc | 4 ++--
.../applib-cm/pages/classes/super/AbstractSubscriber.adoc | 2 +-
.../applib-svc/pages/core-domain-api/EventBusService.adoc | 2 +-
.../persistence-layer-spi/UserRegistrationService.adoc | 2 +-
.../src/main/doc/modules/config/pages/configuring-core.adoc | 2 +-
.../src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc | 2 +-
.../doc/modules/ROOT/pages/features/user-registration.adoc | 4 ++--
.../modules/ROOT/partials/security/user-registration.adoc | 2 +-
extensions/security/secman/src/main/doc/antora.yml | 6 +-----
.../security/secman/src/main/doc/modules/ROOT/nav.adoc | 1 -
.../src/main/doc/modules/ROOT/partials/component-nav.adoc | 6 ------
.../src/main/doc/modules/ROOT/partials/module-nav.adoc | 5 -----
...isisaddons-security-module-realm-with-delegate-realm.PNG | Bin
...figure-shiro-to-use-isisaddons-security-module-realm.PNG | Bin
.../security/secman/src/main/doc/modules/secman/nav.adoc | 1 +
.../src/main/doc/modules/{ROOT => secman}/pages/about.adoc | 0
.../src/main/doc/modules/{ROOT => secman}/pages/api.adoc | 0
.../modules/{ROOT => secman}/pages/jbcrypt-encryption.adoc | 0
.../doc/modules/{ROOT => secman}/pages/jdo-persistence.adoc | 0
.../src/main/doc/modules/{ROOT => secman}/pages/model.adoc | 0
.../doc/modules/{ROOT => secman}/pages/shiro-realm.adoc | 4 ++--
.../src/main/doc/modules/secman/partials/module-nav.adoc | 5 +++++
34 files changed, 40 insertions(+), 48 deletions(-)
diff --git a/README.adoc b/README.adoc
index 4c95cc5..314250a 100644
--- a/README.adoc
+++ b/README.adoc
@@ -31,7 +31,7 @@ Please note that these modules are not part of ASF, but they *are* all licensed
=== Sign-in
Apache Isis integrates with http://shiro.apache.org[Apache Shiro].
-The core framework supports file-based realms, while the xref:secman:ROOT:about.adoc[SecMan extension] provides a well-features subdomain of users, roles and permissions against features derived from the Apache Isis metamodel.
+The core framework supports file-based realms, while the xref:security:ROOT:about.adoc[SecMan extension] provides a well-features subdomain of users, roles and permissions against features derived from the Apache Isis metamodel.
image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/010-login.png[link="https://raw.githubusercontent.com/apache/isis/master/adocs/documentation/src/main/asciidoc/images/what-is-apache-isis/isis-in-pictures/010-login.png"]
@@ -143,7 +143,7 @@ Under the activity menu are four sets of services which provide support for link
image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/120-auditing.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/120-auditing.png"]
-In the security menu is access to the rich set of functionality provided by the xref:secman:ROOT:about.adoc[SecMan extension]:
+In the security menu is access to the rich set of functionality provided by the xref:security:ROOT:about.adoc[SecMan extension]:
image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/130-security.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/130-security.png"]
@@ -161,7 +161,7 @@ image::https://raw.githubusercontent.com/apache/isis/master/antora/components/to
Of the various modules in the Incode Platform, the link:https://platform.incode.org/modules/spi/security/spi-security.html[security module] has the most features.
-NOTE: this module has now been integrated into the Apache Isis framework itself, as the xref:secman:ROOT:about.adoc[SecMan extension].
+NOTE: this module has now been integrated into the Apache Isis framework itself, as the xref:security:ROOT:about.adoc[SecMan extension].
One significant feature of the is the ability to associate users and objects with a "tenancy".
The todoapp uses this feature so that different users' list of todo items are kept separate from one another.
@@ -169,7 +169,7 @@ A user with administrator is able to switch their own "tenancy" to the tenancy o
image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png"]
-For more details, see the security module's link:https://platform.incode.org/modules/spi/security/spi-security.html[README] (or xref:secman:ROOT:about.adoc[SecMan extension])..
+For more details, see the security module's link:https://platform.incode.org/modules/spi/security/spi-security.html[README] (or xref:security:ROOT:about.adoc[SecMan extension])..
=== Me
diff --git a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
index ff792bd..104d562 100644
--- a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
@@ -5,7 +5,7 @@ include::extensions:flywayjdo:partial$module-nav.adoc[]
* Security
include::extensions:shiro-realm-ldap:partial$module-nav.adoc[]
-** xref:secman:ROOT:about.adoc[SecMan]
+** xref:security:ROOT:about.adoc[SecMan]
* Wicket Viewer
diff --git a/antora/components/security/modules/ROOT/pages/about.adoc b/antora/components/security/modules/ROOT/pages/about.adoc
index 9be1d72..94befe2 100644
--- a/antora/components/security/modules/ROOT/pages/about.adoc
+++ b/antora/components/security/modules/ROOT/pages/about.adoc
@@ -37,7 +37,7 @@ The link:https://github.com/apache/isis-app-helloworld[HelloWorld] and link:http
Shiro also ships with an implementation of an LDAP-based realm; LDAP is often used to manage user/passwords and corresponding user groups.
Apache Isis in turn extends this with its `IsisLdapRealm`, which provides more flexibility for both group/role and role/permissions management.
-In addition, the xref:secman:ROOT:about.adoc[SecMan extension] provides an implementation of the Shiro `Realm` API.
+In addition, the xref:security:ROOT:about.adoc[SecMan extension] provides an implementation of the Shiro `Realm` API.
This extension also represents users, roles and permissions as domain objects, allowing them to be administered through Apache Isis itself.
Moreover, it can also optionally delegate password management to a subsidiary (delegate) realm (usually LDAP as discussed above).
diff --git a/antora/components/security/modules/ROOT/partials/component-nav.adoc b/antora/components/security/modules/ROOT/partials/component-nav.adoc
index 4733610..c82d3a3 100644
--- a/antora/components/security/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/security/modules/ROOT/partials/component-nav.adoc
@@ -5,3 +5,5 @@ include::security:shiro:partial$module-nav.adoc[]
include::security:keycloak:partial$module-nav.adoc[]
include::security:ROOT:partial$module-nav2.adoc[]
+* Secman (extension)
+include::security:secman:partial$module-nav.adoc[]
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index df804c7..6570f90 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -38,7 +38,7 @@
* *xref:userguide:ROOT:about.adoc[User Guide]*
* *xref:refguide:ROOT:about.adoc[Reference Guide]*
* xref:security:ROOT:about.adoc[Security Guide]
-** xref:secman:ROOT:about.adoc[SecMan (extension)]
+** xref:security:ROOT:about.adoc[SecMan (extension)]
* *xref:testing:ROOT:about.adoc[Testing]*
diff --git a/antora/components/toc/modules/ROOT/pages/landing-page/guides.adoc b/antora/components/toc/modules/ROOT/pages/landing-page/guides.adoc
index 231f5e7..d17de82 100644
--- a/antora/components/toc/modules/ROOT/pages/landing-page/guides.adoc
+++ b/antora/components/toc/modules/ROOT/pages/landing-page/guides.adoc
@@ -8,7 +8,7 @@ This page lists the user and reference guides available for developers to create
* *xref:userguide:ROOT:about.adoc[User Guide]*
* *xref:refguide:ROOT:about.adoc[Reference Guide]*
* xref:security:ROOT:about.adoc[Security Guide]
-** xref:secman:ROOT:about.adoc[SecMan (extension)]
+** xref:security:ROOT:about.adoc[SecMan (extension)]
* *xref:testing:ROOT:about.adoc[Testing]*
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc
index dbf92be..b7648ad 100644
--- a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc
+++ b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc
@@ -26,7 +26,7 @@ Let's start with the basics...
=== Sign-in
Apache Isis integrates with http://shiro.apache.org[Apache Shiro].
-The core framework supports file-based realms, while the xref:secman:ROOT:about.adoc[SecMan extension] provides a well-features subdomain of users, roles and permissions against features derived from the Apache Isis metamodel.
+The core framework supports file-based realms, while the xref:security:ROOT:about.adoc[SecMan extension] provides a well-features subdomain of users, roles and permissions against features derived from the Apache Isis metamodel.
@@ -182,7 +182,7 @@ image::what-is-apache-isis/isis-in-pictures/120-auditing.png[width="800px",link=
-In the security menu is access to the rich set of functionality provided by the xref:secman:ROOT:about.adoc[SecMan extension]:
+In the security menu is access to the rich set of functionality provided by the xref:security:ROOT:about.adoc[SecMan extension]:
image::what-is-apache-isis/isis-in-pictures/130-security.png[width="800px",link="{imagesdir}/what-is-apache-isis/isis-in-pictures/130-security.png"]
@@ -208,7 +208,7 @@ image::what-is-apache-isis/isis-in-pictures/150-appsettings.png[width="800px",li
=== Multi-tenancy support
-One significant feature of the xref:secman:ROOT:about.adoc[SecMan extension] is the ability to associate users and objects with a "tenancy".
+One significant feature of the xref:security:ROOT:about.adoc[SecMan extension] is the ability to associate users and objects with a "tenancy".
The todoapp uses this feature so that different users' list of todo items are kept separate from one another.
A user with administrator is able to switch their own "tenancy" to the tenancy of some other user, in order to access the objects in that tenancy:
@@ -216,12 +216,12 @@ image::what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png[width="800px"
-For more details, see the xref:secman:ROOT:about.adoc[SecMan extension].
+For more details, see the xref:security:ROOT:about.adoc[SecMan extension].
=== Me
-Most of the xref:secman:ROOT:about.adoc[SecMan extension]'s services are on the security menu, which would normally be provided only to administrators.
+Most of the xref:security:ROOT:about.adoc[SecMan extension]'s services are on the security menu, which would normally be provided only to administrators.
Kept separate is the "me" action:
image::what-is-apache-isis/isis-in-pictures/170-me.png[width="800px",link="{imagesdir}/what-is-apache-isis/isis-in-pictures/170-me.png"]
diff --git a/antora/components/toc/modules/ROOT/partials/module-nav.adoc b/antora/components/toc/modules/ROOT/partials/module-nav.adoc
index da9748c..f26178e 100644
--- a/antora/components/toc/modules/ROOT/partials/module-nav.adoc
+++ b/antora/components/toc/modules/ROOT/partials/module-nav.adoc
@@ -21,7 +21,7 @@
** xref:userguide:ROOT:about.adoc[User Guide]
** xref:refguide:ROOT:about.adoc[Reference Guide]
** xref:security:ROOT:about.adoc[Security Guide]
-*** xref:secman:ROOT:about.adoc[SecMan (extension)]
+*** xref:security:ROOT:about.adoc[SecMan (extension)]
** xref:testing:ROOT:about.adoc[Testing]
* Components
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/multi-tenancy.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/multi-tenancy.adoc
index b27eb2b..5a9c81d 100644
--- a/antora/components/userguide/modules/btb/pages/hints-and-tips/multi-tenancy.adoc
+++ b/antora/components/userguide/modules/btb/pages/hints-and-tips/multi-tenancy.adoc
@@ -4,8 +4,8 @@
:page-partial:
-One significant feature provided by the xref:secman:ROOT:about.adoc[SecMan extension] is the ability to associate users and objects with a "tenancy".
+One significant feature provided by the xref:security:ROOT:about.adoc[SecMan extension] is the ability to associate users and objects with a "tenancy".
-For more details, see the xref:secman:ROOT:about.adoc[SecMan extension]'s documentation.
+For more details, see the xref:security:ROOT:about.adoc[SecMan extension]'s documentation.
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
index 2e4c4e5..2f21fbf 100644
--- a/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
+++ b/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
@@ -17,7 +17,7 @@ More sophisticated UIs can be built either by xref:vw:ROOT:extending.adoc[extend
Other frameworks can also be used to implement REST APIs, of course, but generally they require a significant amount of development to get anywhere near the level of sophistication provided automatically by Apache Isis' REST API.
Although these frameworks all provide their own ecosystems of extensions, Apache Isis' equivalent link:https://platform.incode.org[Incode Platform^] modules (non-ASF) tend to work at a higher-level of abstraction.
-For example, each of these frameworks will integrate with various security mechanism, but the xref:secman:ROOT:about.adoc[SecMan extension] provides a full subdomain of users, roles, features and permissions that can be plugged into any Apache Isis application.
+For example, each of these frameworks will integrate with various security mechanism, but the xref:security:ROOT:about.adoc[SecMan extension] provides a full subdomain of users, roles, features and permissions that can be plugged into any Apache Isis application.
Similarly, the link:https://platform.incode.org[Incode Platform^]'s command and audit modules in combination provide a support for auditing and traceability that can also be used for out of the box profiling.
Again, these addons can be plugged into any Isis app.
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/aop.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/aop.adoc
index e5f0959..b990c52 100644
--- a/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/aop.adoc
+++ b/antora/components/userguide/modules/fun/pages/core-concepts/philosophy/aop.adoc
@@ -39,7 +39,7 @@ That's a rather more interesting cross-cutting concern than boring old logging!
Apache Isis also draws heavily on the AOP concept of interceptors.
Whenever an object is rendered in the UI, it is filtered with respect to the user's permissions.
That is, if a user is not authorized to either view or perhaps modify an object, then this is applied transparently by the framework.
-The xref:secman:ROOT:about.adoc[SecMan extension] provides a rich user/role/permissions subdomain to use out of the box; but you can integrate with a different security mechanism if you have one already.
+The xref:security:ROOT:about.adoc[SecMan extension] provides a rich user/role/permissions subdomain to use out of the box; but you can integrate with a different security mechanism if you have one already.
Another example of interceptors are the (non-ASF) link:https://platform.incode.org[Incode Platform^]'s command and audit modules.
The command module captures every user interaction that modifies the state of the system (the "cause" of a change) while the audit module captures every change to every object (the "effect" of a change).
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc b/core/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc
index df457a5..7bf22c6 100644
--- a/core/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc
+++ b/core/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc
@@ -93,7 +93,7 @@ As can be seen, the various (non-ASF) link:https://platform.incode.org[Incode Pl
We normally we recommend that services are defined exclusively through `getModules()`, and that this method should therefore return an empty list.
However, there are certain use cases where the a service must be explicitly specified either because the service required does not (for whatever reason) have a xref:refguide:applib-ant:DomainService.adoc[`@DomainService`] annotation.
-For example, the xref:secman:ROOT:about.adoc[SecMan extension] allows the policy to evaluate conflicting permissions to be specified by explicitly registering either the `PermissionsEvaluationServiceAllowBeatsVeto` domain service or the `PermissionsEvaluationServiceVetoBeatsAllow` domain service:
+For example, the xref:security:ROOT:about.adoc[SecMan extension] allows the policy to evaluate conflicting permissions to be specified by explicitly registering either the `PermissionsEvaluationServiceAllowBeatsVeto` domain service or the `PermissionsEvaluationServiceVetoBeatsAllow` domain service:
[source,java]
----
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc b/core/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc
index 4d1d3a6..502e68e 100644
--- a/core/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc
+++ b/core/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc
@@ -16,9 +16,9 @@ public interface HasUsername {
}
----
-Modules in the xref:secman:ROOT:about.adoc[SecMan extension] and also the (non-ASF) link:https://platform.incode.org[Incode Platform^] that either have domain entity that implement and/or services that contribute this interface are:
+Modules in the xref:security:ROOT:about.adoc[SecMan extension] and also the (non-ASF) link:https://platform.incode.org[Incode Platform^] that either have domain entity that implement and/or services that contribute this interface are:
-* xref:secman:ROOT:about.adoc[SecMan extension]: `ApplicationUser` entity, `HasUsernameContributions` service
+* xref:security:ROOT:about.adoc[SecMan extension]: `ApplicationUser` entity, `HasUsernameContributions` service
* audit module: `AuditEntry` entity
* command module: `CommandJdo` entity, `HasUsernameContributions` service
* sessionlogger module: `SessionLogEntry` entity, `HasUsernameContributions` service
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc b/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc
index 9a32efa..52544d2 100644
--- a/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc
+++ b/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc
@@ -8,7 +8,7 @@ This is a convenience superclass for creating subscriber domain services on the
It uses xref:refguide:applib-ant:PostConstruct.adoc[`@PostConstruct`] and xref:refguide:applib-ant:PreDestroy.adoc[`@PreDestroy`] callbacks to automatically register/unregister itself with the `EventBusService`.
It's important that subscribers register before any domain services that might emit events on the xref:refguide:applib-svc:core-domain-api/EventBusService.adoc[`EventBusService`].
-For example, the xref:secman:ROOT:about.adoc[SecMan extension] provides a domain service that automatically seeds certain domain entities; these will generate xref:refguide:applib-cm:classes/lifecycleevent.adoc[lifecycle events] and so any subscribers must be registered before such seed services.
+For example, the xref:security:ROOT:about.adoc[SecMan extension] provides a domain service that automatically seeds certain domain entities; these will generate xref:refguide:applib-cm:classes/lifecycleevent.adoc[lifecycle events] and so any subscribers must be registered before such seed services.
The easiest way to do this is to use the Spring link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/core/annotation/Order.html[`@Order`] annotation.
As a convenience, the `AbstractSubscriber` specifies this attribute.
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc b/core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc
index 762b34e..ade147a 100644
--- a/core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc
+++ b/core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc
@@ -83,7 +83,7 @@ public class MySubscribingDomainService {
----
<1> subscribers are typically not visible in the UI, so specify a `DOMAIN` nature
<2> It's important that subscribers register before any domain services that might emit events on the event bus service.
-For example, the xref:secman:ROOT:about.adoc[SecMan extension] provides a domain service that automatically seeds certain domain entities; these will generate xref:refguide:applib-cm:classes/lifecycleevent.adoc[lifecycle events] and so any subscribers must be registered before such seed services.
+For example, the xref:security:ROOT:about.adoc[SecMan extension] provides a domain service that automatically seeds certain domain entities; these will generate xref:refguide:applib-cm:classes/lifecycleevent.adoc[lifecycle events] and so any subscribers must be registered before such seed services.
The easiest way to do this is to use the link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/core/annotation/Order.html[`@Order`] annotation.
<3> register with the event bus service during xref:refguide:applib-ant:PostConstruct.adoc[`@PostConstruct`]
initialization
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc b/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc
index 367cf6a..09208f0 100644
--- a/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc
+++ b/core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc
@@ -54,7 +54,7 @@ The username and email address must both be unique (not being used by an existin
The core Apache Isis framework itself defines only an API; there is no default implementation.
Rather, the implementation will depend on the security mechanism being used.
-That said, if you have configured your app to use the xref:secman:ROOT:about.adoc[SecMan extension] then note that it _does_ provide an abstract implementation (`SecurityModuleAppUserRegistrationServiceAbstract`) of the `UserRegistrationService`.
+That said, if you have configured your app to use the xref:security:ROOT:about.adoc[SecMan extension] then note that it _does_ provide an abstract implementation (`SecurityModuleAppUserRegistrationServiceAbstract`) of the `UserRegistrationService`.
You will need to extend that service and provide implementation for the two abstract methods: `getInitialRole()` and `getAdditionalInitialRoles()`.
For example:
diff --git a/core/config/src/main/doc/modules/config/pages/configuring-core.adoc b/core/config/src/main/doc/modules/config/pages/configuring-core.adoc
index fdd722e..5523ec0 100644
--- a/core/config/src/main/doc/modules/config/pages/configuring-core.adoc
+++ b/core/config/src/main/doc/modules/config/pages/configuring-core.adoc
@@ -692,7 +692,7 @@ If an parent object has a (scalar) reference some other object to which the user
+
If an object is returned in a list of choices or within an auto-complete list, and the user does not have access, then it is excluded from the rendered list.
-The original motivation for this feature was to transparently support such features as multi-tenancy (as per the xref:secman:ROOT:about.adoc[SecMan extension]).
+The original motivation for this feature was to transparently support such features as multi-tenancy (as per the xref:security:ROOT:about.adoc[SecMan extension]).
That is, if an entity is logically "owned" by a user, then the multi-tenancy support can be arranged to prevent some other user from viewing that object.
By default this configuration property is enabled. To disable the visibility filtering, set the appropriate configuration property to `false`:
diff --git a/core/security/shiro/src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc b/core/security/shiro/src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc
index fb22939..4d14a6d 100644
--- a/core/security/shiro/src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc
+++ b/core/security/shiro/src/main/doc/modules/shiro/pages/about/jdbc-realm.adoc
@@ -7,7 +7,7 @@ There is nothing to stop you from using some other `Realm` implementation (or in
[WARNING]
====
-If you are happy to use a database then we strongly recommend you use the xref:secman:ROOT:about.adoc[SecMan extension] instead of a vanilla JDBC; it is far more sophisticated and moreover gives you the ability to administer the system from within your Apache Isis application.
+If you are happy to use a database then we strongly recommend you use the xref:security:ROOT:about.adoc[SecMan extension] instead of a vanilla JDBC; it is far more sophisticated and moreover gives you the ability to administer the system from within your Apache Isis application.
====
If you go down this route, then the architecture is as follows:
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/user-registration.adoc b/core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/user-registration.adoc
index 7b77866..2806043 100644
--- a/core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/user-registration.adoc
+++ b/core/viewers/wicket/src/main/doc/modules/ROOT/pages/features/user-registration.adoc
@@ -20,7 +20,7 @@ To support this the framework requires three services to be registered and confi
* the xref:refguide:applib-svc:integration-api/EmailService.adoc[email service], that is used by the email notification service to actually send the email.
The Apache Isis core framework provides a default implementation of both the email notification service and the email service.
-The xref:secman:ROOT:about.adoc[Security Manager] extension provides a partial implementation of xref:refguide:applib-svc:persistence-layer-spi/UserRegistrationService.adoc[user registration service] that you can complete for your own applications.
+The xref:security:ROOT:about.adoc[Security Manager] extension provides a partial implementation of xref:refguide:applib-svc:persistence-layer-spi/UserRegistrationService.adoc[user registration service] that you can complete for your own applications.
@@ -65,7 +65,7 @@ image::user-registration/sign-up-after-registration.png[width="800px",link="{ima
There are two prerequisites:
-* register an implementation of the xref:refguide:applib-svc:persistence-layer-spi/UserRegistrationService.adoc[user registration service] (eg by using the xref:secman:ROOT:about.adoc[SecMan extension])
+* register an implementation of the xref:refguide:applib-svc:persistence-layer-spi/UserRegistrationService.adoc[user registration service] (eg by using the xref:security:ROOT:about.adoc[SecMan extension])
* configure the xref:refguide:applib-svc:integration-api/EmailService.adoc[email service]
diff --git a/core/viewers/wicket/src/main/doc/modules/ROOT/partials/security/user-registration.adoc b/core/viewers/wicket/src/main/doc/modules/ROOT/partials/security/user-registration.adoc
index ba78a52..1301f38 100644
--- a/core/viewers/wicket/src/main/doc/modules/ROOT/partials/security/user-registration.adoc
+++ b/core/viewers/wicket/src/main/doc/modules/ROOT/partials/security/user-registration.adoc
@@ -16,7 +16,7 @@ The sign-in verification page to render is pluggable; see xref:vw:ROOT:extending
User registration is only available if the xref:refguide:applib-svc:persistence-layer-spi/UserRegistrationService.adoc[`UserRegistrationService`] is configured; this is used by the framework to actually create new instances of the user as accessed by the corresponding (Shiro) realm.
Because Shiro realms are pluggable, the Apache Isis framework does not provide default implementations of this service.
-However, if you are using the xref:secman:ROOT:about.adoc[SecMan extension], then this module _does_ provide an implementation (that, as you might expect, creates new "user" domain entities).
+However, if you are using the xref:security:ROOT:about.adoc[SecMan extension], then this module _does_ provide an implementation (that, as you might expect, creates new "user" domain entities).
And, if you are using the xref:security:realm-ldap:about.adoc[LDAP realm] and want to enable user-self registration then you'll need to write your own implementation of this service.
diff --git a/extensions/security/secman/src/main/doc/antora.yml b/extensions/security/secman/src/main/doc/antora.yml
index 88ed3f2..09a6b1a 100644
--- a/extensions/security/secman/src/main/doc/antora.yml
+++ b/extensions/security/secman/src/main/doc/antora.yml
@@ -1,6 +1,2 @@
-name: secman
-title: "SecMan"
+name: security
version: master
-start_page: ROOT:about.adoc
-nav:
-- modules/ROOT/nav.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/nav.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/nav.adoc
deleted file mode 100644
index d87dda7..0000000
--- a/extensions/security/secman/src/main/doc/modules/ROOT/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::secman:ROOT:partial$component-nav.adoc[]
\ No newline at end of file
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/partials/component-nav.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/partials/component-nav.adoc
deleted file mode 100644
index 422ebe1..0000000
--- a/extensions/security/secman/src/main/doc/modules/ROOT/partials/component-nav.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-include::secman:ROOT:partial$module-nav.adoc[]
-include::secman:api:partial$module-nav.adoc[]
-include::secman:model:partial$module-nav.adoc[]
-include::secman:persistence-jdo:partial$module-nav.adoc[]
-include::secman:encryption-jbcrypt:partial$module-nav.adoc[]
-
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/partials/module-nav.adoc b/extensions/security/secman/src/main/doc/modules/ROOT/partials/module-nav.adoc
deleted file mode 100644
index 0aa7514..0000000
--- a/extensions/security/secman/src/main/doc/modules/ROOT/partials/module-nav.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-* xref:secman:ROOT:api.adoc[API]
-* xref:secman:ROOT:model.adoc[Model]
-* xref:secman:ROOT:jbcrypt-encryption.adoc[JBCrypt Encryption]
-* xref:secman:ROOT:jdo-persistence.adoc[JDO Persistence]
-* xref:secman:ROOT:shiro-realm.adoc[Realm (for Shiro)]
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG b/extensions/security/secman/src/main/doc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/ROOT/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
rename to extensions/security/secman/src/main/doc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG b/extensions/security/secman/src/main/doc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/ROOT/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG
rename to extensions/security/secman/src/main/doc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG
diff --git a/extensions/security/secman/src/main/doc/modules/secman/nav.adoc b/extensions/security/secman/src/main/doc/modules/secman/nav.adoc
new file mode 100644
index 0000000..4ec4e15
--- /dev/null
+++ b/extensions/security/secman/src/main/doc/modules/secman/nav.adoc
@@ -0,0 +1 @@
+include::security:ROOT:partial$component-nav.adoc[]
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/pages/about.adoc b/extensions/security/secman/src/main/doc/modules/secman/pages/about.adoc
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/ROOT/pages/about.adoc
rename to extensions/security/secman/src/main/doc/modules/secman/pages/about.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/pages/api.adoc b/extensions/security/secman/src/main/doc/modules/secman/pages/api.adoc
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/ROOT/pages/api.adoc
rename to extensions/security/secman/src/main/doc/modules/secman/pages/api.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/pages/jbcrypt-encryption.adoc b/extensions/security/secman/src/main/doc/modules/secman/pages/jbcrypt-encryption.adoc
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/ROOT/pages/jbcrypt-encryption.adoc
rename to extensions/security/secman/src/main/doc/modules/secman/pages/jbcrypt-encryption.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/pages/jdo-persistence.adoc b/extensions/security/secman/src/main/doc/modules/secman/pages/jdo-persistence.adoc
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/ROOT/pages/jdo-persistence.adoc
rename to extensions/security/secman/src/main/doc/modules/secman/pages/jdo-persistence.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/pages/model.adoc b/extensions/security/secman/src/main/doc/modules/secman/pages/model.adoc
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/ROOT/pages/model.adoc
rename to extensions/security/secman/src/main/doc/modules/secman/pages/model.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/ROOT/pages/shiro-realm.adoc b/extensions/security/secman/src/main/doc/modules/secman/pages/shiro-realm.adoc
similarity index 89%
rename from extensions/security/secman/src/main/doc/modules/ROOT/pages/shiro-realm.adoc
rename to extensions/security/secman/src/main/doc/modules/secman/pages/shiro-realm.adoc
index cc3ea27..658a8f1 100644
--- a/extensions/security/secman/src/main/doc/modules/ROOT/pages/shiro-realm.adoc
+++ b/extensions/security/secman/src/main/doc/modules/secman/pages/shiro-realm.adoc
@@ -15,7 +15,7 @@ In the configuration above user passwords are stored in the database. The modul
-The xref:secman:ROOT:about.adoc[SecMan extension] also supports a slightly more sophisticated configuration.
+The xref:security:ROOT:about.adoc[SecMan extension] also supports a slightly more sophisticated configuration.
Most organizations use LDAP for user credentials, and maintaining two separate user accounts would be less than ideal.
The `IsisModuleSecurityRealm` can therefore be configured with a subsidiary "delegate" realm that is responsible for performing the primary authentication of the user; if that passes then a user is created (as a domain entity) automatically.
In most cases this delegate realm will be the LDAP realm, and so the architecture becomes:
@@ -23,7 +23,7 @@ In most cases this delegate realm will be the LDAP realm, and so the architectur
image::configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG[width="600px",link="{imagesdir}/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG"]
-The xref:secman:ROOT:about.adoc[SecMan extension] has many more features than are described here, all of which are described in the module's README.
+The xref:security:ROOT:about.adoc[SecMan extension] has many more features than are described here, all of which are described in the module's README.
The README also explains in detail how to configure an existing app to use this module.
//You can also look at the Isisaddons https://github.com/isisaddons/isis-app-todoapp[todoapp example] (not ASF), which is preconfigured to use the security module.
diff --git a/extensions/security/secman/src/main/doc/modules/secman/partials/module-nav.adoc b/extensions/security/secman/src/main/doc/modules/secman/partials/module-nav.adoc
new file mode 100644
index 0000000..8f6315d
--- /dev/null
+++ b/extensions/security/secman/src/main/doc/modules/secman/partials/module-nav.adoc
@@ -0,0 +1,5 @@
+** xref:security:ROOT:api.adoc[API]
+** xref:security:ROOT:model.adoc[Model]
+** xref:security:ROOT:jbcrypt-encryption.adoc[JBCrypt Encryption]
+** xref:security:ROOT:jdo-persistence.adoc[JDO Persistence]
+** xref:security:ROOT:shiro-realm.adoc[Realm (for Shiro)]
[isis] 18/21: ISIS-2259: reorg spring subdomains module
Posted by da...@apache.org.
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 7ff9bb90e9c6170831b9e340e20259a7471e418f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 10:16:32 2020 +0000
ISIS-2259: reorg spring subdomains module
---
antora/playbooks/site-subdomains.yml | 2 +-
antora/playbooks/site.yml | 2 +-
subdomains/pdfbox/pom.xml | 2 ++
subdomains/pom.xml | 5 ++---
subdomains/spring/{impl => applib}/pom.xml | 15 +++++++++------
.../spring/applib/IsisModuleSubSpringApplib.java} | 6 +++---
.../subdomains/spring/applib}/service/BeanDescriptor.java | 2 +-
.../subdomains/spring/applib}/service/ContextBeans.java | 2 +-
.../spring/applib}/service/SpringBeansService.java | 2 +-
subdomains/{pdfbox => spring}/pom.xml | 9 ++++++---
subdomains/spring/{impl => }/src/main/doc/antora.yml | 0
.../{impl => }/src/main/doc/modules/spring/nav.adoc | 0
.../src/main/doc/modules/spring/pages/about.adoc | 0
.../src/main/doc/modules/spring/partials/module-nav.adoc | 0
testing/fixtures/pom.xml | 2 +-
.../isis/extensions/fixtures/IsisModuleExtFixtures.java | 4 ++--
.../fixtures/modules/ModuleWithFixturesService.java | 6 +++---
testing/pom.xml | 2 +-
18 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index a283de3..f02c176 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -35,7 +35,7 @@ content:
start_path: subdomains/pdfbox/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/spring/impl/src/main/doc # subdomains
+ start_path: subdomains/spring/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/xdocreport/impl/src/main/doc # subdomains
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 6d5d845..2eab173 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -209,7 +209,7 @@ content:
start_path: subdomains/pdfbox/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/spring/impl/src/main/doc # subdomains
+ start_path: subdomains/spring/src/main/doc # subdomains
branches: HEAD
- url: .
start_path: subdomains/xdocreport/impl/src/main/doc # subdomains
diff --git a/subdomains/pdfbox/pom.xml b/subdomains/pdfbox/pom.xml
index abc97e4..fe098b3 100644
--- a/subdomains/pdfbox/pom.xml
+++ b/subdomains/pdfbox/pom.xml
@@ -24,6 +24,8 @@
<name>Apache Isis Sub - PDF Box (parent)</name>
<description>Integrates PDF Box Library</description>
+ <packaging>pom</packaging>
+
<modules>
<module>applib</module>
</modules>
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index aadd918..6ce8e1a 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -115,7 +115,7 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-spring</artifactId>
+ <artifactId>isis-subdomains-spring-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -149,8 +149,7 @@
<module>freemarker</module>
<module>ognl</module>
<module>pdfbox</module>
-
- <module>spring/impl</module>
+ <module>spring</module>
<module>xdocreport/impl</module>
<module>zip/impl</module>
diff --git a/subdomains/spring/impl/pom.xml b/subdomains/spring/applib/pom.xml
similarity index 78%
rename from subdomains/spring/impl/pom.xml
rename to subdomains/spring/applib/pom.xml
index 76f3984..0277c01 100644
--- a/subdomains/spring/impl/pom.xml
+++ b/subdomains/spring/applib/pom.xml
@@ -16,24 +16,27 @@
<parent>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
+ <artifactId>isis-subdomains-spring</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-spring</artifactId>
+ <artifactId>isis-subdomains-spring-applib</artifactId>
<name>Apache Isis Sub - Spring (applib)</name>
- <description>Utility services for interacting with the Spring application context (that hosts the Apache Isis application itself)</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.spring</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/spring</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.subdomains.spring.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/subdomains/spring.applib</git-plugin.propertiesDir>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-runtime</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/IsisModuleExtSpring.java b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/IsisModuleSubSpringApplib.java
similarity index 85%
rename from subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/IsisModuleExtSpring.java
rename to subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/IsisModuleSubSpringApplib.java
index 38eca4d..3768961 100644
--- a/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/IsisModuleExtSpring.java
+++ b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/IsisModuleSubSpringApplib.java
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.spring;
+package org.apache.isis.subdomains.spring.applib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.spring.service.SpringBeansService;
+import org.apache.isis.subdomains.spring.applib.service.SpringBeansService;
@Configuration
@Import({
SpringBeansService.class
})
-public class IsisModuleExtSpring {
+public class IsisModuleSubSpringApplib {
}
diff --git a/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/BeanDescriptor.java
similarity index 97%
rename from subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java
rename to subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/BeanDescriptor.java
index 7e41829..f25c123 100644
--- a/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/BeanDescriptor.java
+++ b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/BeanDescriptor.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.spring.service;
+package org.apache.isis.subdomains.spring.applib.service;
import java.util.Arrays;
import java.util.Collections;
diff --git a/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/ContextBeans.java
similarity index 97%
rename from subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java
rename to subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/ContextBeans.java
index 1f71509..cb810e2 100644
--- a/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/ContextBeans.java
+++ b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/ContextBeans.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.spring.service;
+package org.apache.isis.subdomains.spring.applib.service;
import java.util.Arrays;
import java.util.Collections;
diff --git a/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
similarity index 97%
rename from subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
rename to subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
index d869a18..9f7e326 100644
--- a/subdomains/spring/impl/src/main/java/org/apache/isis/extensions/spring/service/SpringBeansService.java
+++ b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.spring.service;
+package org.apache.isis.subdomains.spring.applib.service;
import java.util.HashMap;
import java.util.Map;
diff --git a/subdomains/pdfbox/pom.xml b/subdomains/spring/pom.xml
similarity index 80%
copy from subdomains/pdfbox/pom.xml
copy to subdomains/spring/pom.xml
index abc97e4..e02db86 100644
--- a/subdomains/pdfbox/pom.xml
+++ b/subdomains/spring/pom.xml
@@ -18,11 +18,14 @@
<groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-pdfbox</artifactId>
- <name>Apache Isis Sub - PDF Box (parent)</name>
- <description>Integrates PDF Box Library</description>
+ <artifactId>isis-subdomains-spring</artifactId>
+ <name>Apache Isis Sub - Spring (parent)</name>
+ <description>Utility services for interacting with the Spring application context (that hosts the Apache Isis application itself)</description>
+
+ <packaging>pom</packaging>
<modules>
<module>applib</module>
diff --git a/subdomains/spring/impl/src/main/doc/antora.yml b/subdomains/spring/src/main/doc/antora.yml
similarity index 100%
rename from subdomains/spring/impl/src/main/doc/antora.yml
rename to subdomains/spring/src/main/doc/antora.yml
diff --git a/subdomains/spring/impl/src/main/doc/modules/spring/nav.adoc b/subdomains/spring/src/main/doc/modules/spring/nav.adoc
similarity index 100%
rename from subdomains/spring/impl/src/main/doc/modules/spring/nav.adoc
rename to subdomains/spring/src/main/doc/modules/spring/nav.adoc
diff --git a/subdomains/spring/impl/src/main/doc/modules/spring/pages/about.adoc b/subdomains/spring/src/main/doc/modules/spring/pages/about.adoc
similarity index 100%
rename from subdomains/spring/impl/src/main/doc/modules/spring/pages/about.adoc
rename to subdomains/spring/src/main/doc/modules/spring/pages/about.adoc
diff --git a/subdomains/spring/impl/src/main/doc/modules/spring/partials/module-nav.adoc b/subdomains/spring/src/main/doc/modules/spring/partials/module-nav.adoc
similarity index 100%
rename from subdomains/spring/impl/src/main/doc/modules/spring/partials/module-nav.adoc
rename to subdomains/spring/src/main/doc/modules/spring/partials/module-nav.adoc
diff --git a/testing/fixtures/pom.xml b/testing/fixtures/pom.xml
index e4b9c9b..a296ae2 100644
--- a/testing/fixtures/pom.xml
+++ b/testing/fixtures/pom.xml
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-spring</artifactId>
+ <artifactId>isis-subdomains-spring-applib</artifactId>
</dependency>
<!-- JDO API (non transient, provided by plugin) -->
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java
index 067970e..4c2c7df 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java
+++ b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java
@@ -25,12 +25,12 @@ import org.apache.isis.extensions.fixtures.fixturescripts.ExecutionParametersSer
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.apache.isis.extensions.fixtures.legacy.queryresultscache.QueryResultsCacheControlDefault;
import org.apache.isis.extensions.fixtures.modules.ModuleWithFixturesService;
-import org.apache.isis.extensions.spring.IsisModuleExtSpring;
+import org.apache.isis.subdomains.spring.applib.IsisModuleSubSpringApplib;
@Configuration
@Import({
// modules
- IsisModuleExtSpring.class,
+ IsisModuleSubSpringApplib.class,
// @Service's
FixturesLifecycleService.class,
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
index 51ab0f6..b586331 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
+++ b/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
@@ -40,9 +40,9 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.spring.service.BeanDescriptor;
-import org.apache.isis.extensions.spring.service.ContextBeans;
-import org.apache.isis.extensions.spring.service.SpringBeansService;
+import org.apache.isis.subdomains.spring.applib.service.BeanDescriptor;
+import org.apache.isis.subdomains.spring.applib.service.ContextBeans;
+import org.apache.isis.subdomains.spring.applib.service.SpringBeansService;
import org.apache.isis.metamodel.facets.Annotations;
import lombok.Data;
diff --git a/testing/pom.xml b/testing/pom.xml
index ba3d882..039c114 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-spring</artifactId>
+ <artifactId>isis-subdomains-spring-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
[isis] 03/21: ISIS-2062: moves secman and shiro-realm-ldap from
extensions to security module.
Posted by da...@apache.org.
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 8c563593798f6eed1bfa30bf12f794043635c20f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 06:19:56 2020 +0000
ISIS-2062: moves secman and shiro-realm-ldap from extensions to security module.
---
.../extensions/modules/ROOT/partials/component-nav.adoc | 4 ----
.../security/modules/ROOT/partials/component-nav.adoc | 3 ++-
.../src/main/doc/modules/secman/partials/module-nav.adoc | 11 ++++++-----
extensions/security/shiro-realm-ldap/src/main/doc/antora.yml | 2 +-
.../doc/modules/shiro-realm-ldap/partials/module-nav.adoc | 2 +-
5 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
index 104d562..a10d993 100644
--- a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
@@ -3,10 +3,6 @@ include::extensions:ROOT:partial$module-nav.adoc[]
* JDO Persistence
include::extensions:flywayjdo:partial$module-nav.adoc[]
-* Security
-include::extensions:shiro-realm-ldap:partial$module-nav.adoc[]
-** xref:security:ROOT:about.adoc[SecMan]
-
* Wicket Viewer
include::extensions:exceldownload:partial$module-nav.adoc[]
diff --git a/antora/components/security/modules/ROOT/partials/component-nav.adoc b/antora/components/security/modules/ROOT/partials/component-nav.adoc
index c82d3a3..eea4ff8 100644
--- a/antora/components/security/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/security/modules/ROOT/partials/component-nav.adoc
@@ -5,5 +5,6 @@ include::security:shiro:partial$module-nav.adoc[]
include::security:keycloak:partial$module-nav.adoc[]
include::security:ROOT:partial$module-nav2.adoc[]
-* Secman (extension)
+* Extensions
include::security:secman:partial$module-nav.adoc[]
+include::security:shiro-realm-ldap:partial$module-nav.adoc[]
diff --git a/extensions/security/secman/src/main/doc/modules/secman/partials/module-nav.adoc b/extensions/security/secman/src/main/doc/modules/secman/partials/module-nav.adoc
index 8f6315d..41ad8dc 100644
--- a/extensions/security/secman/src/main/doc/modules/secman/partials/module-nav.adoc
+++ b/extensions/security/secman/src/main/doc/modules/secman/partials/module-nav.adoc
@@ -1,5 +1,6 @@
-** xref:security:ROOT:api.adoc[API]
-** xref:security:ROOT:model.adoc[Model]
-** xref:security:ROOT:jbcrypt-encryption.adoc[JBCrypt Encryption]
-** xref:security:ROOT:jdo-persistence.adoc[JDO Persistence]
-** xref:security:ROOT:shiro-realm.adoc[Realm (for Shiro)]
+** xref:security:ROOT:about.adoc[Secman]
+*** xref:security:ROOT:api.adoc[API]
+*** xref:security:ROOT:model.adoc[Model]
+*** xref:security:ROOT:jbcrypt-encryption.adoc[JBCrypt Encryption]
+*** xref:security:ROOT:jdo-persistence.adoc[JDO Persistence]
+*** xref:security:ROOT:shiro-realm.adoc[Realm (for Shiro)]
diff --git a/extensions/security/shiro-realm-ldap/src/main/doc/antora.yml b/extensions/security/shiro-realm-ldap/src/main/doc/antora.yml
index eeeeb1e..09a6b1a 100644
--- a/extensions/security/shiro-realm-ldap/src/main/doc/antora.yml
+++ b/extensions/security/shiro-realm-ldap/src/main/doc/antora.yml
@@ -1,2 +1,2 @@
-name: extensions
+name: security
version: master
diff --git a/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/partials/module-nav.adoc b/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/partials/module-nav.adoc
index 86e6093..8d22851 100644
--- a/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/partials/module-nav.adoc
+++ b/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/partials/module-nav.adoc
@@ -1 +1 @@
-** xref:extensions:shiro-realm-ldap:about.adoc[LDAP Realm for Shiro]
\ No newline at end of file
+** xref:security:shiro-realm-ldap:about.adoc[LDAP Realm for Shiro]
[isis] 20/21: ISIS-2259: reorg fakedata module
Posted by da...@apache.org.
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 e57006281c2fdc4b946545279b14b17f66ab79ef
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 11:05:56 2020 +0000
ISIS-2259: reorg fakedata module
---
...15-HealthAssessmentReport_DRCP594591_138322.pdf | Bin 0 -> 932790 bytes
...9-HealthAssessmentReport_DRCJ1712475_138322.pdf | Bin 0 -> 1387664 bytes
antora/playbooks/site-subdomains.yml | 2 +-
antora/playbooks/site-testing.yml | 2 +-
antora/playbooks/site.yml | 4 +--
extensions/pom.xml | 2 +-
.../vw/pdfjs/{fixture => fixtures}/.gitignore | 0
.../pdfjs/fixtures}/logging-dn-enhance.properties | 0
extensions/vw/pdfjs/{fixture => fixtures}/pom.xml | 0
.../src/main/java/META-INF/persistence.xml | 0
.../wicket/pdfjs/fixture/PdfjsFixturesModule.java | 0
.../demomodule/dom/PdfJsDemoObjectWithBlob.java | 0
.../dom/PdfJsDemoObjectWithBlobMenu.java | 0
...fJsDemoObjectWithBlob_createUpTo5_fakeData.java | 0
.../PdfJsDemoObjectWithBlob_tearDown.java | 0
extensions/vw/pdfjs/pom.xml | 3 ++
legacy/mappings/restclient/pom.xml | 14 ++++++++-
mappings/restclient/api/pom.xml | 5 ++++
.../restclient/auth/BasicAuthFilter.java | 1 +
subdomains/excel/fixture/pom.xml | 2 +-
subdomains/excel/integtests/pom.xml | 2 +-
subdomains/pom.xml | 4 +--
subdomains/zip/{impl => applib}/pom.xml | 16 ++++------
.../isis/extensions/zip/dom/IsisModuleExtZip.java | 0
.../isis/extensions/zip/dom/impl/ZipService.java | 0
subdomains/zip/{impl => }/pom.xml | 33 ++++-----------------
subdomains/zip/{impl => }/src/main/doc/antora.yml | 0
.../{impl => }/src/main/doc/modules/zip/nav.adoc | 0
.../src/main/doc/modules/zip/pages/about.adoc | 0
.../main/doc/modules/zip/partials/module-nav.adoc | 0
testing/fakedata/{impl => applib}/pom.xml | 22 +++++++-------
.../applib/IsisModuleTstFakeDataApplib.java} | 4 +--
.../services/AbstractRandomValueGenerator.java | 2 +-
.../fakedata/applib}/services/Addresses.java | 2 +-
.../fakedata/applib}/services/BigDecimals.java | 2 +-
.../fakedata/applib}/services/BigIntegers.java | 2 +-
.../testing/fakedata/applib}/services/Books.java | 2 +-
.../fakedata/applib}/services/Booleans.java | 2 +-
.../testing/fakedata/applib}/services/Bytes.java | 2 +-
.../testing/fakedata/applib}/services/Chars.java | 2 +-
.../fakedata/applib}/services/Collections.java | 2 +-
.../testing/fakedata/applib}/services/Comms.java | 2 +-
.../fakedata/applib}/services/CreditCards.java | 2 +-
.../testing/fakedata/applib}/services/Doubles.java | 2 +-
.../testing/fakedata/applib}/services/Enums.java | 2 +-
.../fakedata/applib}/services/FakeDataService.java | 2 +-
.../testing/fakedata/applib}/services/Floats.java | 2 +-
.../fakedata/applib}/services/Integers.java | 2 +-
.../fakedata/applib}/services/IsisBlobs.java | 2 +-
.../fakedata/applib}/services/IsisClobs.java | 2 +-
.../fakedata/applib}/services/IsisMoneys.java | 2 +-
.../fakedata/applib}/services/IsisPasswords.java | 2 +-
.../fakedata/applib}/services/J8DateTimes.java | 2 +-
.../fakedata/applib}/services/J8LocalDates.java | 2 +-
.../fakedata/applib}/services/J8Periods.java | 2 +-
.../fakedata/applib}/services/JavaSqlDates.java | 2 +-
.../applib}/services/JavaSqlTimestamps.java | 2 +-
.../fakedata/applib}/services/JavaUtilDates.java | 2 +-
.../testing/fakedata/applib}/services/Longs.java | 2 +-
.../testing/fakedata/applib}/services/Lorem.java | 2 +-
.../testing/fakedata/applib}/services/Names.java | 2 +-
.../testing/fakedata/applib}/services/Shorts.java | 2 +-
.../testing/fakedata/applib}/services/Strings.java | 2 +-
.../testing/fakedata/applib}/services/Urls.java | 2 +-
.../testing/fakedata/applib}/services/Uuids.java | 2 +-
.../services/blobs/Pawson-Naked-Objects-thesis.pdf | Bin
.../applib}/services/blobs/image01-150x150.jpg | Bin
.../applib}/services/blobs/image01-2048x1536.jpg | Bin
.../applib}/services/blobs/image01-240x180.jpg | Bin
.../applib}/services/blobs/image01-4000x3000.jpg | Bin
.../applib}/services/blobs/image01-640x480.jpg | Bin
.../applib}/services/blobs/image02-150x150.jpg | Bin
.../applib}/services/blobs/image02-2048x1536.jpg | Bin
.../applib}/services/blobs/image02-240x180.jpg | Bin
.../applib}/services/blobs/image02-4000x3000.jpg | Bin
.../applib}/services/blobs/image02-640x480.jpg | Bin
.../applib}/services/blobs/rick-mugridge-paper.pdf | Bin
.../applib}/services/clobs/RTF-Spec-1.7.rtf | 0
.../fakedata/applib}/services/clobs/a_and_c.xml | 0
.../fakedata/applib}/services/clobs/all_well.xml | 0
.../fakedata/applib}/services/clobs/as_you.xml | 0
.../fakedata/applib}/services/clobs/com_err.xml | 0
.../fakedata/applib}/services/clobs/config.rtf | 0
.../fakedata/applib}/services/clobs/coriolan.xml | 0
.../fakedata/applib}/services/clobs/cymbelin.xml | 0
.../fakedata/applib}/services/clobs/dream.xml | 0
.../fakedata/applib}/services/clobs/dsssl.dtd | 0
.../fakedata/applib}/services/clobs/fot.dtd | 0
.../fakedata/applib}/services/clobs/hamlet.xml | 0
.../fakedata/applib}/services/clobs/hen_iv_1.xml | 0
.../fakedata/applib}/services/clobs/hen_iv_2.xml | 0
.../fakedata/applib}/services/clobs/hen_v.xml | 0
.../fakedata/applib}/services/clobs/hen_vi_1.xml | 0
.../fakedata/applib}/services/clobs/hen_vi_2.xml | 0
.../fakedata/applib}/services/clobs/hen_vi_3.xml | 0
.../fakedata/applib}/services/clobs/hen_viii.xml | 0
.../fakedata/applib}/services/clobs/j_caesar.xml | 0
.../fakedata/applib}/services/clobs/john.xml | 0
.../fakedata/applib}/services/clobs/lear.xml | 0
.../fakedata/applib}/services/clobs/lll.xml | 0
.../fakedata/applib}/services/clobs/m_for_m.xml | 0
.../fakedata/applib}/services/clobs/m_wives.xml | 0
.../fakedata/applib}/services/clobs/macbeth.xml | 0
.../fakedata/applib}/services/clobs/merchant.xml | 0
.../fakedata/applib}/services/clobs/much_ado.xml | 0
.../fakedata/applib}/services/clobs/othello.xml | 0
.../fakedata/applib}/services/clobs/pericles.xml | 0
.../fakedata/applib}/services/clobs/play.dtd | 0
.../fakedata/applib}/services/clobs/r_and_j.xml | 0
.../fakedata/applib}/services/clobs/rich_ii.xml | 0
.../fakedata/applib}/services/clobs/rich_iii.xml | 0
.../fakedata/applib}/services/clobs/sample.rtf | 0
.../fakedata/applib}/services/clobs/shaksper.htm | 0
.../applib}/services/clobs/style-sheet.dtd | 0
.../fakedata/applib}/services/clobs/t_night.xml | 0
.../fakedata/applib}/services/clobs/taming.xml | 0
.../fakedata/applib}/services/clobs/tempest.xml | 0
.../fakedata/applib}/services/clobs/testrtf.rtf | 0
.../fakedata/applib}/services/clobs/timon.xml | 0
.../fakedata/applib}/services/clobs/titus.xml | 0
.../fakedata/applib}/services/clobs/troilus.xml | 0
.../fakedata/applib}/services/clobs/two_gent.xml | 0
.../testing/fakedata/applib}/services/clobs/vs | 0
.../testing/fakedata/applib}/services/clobs/vx | 0
.../fakedata/applib}/services/clobs/win_tale.xml | 0
.../fakedata/applib}/services/clobs/xml.dcl | 0
.../fakedata/applib}/services/clobs/xml.soc | 0
.../applib}/services/FakeDataServiceTest.java | 2 +-
.../fixture/demoapp/demomodule/dom/EnumOf3.java | 7 -----
testing/fakedata/{fixture => fixtures}/.gitignore | 0
.../fixtures}/logging-dn-enhance.properties | 0
testing/fakedata/{fixture => fixtures}/pom.xml | 10 +++----
.../src/main/java/META-INF/persistence.xml | 2 +-
.../fixtures/IsisModuleTstFakeDataFixtures.java} | 7 ++---
.../fixtures/demoapp/demomodule/dom/EnumOf3.java | 7 +++++
.../demomodule/dom/FakeDataDemoObjectWithAll.java | 2 +-
.../demomodule/dom/FakeDataDemoObjectWithAll.png | Bin
.../dom/FakeDataDemoObjectWithAllMenu.java | 2 +-
.../FakeDataDemoObjectWithAll_create3.java | 8 ++---
.../FakeDataDemoObjectWithAll_tearDown.java | 5 ++--
...eDataDemoObjectWithAll_create_withFakeData.java | 9 +++---
...eDataDemoObjectWithAll_update_withFakeData.java | 9 +++---
testing/fakedata/integtests/pom.xml | 13 ++++----
.../FakeDataModuleIntegTestAbstract.java | 2 +-
.../integtests/tests/Bootstrap_IntegTest.java | 4 +--
.../fakedata/integtests/tests/Smoke_IntegTest.java | 4 +--
testing/fakedata/pom.xml | 27 +++++++++++++++++
.../fakedata/{impl => }/src/main/doc/antora.yml | 0
.../src/main/doc/modules/fakedata/nav.adoc | 0
.../src/main/doc/modules/fakedata/pages/about.adoc | 0
.../doc/modules/fakedata/partials/module-nav.adoc | 0
testing/pom.xml | 9 ++----
152 files changed, 163 insertions(+), 148 deletions(-)
diff --git a/antora/components/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2015-HealthAssessmentReport_DRCP594591_138322.pdf b/antora/components/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2015-HealthAssessmentReport_DRCP594591_138322.pdf
new file mode 100644
index 0000000..5840789
Binary files /dev/null and b/antora/components/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2015-HealthAssessmentReport_DRCP594591_138322.pdf differ
diff --git a/antora/components/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2019-HealthAssessmentReport_DRCJ1712475_138322.pdf b/antora/components/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2019-HealthAssessmentReport_DRCJ1712475_138322.pdf
new file mode 100644
index 0000000..553b028
Binary files /dev/null and b/antora/components/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2019-HealthAssessmentReport_DRCJ1712475_138322.pdf differ
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index 6b05fc2..d491273 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -41,7 +41,7 @@ content:
start_path: subdomains/xdocreport/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/zip/impl/src/main/doc # subdomains
+ start_path: subdomains/zip/src/main/doc # subdomains
branches: HEAD
diff --git a/antora/playbooks/site-testing.yml b/antora/playbooks/site-testing.yml
index ff2d153..44128c5 100644
--- a/antora/playbooks/site-testing.yml
+++ b/antora/playbooks/site-testing.yml
@@ -25,7 +25,7 @@ content:
# testing
- url: .
- start_path: testing/fakedata/impl/src/main/doc # testing
+ start_path: testing/fakedata/src/main/doc # testing
branches: HEAD
- url: .
start_path: testing/fixtures/src/main/doc # testing
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 803986f..dc1e417 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -215,12 +215,12 @@ content:
start_path: subdomains/xdocreport/src/main/doc # subdomains
branches: HEAD
- url: .
- start_path: subdomains/zip/impl/src/main/doc # subdomains
+ start_path: subdomains/zip/src/main/doc # subdomains
branches: HEAD
# testing
- url: .
- start_path: testing/fakedata/impl/src/main/doc # testing
+ start_path: testing/fakedata/src/main/doc # testing
branches: HEAD
- url: .
start_path: testing/fixtures/src/main/doc # testing
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 425bb44..564375c 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -75,7 +75,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-pdfjs-fixture</artifactId>
+ <artifactId>isis-extensions-pdfjs-fixtures</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/extensions/vw/pdfjs/fixture/.gitignore b/extensions/vw/pdfjs/fixtures/.gitignore
similarity index 100%
rename from extensions/vw/pdfjs/fixture/.gitignore
rename to extensions/vw/pdfjs/fixtures/.gitignore
diff --git a/testing/fakedata/fixture/logging-dn-enhance.properties b/extensions/vw/pdfjs/fixtures/logging-dn-enhance.properties
similarity index 100%
rename from testing/fakedata/fixture/logging-dn-enhance.properties
rename to extensions/vw/pdfjs/fixtures/logging-dn-enhance.properties
diff --git a/extensions/vw/pdfjs/fixture/pom.xml b/extensions/vw/pdfjs/fixtures/pom.xml
similarity index 100%
rename from extensions/vw/pdfjs/fixture/pom.xml
rename to extensions/vw/pdfjs/fixtures/pom.xml
diff --git a/extensions/vw/pdfjs/fixture/src/main/java/META-INF/persistence.xml b/extensions/vw/pdfjs/fixtures/src/main/java/META-INF/persistence.xml
similarity index 100%
rename from extensions/vw/pdfjs/fixture/src/main/java/META-INF/persistence.xml
rename to extensions/vw/pdfjs/fixtures/src/main/java/META-INF/persistence.xml
diff --git a/extensions/vw/pdfjs/fixture/src/main/java/org/isisaddons/wicket/pdfjs/fixture/PdfjsFixturesModule.java b/extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/PdfjsFixturesModule.java
similarity index 100%
rename from extensions/vw/pdfjs/fixture/src/main/java/org/isisaddons/wicket/pdfjs/fixture/PdfjsFixturesModule.java
rename to extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/PdfjsFixturesModule.java
diff --git a/extensions/vw/pdfjs/fixture/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlob.java b/extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlob.java
similarity index 100%
rename from extensions/vw/pdfjs/fixture/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlob.java
rename to extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlob.java
diff --git a/extensions/vw/pdfjs/fixture/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlobMenu.java b/extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlobMenu.java
similarity index 100%
rename from extensions/vw/pdfjs/fixture/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlobMenu.java
rename to extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlobMenu.java
diff --git a/extensions/vw/pdfjs/fixture/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/fixturescripts/PdfJsDemoObjectWithBlob_createUpTo5_fakeData.java b/extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/fixturescripts/PdfJsDemoObjectWithBlob_createUpTo5_fakeData.java
similarity index 100%
rename from extensions/vw/pdfjs/fixture/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/fixturescripts/PdfJsDemoObjectWithBlob_createUpTo5_fakeData.java
rename to extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/fixturescripts/PdfJsDemoObjectWithBlob_createUpTo5_fakeData.java
diff --git a/extensions/vw/pdfjs/fixture/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/fixturescripts/PdfJsDemoObjectWithBlob_tearDown.java b/extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/fixturescripts/PdfJsDemoObjectWithBlob_tearDown.java
similarity index 100%
rename from extensions/vw/pdfjs/fixture/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/fixturescripts/PdfJsDemoObjectWithBlob_tearDown.java
rename to extensions/vw/pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/demoapp/demomodule/fixturescripts/PdfJsDemoObjectWithBlob_tearDown.java
diff --git a/extensions/vw/pdfjs/pom.xml b/extensions/vw/pdfjs/pom.xml
index 2c02a56..eb91d20 100644
--- a/extensions/vw/pdfjs/pom.xml
+++ b/extensions/vw/pdfjs/pom.xml
@@ -38,6 +38,9 @@
<modules>
<module>applib</module>
<module>metamodel</module>
+<!--
+ <module>fixtures</module>
+-->
<module>ui</module>
</modules>
diff --git a/legacy/mappings/restclient/pom.xml b/legacy/mappings/restclient/pom.xml
index 7c3a7ea..0bef4c2 100644
--- a/legacy/mappings/restclient/pom.xml
+++ b/legacy/mappings/restclient/pom.xml
@@ -38,7 +38,19 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-viewer-restfulobjects-applib</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-commons</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- TESTING -->
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/mappings/restclient/api/pom.xml b/mappings/restclient/api/pom.xml
index 1866235..55d5901 100644
--- a/mappings/restclient/api/pom.xml
+++ b/mappings/restclient/api/pom.xml
@@ -36,6 +36,11 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-applib</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-commons</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java
index c0dff13..58a742f 100644
--- a/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java
+++ b/mappings/restclient/api/src/main/java/org/apache/isis/extensions/restclient/auth/BasicAuthFilter.java
@@ -26,6 +26,7 @@ import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientRequestFilter;
import javax.xml.bind.DatatypeConverter;
+
import org.apache.isis.commons.internal.base._Strings;
import static org.apache.isis.commons.internal.base._With.requires;
diff --git a/subdomains/excel/fixture/pom.xml b/subdomains/excel/fixture/pom.xml
index 1d7d9dd..97f7f47 100644
--- a/subdomains/excel/fixture/pom.xml
+++ b/subdomains/excel/fixture/pom.xml
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fakedata-dom</artifactId>
+ <artifactId>isis-testing-fakedata-applib</artifactId>
</dependency>
-->
diff --git a/subdomains/excel/integtests/pom.xml b/subdomains/excel/integtests/pom.xml
index 689ac6c..b21e32a 100644
--- a/subdomains/excel/integtests/pom.xml
+++ b/subdomains/excel/integtests/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fakedata-dom</artifactId>
+ <artifactId>isis-testing-fakedata-applib</artifactId>
<scope>test</scope>
</dependency>
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 9f831ca..f8d6d1f 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -127,7 +127,7 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-zip-dom</artifactId>
+ <artifactId>isis-subdomains-zip-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -151,7 +151,7 @@
<module>pdfbox</module>
<module>spring</module>
<module>xdocreport</module>
- <module>zip/impl</module>
+ <module>zip/applib</module>
</modules>
<profiles>
diff --git a/subdomains/zip/impl/pom.xml b/subdomains/zip/applib/pom.xml
similarity index 80%
copy from subdomains/zip/impl/pom.xml
copy to subdomains/zip/applib/pom.xml
index e98e4cc..f7e2753 100644
--- a/subdomains/zip/impl/pom.xml
+++ b/subdomains/zip/applib/pom.xml
@@ -16,22 +16,16 @@
<parent>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
+ <artifactId>isis-subdomains-zip</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-zip-dom</artifactId>
- <name>Apache Isis Sub - Zip</name>
-
- <description>
- A domain service for Apache Isis', for zipping utilities.
- </description>
-
+ <artifactId>isis-subdomains-zip-applib</artifactId>
+ <name>Apache Isis Sub - Zip (applib)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.zip.dom</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/zip/dom</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.subdomains.zip.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/subdomains/zip/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/subdomains/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/IsisModuleExtZip.java b/subdomains/zip/applib/src/main/java/org/apache/isis/extensions/zip/dom/IsisModuleExtZip.java
similarity index 100%
rename from subdomains/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/IsisModuleExtZip.java
rename to subdomains/zip/applib/src/main/java/org/apache/isis/extensions/zip/dom/IsisModuleExtZip.java
diff --git a/subdomains/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java b/subdomains/zip/applib/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java
similarity index 100%
rename from subdomains/zip/impl/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java
rename to subdomains/zip/applib/src/main/java/org/apache/isis/extensions/zip/dom/impl/ZipService.java
diff --git a/subdomains/zip/impl/pom.xml b/subdomains/zip/pom.xml
similarity index 63%
rename from subdomains/zip/impl/pom.xml
rename to subdomains/zip/pom.xml
index e98e4cc..9696cb9 100644
--- a/subdomains/zip/impl/pom.xml
+++ b/subdomains/zip/pom.xml
@@ -18,40 +18,19 @@
<groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-zip-dom</artifactId>
- <name>Apache Isis Sub - Zip</name>
+ <artifactId>isis-subdomains-zip</artifactId>
+ <name>Apache Isis Sub - Zip (parent)</name>
<description>
A domain service for Apache Isis', for zipping utilities.
</description>
+ <packaging>pom</packaging>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.zip.dom</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/zip/dom</git-plugin.propertiesDir>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
+ <modules>
+ <module>applib</module>
+ </modules>
</project>
diff --git a/subdomains/zip/impl/src/main/doc/antora.yml b/subdomains/zip/src/main/doc/antora.yml
similarity index 100%
rename from subdomains/zip/impl/src/main/doc/antora.yml
rename to subdomains/zip/src/main/doc/antora.yml
diff --git a/subdomains/zip/impl/src/main/doc/modules/zip/nav.adoc b/subdomains/zip/src/main/doc/modules/zip/nav.adoc
similarity index 100%
rename from subdomains/zip/impl/src/main/doc/modules/zip/nav.adoc
rename to subdomains/zip/src/main/doc/modules/zip/nav.adoc
diff --git a/subdomains/zip/impl/src/main/doc/modules/zip/pages/about.adoc b/subdomains/zip/src/main/doc/modules/zip/pages/about.adoc
similarity index 100%
rename from subdomains/zip/impl/src/main/doc/modules/zip/pages/about.adoc
rename to subdomains/zip/src/main/doc/modules/zip/pages/about.adoc
diff --git a/subdomains/zip/impl/src/main/doc/modules/zip/partials/module-nav.adoc b/subdomains/zip/src/main/doc/modules/zip/partials/module-nav.adoc
similarity index 100%
rename from subdomains/zip/impl/src/main/doc/modules/zip/partials/module-nav.adoc
rename to subdomains/zip/src/main/doc/modules/zip/partials/module-nav.adoc
diff --git a/testing/fakedata/impl/pom.xml b/testing/fakedata/applib/pom.xml
similarity index 84%
rename from testing/fakedata/impl/pom.xml
rename to testing/fakedata/applib/pom.xml
index 54beacd..e111f53 100644
--- a/testing/fakedata/impl/pom.xml
+++ b/testing/fakedata/applib/pom.xml
@@ -4,22 +4,16 @@
<parent>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing</artifactId>
+ <artifactId>isis-testing-fakedata</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-testing-fakedata-dom</artifactId>
- <name>Apache Isis Testing - FakeData (Domain)</name>
-
- <description>
- A module providing a domain service to generate fake random data
- for use in unit tests or integration tests.
- </description>
+ <artifactId>isis-testing-fakedata-applib</artifactId>
+ <name>Apache Isis Testing - FakeData (applib)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.testing.lib.fakedata.dom</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/testing/lib/fakedata/dom</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.testing.fakedata.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/testing/fakedata/applib</git-plugin.propertiesDir>
</properties>
<build>
@@ -56,6 +50,12 @@
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- test -->
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisModuleExtFakeData.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/IsisModuleTstFakeDataApplib.java
similarity index 63%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisModuleExtFakeData.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/IsisModuleTstFakeDataApplib.java
index 08aedc1..56a5724 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisModuleExtFakeData.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/IsisModuleTstFakeDataApplib.java
@@ -1,10 +1,10 @@
-package org.apache.isis.extensions.fakedata.dom;
+package org.apache.isis.testing.fakedata.applib;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleExtFakeData {
+public class IsisModuleTstFakeDataApplib {
}
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/AbstractRandomValueGenerator.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/AbstractRandomValueGenerator.java
similarity index 75%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/AbstractRandomValueGenerator.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/AbstractRandomValueGenerator.java
index b24a460..9018e70 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/AbstractRandomValueGenerator.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/AbstractRandomValueGenerator.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
abstract class AbstractRandomValueGenerator {
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Addresses.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Addresses.java
similarity index 96%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Addresses.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Addresses.java
index 796c8d5..e979c50 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Addresses.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Addresses.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
public class Addresses extends AbstractRandomValueGenerator {
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigDecimals.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/BigDecimals.java
similarity index 93%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigDecimals.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/BigDecimals.java
index 3b1d33a..4fc77a8 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigDecimals.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/BigDecimals.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import java.math.BigDecimal;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigIntegers.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/BigIntegers.java
similarity index 87%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigIntegers.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/BigIntegers.java
index 91d71ca..83284e8 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/BigIntegers.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/BigIntegers.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import java.math.BigInteger;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Books.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Books.java
similarity index 87%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Books.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Books.java
index 9157258..38fadae 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Books.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Books.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
public class Books extends AbstractRandomValueGenerator {
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Booleans.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Booleans.java
similarity index 90%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Booleans.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Booleans.java
index 451062c..71761bf 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Booleans.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Booleans.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
public class Booleans extends AbstractRandomValueGenerator {
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Bytes.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Bytes.java
similarity index 90%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Bytes.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Bytes.java
index dfc1449..80df3da 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Bytes.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Bytes.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import org.apache.isis.applib.annotation.Programmatic;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Chars.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Chars.java
similarity index 93%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Chars.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Chars.java
index bf8fe95..d83f3ef 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Chars.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Chars.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import org.apache.isis.applib.annotation.Programmatic;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Collections.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Collections.java
similarity index 99%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Collections.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Collections.java
index b279af1..a19e4aa 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Collections.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Collections.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import java.util.Collection;
import java.util.List;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Comms.java
similarity index 92%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Comms.java
index be8d290..5f73bc5 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Comms.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Comms.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
public class Comms extends AbstractRandomValueGenerator {
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/CreditCards.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/CreditCards.java
similarity index 92%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/CreditCards.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/CreditCards.java
index 5c38100..977fe21 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/CreditCards.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/CreditCards.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import com.github.javafaker.service.FakeValuesService;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Doubles.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Doubles.java
similarity index 90%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Doubles.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Doubles.java
index 658c39a..2eb90ae 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Doubles.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Doubles.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import org.apache.commons.lang3.RandomUtils;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Enums.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Enums.java
similarity index 87%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Enums.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Enums.java
index e56ffa2..3092f85 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Enums.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Enums.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import org.apache.isis.applib.annotation.Programmatic;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/FakeDataService.java
similarity index 99%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/FakeDataService.java
index 4153b2d..baff8c0 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataService.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/FakeDataService.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import java.util.Locale;
import java.util.Random;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Floats.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Floats.java
similarity index 85%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Floats.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Floats.java
index d1afa5f..c4abb35 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Floats.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Floats.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import org.apache.commons.lang3.RandomUtils;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Integers.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Integers.java
similarity index 91%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Integers.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Integers.java
index 66023aa..a0c7a08 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Integers.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Integers.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import org.apache.commons.lang3.RandomUtils;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisBlobs.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/IsisBlobs.java
similarity index 97%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisBlobs.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/IsisBlobs.java
index f642b2c..cf9bb32 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisBlobs.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/IsisBlobs.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import java.io.IOException;
import java.net.URL;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisClobs.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/IsisClobs.java
similarity index 98%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisClobs.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/IsisClobs.java
index a97ab69..2e6106b 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisClobs.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/IsisClobs.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import java.io.IOException;
import java.net.URL;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/IsisMoneys.java
similarity index 86%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/IsisMoneys.java
index 3dfd2fd..6963391 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisMoneys.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/IsisMoneys.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
//TODO[2249] deprecated
@Deprecated
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisPasswords.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/IsisPasswords.java
similarity index 86%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisPasswords.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/IsisPasswords.java
index 0ead153..aa7f0a8 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/IsisPasswords.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/IsisPasswords.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.value.Password;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/J8DateTimes.java
similarity index 94%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/J8DateTimes.java
index e06fc37..4a031a2 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8DateTimes.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/J8DateTimes.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import java.time.OffsetDateTime;
import java.time.Period;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8LocalDates.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/J8LocalDates.java
similarity index 94%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8LocalDates.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/J8LocalDates.java
index e13c631..f91b9ef 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8LocalDates.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/J8LocalDates.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import java.time.LocalDate;
import java.time.Period;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8Periods.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/J8Periods.java
similarity index 94%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8Periods.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/J8Periods.java
index 01b36aa..9d48976 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/J8Periods.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/J8Periods.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import java.time.Period;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlDates.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/JavaSqlDates.java
similarity index 91%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlDates.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/JavaSqlDates.java
index 45d68d5..9f7d1c6 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlDates.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/JavaSqlDates.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import java.sql.Date;
import java.time.OffsetDateTime;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlTimestamps.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/JavaSqlTimestamps.java
similarity index 88%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlTimestamps.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/JavaSqlTimestamps.java
index 8f60a3b..f09e44b 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaSqlTimestamps.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/JavaSqlTimestamps.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import java.sql.Timestamp;
import java.util.Date;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaUtilDates.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/JavaUtilDates.java
similarity index 90%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaUtilDates.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/JavaUtilDates.java
index 5f38063..32696a0 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/JavaUtilDates.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/JavaUtilDates.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import java.time.OffsetDateTime;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Longs.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Longs.java
similarity index 85%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Longs.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Longs.java
index 4c9b1ab..df9f631 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Longs.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Longs.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import org.apache.commons.lang3.RandomUtils;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Lorem.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Lorem.java
similarity index 94%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Lorem.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Lorem.java
index bca205b..79ad2af 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Lorem.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Lorem.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import java.util.List;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Names.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Names.java
similarity index 93%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Names.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Names.java
index 1501301..0a65c17 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Names.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Names.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import org.apache.isis.applib.annotation.Programmatic;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Shorts.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Shorts.java
similarity index 90%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Shorts.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Shorts.java
index 6492214..c4de854 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Shorts.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Shorts.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import org.apache.isis.applib.annotation.Programmatic;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Strings.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Strings.java
similarity index 93%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Strings.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Strings.java
index 33cdfab..eaf507d 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Strings.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Strings.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import org.apache.isis.applib.annotation.Programmatic;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Urls.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Urls.java
similarity index 91%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Urls.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Urls.java
index 776b9e2..2559667 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Urls.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Urls.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import java.net.MalformedURLException;
import java.net.URL;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Uuids.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Uuids.java
similarity index 80%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Uuids.java
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Uuids.java
index 78f5a21..2a122e8 100644
--- a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/Uuids.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/Uuids.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import java.util.UUID;
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/Pawson-Naked-Objects-thesis.pdf b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/Pawson-Naked-Objects-thesis.pdf
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/Pawson-Naked-Objects-thesis.pdf
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/Pawson-Naked-Objects-thesis.pdf
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-150x150.jpg b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image01-150x150.jpg
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-150x150.jpg
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image01-150x150.jpg
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-2048x1536.jpg b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image01-2048x1536.jpg
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-2048x1536.jpg
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image01-2048x1536.jpg
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-240x180.jpg b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image01-240x180.jpg
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-240x180.jpg
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image01-240x180.jpg
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-4000x3000.jpg b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image01-4000x3000.jpg
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-4000x3000.jpg
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image01-4000x3000.jpg
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-640x480.jpg b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image01-640x480.jpg
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image01-640x480.jpg
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image01-640x480.jpg
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-150x150.jpg b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image02-150x150.jpg
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-150x150.jpg
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image02-150x150.jpg
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-2048x1536.jpg b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image02-2048x1536.jpg
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-2048x1536.jpg
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image02-2048x1536.jpg
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-240x180.jpg b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image02-240x180.jpg
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-240x180.jpg
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image02-240x180.jpg
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-4000x3000.jpg b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image02-4000x3000.jpg
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-4000x3000.jpg
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image02-4000x3000.jpg
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-640x480.jpg b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image02-640x480.jpg
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/image02-640x480.jpg
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/image02-640x480.jpg
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/rick-mugridge-paper.pdf b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/rick-mugridge-paper.pdf
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/blobs/rick-mugridge-paper.pdf
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/blobs/rick-mugridge-paper.pdf
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/RTF-Spec-1.7.rtf b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/RTF-Spec-1.7.rtf
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/RTF-Spec-1.7.rtf
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/RTF-Spec-1.7.rtf
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/a_and_c.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/a_and_c.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/a_and_c.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/a_and_c.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/all_well.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/all_well.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/all_well.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/all_well.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/as_you.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/as_you.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/as_you.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/as_you.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/com_err.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/com_err.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/com_err.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/com_err.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/config.rtf b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/config.rtf
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/config.rtf
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/config.rtf
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/coriolan.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/coriolan.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/coriolan.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/coriolan.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/cymbelin.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/cymbelin.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/cymbelin.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/cymbelin.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dream.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/dream.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dream.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/dream.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dsssl.dtd b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/dsssl.dtd
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/dsssl.dtd
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/dsssl.dtd
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/fot.dtd b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/fot.dtd
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/fot.dtd
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/fot.dtd
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hamlet.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/hamlet.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hamlet.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/hamlet.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_1.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/hen_iv_1.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_1.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/hen_iv_1.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_2.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/hen_iv_2.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_iv_2.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/hen_iv_2.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_v.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/hen_v.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_v.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/hen_v.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_1.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/hen_vi_1.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_1.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/hen_vi_1.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_2.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/hen_vi_2.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_2.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/hen_vi_2.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_3.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/hen_vi_3.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_vi_3.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/hen_vi_3.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_viii.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/hen_viii.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/hen_viii.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/hen_viii.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/j_caesar.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/j_caesar.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/j_caesar.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/j_caesar.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/john.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/john.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/john.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/john.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lear.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/lear.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lear.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/lear.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lll.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/lll.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/lll.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/lll.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_for_m.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/m_for_m.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_for_m.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/m_for_m.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_wives.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/m_wives.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/m_wives.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/m_wives.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/macbeth.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/macbeth.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/macbeth.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/macbeth.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/merchant.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/merchant.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/merchant.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/merchant.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/much_ado.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/much_ado.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/much_ado.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/much_ado.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/othello.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/othello.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/othello.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/othello.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/pericles.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/pericles.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/pericles.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/pericles.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/play.dtd b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/play.dtd
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/play.dtd
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/play.dtd
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/r_and_j.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/r_and_j.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/r_and_j.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/r_and_j.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_ii.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/rich_ii.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_ii.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/rich_ii.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_iii.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/rich_iii.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/rich_iii.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/rich_iii.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/sample.rtf b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/sample.rtf
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/sample.rtf
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/sample.rtf
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/shaksper.htm b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/shaksper.htm
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/shaksper.htm
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/shaksper.htm
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/style-sheet.dtd b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/style-sheet.dtd
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/style-sheet.dtd
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/style-sheet.dtd
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/t_night.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/t_night.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/t_night.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/t_night.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/taming.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/taming.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/taming.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/taming.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/tempest.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/tempest.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/tempest.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/tempest.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/testrtf.rtf b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/testrtf.rtf
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/testrtf.rtf
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/testrtf.rtf
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/timon.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/timon.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/timon.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/timon.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/titus.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/titus.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/titus.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/titus.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/troilus.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/troilus.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/troilus.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/troilus.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/two_gent.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/two_gent.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/two_gent.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/two_gent.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vs b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/vs
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vs
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/vs
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vx b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/vx
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/vx
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/vx
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/win_tale.xml b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/win_tale.xml
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/win_tale.xml
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/win_tale.xml
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.dcl b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/xml.dcl
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.dcl
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/xml.dcl
diff --git a/testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.soc b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/xml.soc
similarity index 100%
rename from testing/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/services/clobs/xml.soc
rename to testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/clobs/xml.soc
diff --git a/testing/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java b/testing/fakedata/applib/src/test/java/org/apache/isis/testing/fakedata/applib/services/FakeDataServiceTest.java
similarity index 99%
rename from testing/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java
rename to testing/fakedata/applib/src/test/java/org/apache/isis/testing/fakedata/applib/services/FakeDataServiceTest.java
index a5a8159..3a34a55 100644
--- a/testing/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/services/FakeDataServiceTest.java
+++ b/testing/fakedata/applib/src/test/java/org/apache/isis/testing/fakedata/applib/services/FakeDataServiceTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.dom.services;
+package org.apache.isis.testing.fakedata.applib.services;
import java.net.URL;
import java.sql.Timestamp;
diff --git a/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/EnumOf3.java b/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/EnumOf3.java
deleted file mode 100644
index 2883199..0000000
--- a/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/EnumOf3.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom;
-
-public enum EnumOf3 {
- VISA,
- MASTERCARD,
- AMEX
-}
diff --git a/testing/fakedata/fixture/.gitignore b/testing/fakedata/fixtures/.gitignore
similarity index 100%
rename from testing/fakedata/fixture/.gitignore
rename to testing/fakedata/fixtures/.gitignore
diff --git a/extensions/vw/pdfjs/fixture/logging-dn-enhance.properties b/testing/fakedata/fixtures/logging-dn-enhance.properties
similarity index 100%
rename from extensions/vw/pdfjs/fixture/logging-dn-enhance.properties
rename to testing/fakedata/fixtures/logging-dn-enhance.properties
diff --git a/testing/fakedata/fixture/pom.xml b/testing/fakedata/fixtures/pom.xml
similarity index 89%
rename from testing/fakedata/fixture/pom.xml
rename to testing/fakedata/fixtures/pom.xml
index 3a2bf46..e7ef2b9 100644
--- a/testing/fakedata/fixture/pom.xml
+++ b/testing/fakedata/fixtures/pom.xml
@@ -4,17 +4,16 @@
<parent>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing</artifactId>
+ <artifactId>isis-testing-fakedata</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>isis-testing-fakedata-fixtures</artifactId>
<name>Apache Isis Testing - FakeData (Fixtures)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.testing.lib.fakedata.fixtures</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/testing/lib/fakedata/fixtures</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.testing.fakedata.fixtures</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/testing/fakedata/fixtures</git-plugin.propertiesDir>
</properties>
<build>
@@ -56,7 +55,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fakedata-dom</artifactId>
+ <artifactId>isis-testing-fakedata-applib</artifactId>
</dependency>
<dependency>
@@ -79,7 +78,6 @@
<artifactId>guava</artifactId>
</dependency>
-
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
diff --git a/testing/fakedata/fixture/src/main/java/META-INF/persistence.xml b/testing/fakedata/fixtures/src/main/java/META-INF/persistence.xml
similarity index 84%
rename from testing/fakedata/fixture/src/main/java/META-INF/persistence.xml
rename to testing/fakedata/fixtures/src/main/java/META-INF/persistence.xml
index 207e9f2..59df79b 100644
--- a/testing/fakedata/fixture/src/main/java/META-INF/persistence.xml
+++ b/testing/fakedata/fixtures/src/main/java/META-INF/persistence.xml
@@ -3,6 +3,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0">
- <persistence-unit name="org-apache-isis-ext-fakedata-fixtures">
+ <persistence-unit name="org-apache-isis-tst-fakedata-fixtures">
</persistence-unit>
</persistence>
diff --git a/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/IsisModuleExtFakeDataFixtures.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java
similarity index 72%
rename from testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/IsisModuleExtFakeDataFixtures.java
rename to testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java
index 99af2ee..e8bd21e 100644
--- a/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/IsisModuleExtFakeDataFixtures.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.fixture;
+package org.apache.isis.testing.fakedata.fixtures;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@@ -7,15 +7,14 @@ import org.springframework.context.annotation.Import;
import org.apache.isis.extensions.fakedata.dom.IsisModuleExtFakeData;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import org.apache.isis.extensions.fixtures.modules.ModuleWithFixtures;
-
-import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts.FakeDataDemoObjectWithAll_tearDown;
+import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts.FakeDataDemoObjectWithAll_tearDown;
@Configuration
@Import({
IsisModuleExtFakeData.class
})
@ComponentScan
-public class IsisModuleExtFakeDataFixtures implements ModuleWithFixtures {
+public class IsisModuleTstFakeDataFixtures implements ModuleWithFixtures {
@Override public FixtureScript getTeardownFixture() {
return new FakeDataDemoObjectWithAll_tearDown();
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/EnumOf3.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/EnumOf3.java
new file mode 100644
index 0000000..91d85bd
--- /dev/null
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/EnumOf3.java
@@ -0,0 +1,7 @@
+package org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom;
+
+public enum EnumOf3 {
+ VISA,
+ MASTERCARD,
+ AMEX
+}
diff --git a/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
similarity index 99%
rename from testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
rename to testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
index e6138e8..5fdd714 100644
--- a/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom;
+package org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.png b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.png
similarity index 100%
rename from testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.png
rename to testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAll.png
diff --git a/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
similarity index 96%
rename from testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
rename to testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
index 911c414..8b875ac 100644
--- a/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/dom/FakeDataDemoObjectWithAllMenu.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom;
+package org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom;
import java.util.List;
diff --git a/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
similarity index 77%
rename from testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
rename to testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
index 405f974..10772e8 100644
--- a/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts;
+package org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts;
import java.util.List;
@@ -7,11 +7,11 @@ import javax.inject.Inject;
import com.google.common.collect.Lists;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.services.FakeDataService;
+import org.apache.isis.testing.fakedata.applib.services.FakeDataService;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
-import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
-import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts.data.FakeDataDemoObjectWithAll_create_withFakeData;
+import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts.data.FakeDataDemoObjectWithAll_create_withFakeData;
import lombok.Getter;
import lombok.Setter;
diff --git a/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java
similarity index 63%
rename from testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java
rename to testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java
index d31899c..bfdd848 100644
--- a/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java
@@ -1,8 +1,7 @@
-package org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts;
+package org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts;
import org.apache.isis.extensions.fixtures.legacy.teardown.TeardownFixtureAbstract2;
-
-import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
+import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
public class FakeDataDemoObjectWithAll_tearDown extends TeardownFixtureAbstract2 {
diff --git a/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
similarity index 88%
rename from testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
rename to testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
index f277f3d..626f4a6 100644
--- a/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
@@ -1,11 +1,10 @@
-package org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts.data;
+package org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts.data;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fakedata.dom.services.FakeDataService;
+import org.apache.isis.testing.fakedata.applib.services.FakeDataService;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-
-import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
-import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAllMenu;
+import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
+import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAllMenu;
import lombok.Getter;
import lombok.Setter;
diff --git a/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
similarity index 95%
rename from testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
rename to testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
index 4e077bd..30f3ed3 100644
--- a/testing/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts.data;
+package org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts.data;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -16,11 +16,10 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.applib.value.Password;
-import org.apache.isis.extensions.fakedata.dom.services.FakeDataService;
+import org.apache.isis.testing.fakedata.applib.services.FakeDataService;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-
-import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.EnumOf3;
-import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
+import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.EnumOf3;
+import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
import lombok.Getter;
import lombok.Setter;
diff --git a/testing/fakedata/integtests/pom.xml b/testing/fakedata/integtests/pom.xml
index 5cf09a0..53df511 100644
--- a/testing/fakedata/integtests/pom.xml
+++ b/testing/fakedata/integtests/pom.xml
@@ -5,17 +5,20 @@
<parent>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing</artifactId>
+ <artifactId>isis-testing-fakedata</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>isis-testing-fakedata-integtests</artifactId>
<name>Apache Isis Testing - FakeData (Integ Tests)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.testing.lib.fakedata.integtests</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/testing/lib/fakedata/integtests</git-plugin.propertiesDir>
+
+ <!-- TODO: to reinstate -->
+ <skipTests>true</skipTests>
+
+ <jar-plugin.automaticModuleName>org.apache.isis.testing.fakedata.integtests</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/testing/fakedata/integtests</git-plugin.propertiesDir>
</properties>
<build>
@@ -60,7 +63,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fakedata-dom</artifactId>
+ <artifactId>isis-testing-fakedata-applib</artifactId>
<scope>test</scope>
</dependency>
diff --git a/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
similarity index 96%
rename from testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
rename to testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
index ddd9399..9d64809 100644
--- a/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
+++ b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.integtests;
+package org.apache.isis.testing.fakedata.integtests;
import org.springframework.boot.test.context.SpringBootTest;
diff --git a/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/tests/Bootstrap_IntegTest.java
similarity index 85%
rename from testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java
rename to testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/tests/Bootstrap_IntegTest.java
index 1969a7e..45e319d 100644
--- a/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java
+++ b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/tests/Bootstrap_IntegTest.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fakedata.integtests.tests;
+package org.apache.isis.testing.fakedata.integtests.tests;
import org.junit.jupiter.api.Test;
import org.springframework.transaction.annotation.Transactional;
-import org.apache.isis.extensions.fakedata.integtests.FakeDataModuleIntegTestAbstract;
+import org.apache.isis.testing.fakedata.integtests.FakeDataModuleIntegTestAbstract;
@Transactional
public class Bootstrap_IntegTest extends FakeDataModuleIntegTestAbstract {
diff --git a/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/tests/Smoke_IntegTest.java
similarity index 99%
rename from testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java
rename to testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/tests/Smoke_IntegTest.java
index 4258ddb..059135f 100644
--- a/testing/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java
+++ b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/tests/Smoke_IntegTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.fakedata.integtests.tests;
+package org.apache.isis.testing.fakedata.integtests.tests;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -19,7 +19,7 @@ import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.applib.value.Password;
import org.apache.isis.extensions.fakedata.dom.services.FakeDataService;
-import org.apache.isis.extensions.fakedata.integtests.FakeDataModuleIntegTestAbstract;
+import org.apache.isis.testing.fakedata.integtests.FakeDataModuleIntegTestAbstract;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.EnumOf3;
diff --git a/testing/fakedata/pom.xml b/testing/fakedata/pom.xml
new file mode 100644
index 0000000..72862ae
--- /dev/null
+++ b/testing/fakedata/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>isis-testing-fakedata</artifactId>
+ <name>Apache Isis Testing - FakeData (parent)</name>
+
+ <description>
+ A module providing a domain service to generate fake random data
+ for use in unit tests or integration tests.
+ </description>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>applib</module>
+ <module>fixtures</module>
+ <module>integtests</module>
+ </modules>
+
+</project>
diff --git a/testing/fakedata/impl/src/main/doc/antora.yml b/testing/fakedata/src/main/doc/antora.yml
similarity index 100%
rename from testing/fakedata/impl/src/main/doc/antora.yml
rename to testing/fakedata/src/main/doc/antora.yml
diff --git a/testing/fakedata/impl/src/main/doc/modules/fakedata/nav.adoc b/testing/fakedata/src/main/doc/modules/fakedata/nav.adoc
similarity index 100%
rename from testing/fakedata/impl/src/main/doc/modules/fakedata/nav.adoc
rename to testing/fakedata/src/main/doc/modules/fakedata/nav.adoc
diff --git a/testing/fakedata/impl/src/main/doc/modules/fakedata/pages/about.adoc b/testing/fakedata/src/main/doc/modules/fakedata/pages/about.adoc
similarity index 100%
rename from testing/fakedata/impl/src/main/doc/modules/fakedata/pages/about.adoc
rename to testing/fakedata/src/main/doc/modules/fakedata/pages/about.adoc
diff --git a/testing/fakedata/impl/src/main/doc/modules/fakedata/partials/module-nav.adoc b/testing/fakedata/src/main/doc/modules/fakedata/partials/module-nav.adoc
similarity index 100%
rename from testing/fakedata/impl/src/main/doc/modules/fakedata/partials/module-nav.adoc
rename to testing/fakedata/src/main/doc/modules/fakedata/partials/module-nav.adoc
diff --git a/testing/pom.xml b/testing/pom.xml
index 039c114..6a45751 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fakedata-dom</artifactId>
+ <artifactId>isis-testing-fakedata-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
@@ -117,11 +117,8 @@
</dependencyManagement>
<modules>
- <module>fakedata/impl</module>
- <module>fakedata/fixture</module>
- <!--
- <module>fakedata/integtests</module>
- -->
+ <module>fakedata</module>
+
<module>h2console</module>
<module>hsqldbmgr</module>
<module>fixtures</module>
[isis] 09/21: ISIS-2062;
moves location of docs for mappings modules.
Posted by da...@apache.org.
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 decedce28443c06e081137e8fec543c461d3d198
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 07:07:26 2020 +0000
ISIS-2062; moves location of docs for mappings modules.
---
antora/playbooks/site-mappings.yml | 8 ++++----
antora/playbooks/site.yml | 8 ++++----
mappings/{slack/impl => jaxrsclient}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/jaxrsclient}/nav.adoc | 0
.../{api => }/src/main/doc/modules/jaxrsclient/pages/about.adoc | 0
.../src/main/doc/modules/jaxrsclient/partials/module-nav.adoc | 0
mappings/minio/{impl => }/src/main/doc/antora.yml | 0
mappings/minio/{impl => }/src/main/doc/modules/minio/nav.adoc | 0
.../minio/{impl => }/src/main/doc/modules/minio/pages/about.adoc | 0
.../src/main/doc/modules/minio/partials/module-nav.adoc | 0
mappings/{jaxrsclient/api => slack}/src/main/doc/antora.yml | 0
.../jaxrsclient => slack/src/main/doc/modules/slack}/nav.adoc | 0
.../slack/{impl => }/src/main/doc/modules/slack/pages/about.adoc | 0
.../src/main/doc/modules/slack/partials/module-nav.adoc | 0
14 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/antora/playbooks/site-mappings.yml b/antora/playbooks/site-mappings.yml
index 5d5a27f..1feefeb 100644
--- a/antora/playbooks/site-mappings.yml
+++ b/antora/playbooks/site-mappings.yml
@@ -17,16 +17,16 @@ content:
# mappings
- url: .
- start_path: mappings/jaxrsclient/impl/src/main/doc # mappings
+ start_path: mappings/jaxrsclient/src/main/doc # mappings
branches: HEAD
- url: .
- start_path: mappings/minio/impl/src/main/doc # mappings
+ start_path: mappings/minio/src/main/doc # mappings
branches: HEAD
- url: .
- start_path: mappings/restclient/impl/src/main/doc # mappings
+ start_path: mappings/restclient/src/main/doc # mappings
branches: HEAD
- url: .
- start_path: mappings/slack/impl/src/main/doc # mappings
+ start_path: mappings/slack/src/main/doc # mappings
branches: HEAD
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 434fcd9..4f66a05 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -167,16 +167,16 @@ content:
# mappings
- url: .
- start_path: mappings/jaxrsclient/impl/src/main/doc # mappings
+ start_path: mappings/jaxrsclient/src/main/doc # mappings
branches: HEAD
- url: .
- start_path: mappings/minio/impl/src/main/doc # mappings
+ start_path: mappings/minio/src/main/doc # mappings
branches: HEAD
- url: .
- start_path: mappings/restclient/impl/src/main/doc # mappings
+ start_path: mappings/restclient/src/main/doc # mappings
branches: HEAD
- url: .
- start_path: mappings/slack/impl/src/main/doc # mappings
+ start_path: mappings/slack/src/main/doc # mappings
branches: HEAD
# mavendeps
diff --git a/mappings/slack/impl/src/main/doc/antora.yml b/mappings/jaxrsclient/src/main/doc/antora.yml
similarity index 100%
rename from mappings/slack/impl/src/main/doc/antora.yml
rename to mappings/jaxrsclient/src/main/doc/antora.yml
diff --git a/mappings/slack/impl/src/main/doc/modules/slack/nav.adoc b/mappings/jaxrsclient/src/main/doc/modules/jaxrsclient/nav.adoc
similarity index 100%
rename from mappings/slack/impl/src/main/doc/modules/slack/nav.adoc
rename to mappings/jaxrsclient/src/main/doc/modules/jaxrsclient/nav.adoc
diff --git a/mappings/jaxrsclient/api/src/main/doc/modules/jaxrsclient/pages/about.adoc b/mappings/jaxrsclient/src/main/doc/modules/jaxrsclient/pages/about.adoc
similarity index 100%
rename from mappings/jaxrsclient/api/src/main/doc/modules/jaxrsclient/pages/about.adoc
rename to mappings/jaxrsclient/src/main/doc/modules/jaxrsclient/pages/about.adoc
diff --git a/mappings/jaxrsclient/api/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc b/mappings/jaxrsclient/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc
similarity index 100%
rename from mappings/jaxrsclient/api/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc
rename to mappings/jaxrsclient/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc
diff --git a/mappings/minio/impl/src/main/doc/antora.yml b/mappings/minio/src/main/doc/antora.yml
similarity index 100%
rename from mappings/minio/impl/src/main/doc/antora.yml
rename to mappings/minio/src/main/doc/antora.yml
diff --git a/mappings/minio/impl/src/main/doc/modules/minio/nav.adoc b/mappings/minio/src/main/doc/modules/minio/nav.adoc
similarity index 100%
rename from mappings/minio/impl/src/main/doc/modules/minio/nav.adoc
rename to mappings/minio/src/main/doc/modules/minio/nav.adoc
diff --git a/mappings/minio/impl/src/main/doc/modules/minio/pages/about.adoc b/mappings/minio/src/main/doc/modules/minio/pages/about.adoc
similarity index 100%
rename from mappings/minio/impl/src/main/doc/modules/minio/pages/about.adoc
rename to mappings/minio/src/main/doc/modules/minio/pages/about.adoc
diff --git a/mappings/minio/impl/src/main/doc/modules/minio/partials/module-nav.adoc b/mappings/minio/src/main/doc/modules/minio/partials/module-nav.adoc
similarity index 100%
rename from mappings/minio/impl/src/main/doc/modules/minio/partials/module-nav.adoc
rename to mappings/minio/src/main/doc/modules/minio/partials/module-nav.adoc
diff --git a/mappings/jaxrsclient/api/src/main/doc/antora.yml b/mappings/slack/src/main/doc/antora.yml
similarity index 100%
rename from mappings/jaxrsclient/api/src/main/doc/antora.yml
rename to mappings/slack/src/main/doc/antora.yml
diff --git a/mappings/jaxrsclient/api/src/main/doc/modules/jaxrsclient/nav.adoc b/mappings/slack/src/main/doc/modules/slack/nav.adoc
similarity index 100%
rename from mappings/jaxrsclient/api/src/main/doc/modules/jaxrsclient/nav.adoc
rename to mappings/slack/src/main/doc/modules/slack/nav.adoc
diff --git a/mappings/slack/impl/src/main/doc/modules/slack/pages/about.adoc b/mappings/slack/src/main/doc/modules/slack/pages/about.adoc
similarity index 100%
rename from mappings/slack/impl/src/main/doc/modules/slack/pages/about.adoc
rename to mappings/slack/src/main/doc/modules/slack/pages/about.adoc
diff --git a/mappings/slack/impl/src/main/doc/modules/slack/partials/module-nav.adoc b/mappings/slack/src/main/doc/modules/slack/partials/module-nav.adoc
similarity index 100%
rename from mappings/slack/impl/src/main/doc/modules/slack/partials/module-nav.adoc
rename to mappings/slack/src/main/doc/modules/slack/partials/module-nav.adoc
[isis] 05/21: ISIS-2259: adds in parent module for shiro-realm-ldap
Posted by da...@apache.org.
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 e5214ca7af429c4d5ada9e2de9eabdc737dfcaaf
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 06:43:54 2020 +0000
ISIS-2259: adds in parent module for shiro-realm-ldap
---
antora/components/extensions/{ => adoc}/antora.yml | 0
.../extensions/{ => adoc}/modules/ROOT/nav.adoc | 0
.../{ => adoc}/modules/ROOT/pages/about.adoc | 0
.../modules/ROOT/partials/component-nav.adoc | 0
.../modules/ROOT/partials/module-nav.adoc | 0
examples/smoketests/pom.xml | 2 +-
extensions/pom.xml | 3 ++-
extensions/security/shiro-realm-ldap/impl/pom.xml | 15 ++++--------
.../realm/{ => impl}/IsisLdapContextFactory.java | 2 +-
.../realm/{ => impl}/IsisLdapRealm.java | 2 +-
.../impl/IsisModuleExtShiroRealmLdapImpl.java} | 4 ++--
.../security/shiro-realm-ldap/{impl => }/pom.xml | 28 +++++-----------------
12 files changed, 18 insertions(+), 38 deletions(-)
diff --git a/antora/components/extensions/antora.yml b/antora/components/extensions/adoc/antora.yml
similarity index 100%
rename from antora/components/extensions/antora.yml
rename to antora/components/extensions/adoc/antora.yml
diff --git a/antora/components/extensions/modules/ROOT/nav.adoc b/antora/components/extensions/adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/components/extensions/modules/ROOT/nav.adoc
rename to antora/components/extensions/adoc/modules/ROOT/nav.adoc
diff --git a/antora/components/extensions/modules/ROOT/pages/about.adoc b/antora/components/extensions/adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/extensions/modules/ROOT/pages/about.adoc
rename to antora/components/extensions/adoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc b/antora/components/extensions/adoc/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from antora/components/extensions/modules/ROOT/partials/component-nav.adoc
rename to antora/components/extensions/adoc/modules/ROOT/partials/component-nav.adoc
diff --git a/antora/components/extensions/modules/ROOT/partials/module-nav.adoc b/antora/components/extensions/adoc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from antora/components/extensions/modules/ROOT/partials/module-nav.adoc
rename to antora/components/extensions/adoc/modules/ROOT/partials/module-nav.adoc
diff --git a/examples/smoketests/pom.xml b/examples/smoketests/pom.xml
index 7abef0ab..4b71911 100644
--- a/examples/smoketests/pom.xml
+++ b/examples/smoketests/pom.xml
@@ -100,7 +100,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-shiro-realm-ldap</artifactId>
+ <artifactId>isis-extensions-shiro-realm-ldap-impl</artifactId>
</dependency>
<!-- TEST DEPENDENCIES -->
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 942df6c..d263c93 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -116,7 +116,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-shiro-realm-ldap</artifactId>
+ <artifactId>isis-extensions-shiro-realm-ldap-impl</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -139,6 +139,7 @@
<modules>
<module>security/secman</module>
+ <module>security/shiro-realm-ldap</module>
<module>security/shiro-realm-ldap/impl</module>
<module>vro/cors/impl</module>
diff --git a/extensions/security/shiro-realm-ldap/impl/pom.xml b/extensions/security/shiro-realm-ldap/impl/pom.xml
index 0943989..bd1c1fa 100644
--- a/extensions/security/shiro-realm-ldap/impl/pom.xml
+++ b/extensions/security/shiro-realm-ldap/impl/pom.xml
@@ -22,21 +22,16 @@
<parent>
<groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions</artifactId>
+ <artifactId>isis-extensions-shiro-realm-ldap</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
</parent>
- <artifactId>isis-extensions-shiro-realm-ldap</artifactId>
-
- <name>Apache Isis Ext - Shiro LDAP Realm</name>
- <description>
- Implementation of Shiro Realm using LDAP.
- </description>
+ <artifactId>isis-extensions-shiro-realm-ldap-impl</artifactId>
+ <name>Apache Isis Ext - Security - Shiro LDAP Realm (impl)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.shirorealmldap</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/shirorealmldap</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.shirorealmldap.impl</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/shirorealmldap/impl</git-plugin.propertiesDir>
</properties>
diff --git a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/IsisLdapContextFactory.java b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapContextFactory.java
similarity index 97%
rename from extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/IsisLdapContextFactory.java
rename to extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapContextFactory.java
index 83d8f9c..226cc52 100644
--- a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/IsisLdapContextFactory.java
+++ b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapContextFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.shirorealmldap.realm;
+package org.apache.isis.extensions.shirorealmldap.realm.impl;
import java.util.Hashtable;
diff --git a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/IsisLdapRealm.java b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java
similarity index 99%
rename from extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/IsisLdapRealm.java
rename to extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java
index 4fe5a17..251cf5e 100644
--- a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/IsisLdapRealm.java
+++ b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.shirorealmldap.realm;
+package org.apache.isis.extensions.shirorealmldap.realm.impl;
import java.util.Collection;
import java.util.Collections;
diff --git a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/IsisModuleExtShiroRealmLdap.java b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisModuleExtShiroRealmLdapImpl.java
similarity index 90%
rename from extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/IsisModuleExtShiroRealmLdap.java
rename to extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisModuleExtShiroRealmLdapImpl.java
index 3d0ea06..6537f27 100644
--- a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/IsisModuleExtShiroRealmLdap.java
+++ b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisModuleExtShiroRealmLdapImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions;
+package org.apache.isis.extensions.shirorealmldap.realm.impl;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -30,6 +30,6 @@ import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
IsisModuleSecurityShiro.class
})
-public class IsisModuleExtShiroRealmLdap {
+public class IsisModuleExtShiroRealmLdapImpl {
}
diff --git a/extensions/security/shiro-realm-ldap/impl/pom.xml b/extensions/security/shiro-realm-ldap/pom.xml
similarity index 65%
copy from extensions/security/shiro-realm-ldap/impl/pom.xml
copy to extensions/security/shiro-realm-ldap/pom.xml
index 0943989..b251ed9 100644
--- a/extensions/security/shiro-realm-ldap/impl/pom.xml
+++ b/extensions/security/shiro-realm-ldap/pom.xml
@@ -24,35 +24,19 @@
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>isis-extensions-shiro-realm-ldap</artifactId>
- <name>Apache Isis Ext - Shiro LDAP Realm</name>
+ <name>Apache Isis Ext - Security - Shiro LDAP Realm (parent)</name>
<description>
Implementation of Shiro Realm using LDAP.
</description>
+ <packaging>pom</packaging>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.shirorealmldap</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/shirorealmldap</git-plugin.propertiesDir>
- </properties>
-
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-security-shiro</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
+ <modules>
+ <module>impl</module>
+ </modules>
</project>
[isis] 07/21: ISIS-2259: scaffolding for jaxrsclient mapping
Posted by da...@apache.org.
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 984b7e8affc87033cea53ff533bb05b8aaf6c063
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 06:55:02 2020 +0000
ISIS-2259: scaffolding for jaxrsclient mapping
---
mappings/jaxrsclient/impl/pom.xml | 14 ++++++++++----
.../IsisModuleExtJaxRsClientImpl.java} | 4 ++--
mappings/pom.xml | 9 +++++++++
3 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/mappings/jaxrsclient/impl/pom.xml b/mappings/jaxrsclient/impl/pom.xml
index de93e09..ff9d914 100644
--- a/mappings/jaxrsclient/impl/pom.xml
+++ b/mappings/jaxrsclient/impl/pom.xml
@@ -18,21 +18,27 @@
<groupId>org.apache.isis.mappings</groupId>
<artifactId>isis-mappings</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-mappings-jaxrsclient-dom</artifactId>
+ <artifactId>isis-mappings-jaxrsclient-impl</artifactId>
<name>Apache Isis Map - JaxRS Client</name>
<description>Integrates JaxRS Client Library</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.mappings.jaxrsclient.dom</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/mappings/jaxrsclient/dom</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.mappings.jaxrsclient.impl</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/mappings/jaxrsclient/impl</git-plugin.propertiesDir>
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>5.2.2.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java b/mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/IsisModuleExtJaxRsClientImpl.java
similarity index 91%
rename from mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java
rename to mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/IsisModuleExtJaxRsClientImpl.java
index ab16d86..af8a507 100644
--- a/mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/dom/IsisModuleExtJaxRsClient.java
+++ b/mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/IsisModuleExtJaxRsClientImpl.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.jaxrsclient.dom;
+package org.apache.isis.extensions.jaxrsclient.impl;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleExtJaxRsClient {
+public class IsisModuleExtJaxRsClientImpl {
}
diff --git a/mappings/pom.xml b/mappings/pom.xml
index a78793b..56a086d 100644
--- a/mappings/pom.xml
+++ b/mappings/pom.xml
@@ -68,6 +68,12 @@
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.mappings</groupId>
+ <artifactId>isis-mappings-jaxrsclient-impl</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
<!-- testing -->
<dependency>
<groupId>org.apache.isis.testing</groupId>
@@ -80,6 +86,9 @@
</dependencyManagement>
<modules>
+<!--
+ <module>jaxrsclient/impl</module>
+-->
<module>restclient/impl</module>
</modules>
[isis] 21/21: ISIS-2259: reorg fixtures testing module.
Posted by da...@apache.org.
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 c1c20d9a9e10f46ca1d0c6343618cd0be81e6604
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 11:17:04 2020 +0000
ISIS-2259: reorg fixtures testing module.
---
.../demo/src/main/java/demoapp/webapp/DemoApp.java | 4 +-
examples/smoketests/pom.xml | 2 +-
.../testdomain/conf/Configuration_usingJdo.java | 4 +-
.../conf/Configuration_usingJdoAndShiro.java | 4 +-
.../isis/testdomain/jdo/JdoTestDomainPersona.java | 8 +--
.../testdomain/auditing/AuditerServiceTest.java | 2 +-
.../JdoBootstrappingTest_usingFixtures.java | 2 +-
.../commandexecution/WrapperAsyncTest.java | 2 +-
.../commandexecution/WrapperSyncTest.java | 2 +-
.../publishing/PublisherServiceTest.java | 2 +-
.../isis/testdomain/shiro/ShiroSecmanLdapTest.java | 2 +-
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 2 +-
.../testdomain/timestamping/TimestampingTest.java | 2 +-
.../transactions/TransactionRollbackTest.java | 2 +-
...TransactionRollbackTest_usingTransactional.java | 2 +-
extensions/pom.xml | 2 +-
extensions/security/secman/persistence-jdo/pom.xml | 2 +-
.../secman/jdo/seed/SeedSecurityModuleService.java | 2 +-
.../jdo/seed/SeedUsersAndRolesFixtureScript.java | 2 +-
.../AbstractRoleAndPermissionsFixtureScript.java | 2 +-
.../seed/scripts/AbstractTenancyFixtureScript.java | 2 +-
.../scripts/AbstractUserAndRolesFixtureScript.java | 2 +-
.../secman/jdo/seed/scripts/GlobalTenancy.java | 2 +-
...xtFixturesFixtureResultsRoleAndPermissions.java | 2 +-
.../cors/impl/webmodule/WebModuleCors.java | 2 +-
incubator/pom.xml | 2 +-
legacy/pom.xml | 2 +-
mappings/pom.xml | 2 +-
.../applib/services/calendar/CalendarService.java | 2 +-
subdomains/excel/applib/pom.xml | 2 +-
.../subdomains/excel/applib/dom/ExcelService.java | 2 +-
subdomains/excel/fixture/pom.xml | 2 +-
.../excel/fixtures/IsisModuleSubExcelFixtures.java | 2 +-
.../demotodoitem/DemoToDoItemRowHandler.java | 2 +-
.../demotodoitem/DemoToDoItemRowHandler2.java | 2 +-
.../ExcelUploadRowHandler4ToDoItem.java | 2 +-
.../ExcelUploadServiceForDemoToDoItem.java | 6 +-
.../DemoToDoItem_create_usingExcelFixture.java | 2 +-
.../DemoToDoItem_recreate_usingExcelFixture.java | 2 +-
.../ExcelDemoToDoItem_recreate5_for.java | 2 +-
.../fixturescripts/ExcelDemoToDoItem_tearDown.java | 2 +-
.../ExcelDemoToDoItem_tearDown2.java | 2 +-
.../integtests/ExcelModuleIntegTestAbstract.java | 2 +-
.../ExcelModuleDemoMetaDataEnabled_IntegTest.java | 6 +-
.../subdomains/excel/testing/ExcelFixture.java | 6 +-
.../subdomains/excel/testing/ExcelFixture2.java | 4 +-
.../excel/testing/ExcelFixtureRowHandler.java | 2 +-
.../excel/testing/ExcelFixtureWorkbookHandler.java | 2 +-
.../excel/testing/FixtureAwareRowHandler.java | 2 +-
subdomains/pom.xml | 2 +-
.../spring/applib/service/SpringBeansService.java | 2 +-
.../fakedata/applib/services/FakeDataService.java | 2 +-
testing/fakedata/fixtures/pom.xml | 2 +-
.../fixtures/IsisModuleTstFakeDataFixtures.java | 4 +-
.../FakeDataDemoObjectWithAll_create3.java | 2 +-
.../FakeDataDemoObjectWithAll_tearDown.java | 2 +-
...eDataDemoObjectWithAll_create_withFakeData.java | 2 +-
...eDataDemoObjectWithAll_update_withFakeData.java | 2 +-
.../FakeDataModuleIntegTestAbstract.java | 2 +-
.../fakedata/integtests/tests/Smoke_IntegTest.java | 2 +-
testing/fixtures/{ => applib}/pom.xml | 14 ++--
.../IsisIntegrationTestAbstractWithFixtures.java | 14 ++--
.../applib/IsisModuleTstFixturesApplib.java} | 13 ++--
.../api/FixtureScriptWithExecutionStrategy.java | 6 +-
.../applib}/api/PersonaWithBuilderScript.java | 4 +-
.../fixtures/applib}/api/PersonaWithFinder.java | 2 +-
.../testing/fixtures/applib}/api/WithPrereqs.java | 6 +-
.../testing/fixtures/applib}/api/package-info.java | 2 +-
.../applib}/events/FixturesInstalledEvent.java | 2 +-
.../applib}/events/FixturesInstallingEvent.java | 2 +-
.../fixturescripts/BuilderScriptAbstract.java | 10 +--
.../fixturescripts/BuilderScriptWithResult.java | 2 +-
.../fixturescripts/BuilderScriptWithoutResult.java | 2 +-
.../fixturescripts/ExecutionParameters.java | 2 +-
.../fixturescripts/ExecutionParametersService.java | 8 +--
.../applib}/fixturescripts/FixtureResult.java | 2 +-
.../fixturescripts/FixtureResult.layout.xml | 0
.../applib}/fixturescripts/FixtureResultList.java | 16 ++---
.../applib}/fixturescripts/FixtureScript.java | 20 +++---
.../applib}/fixturescripts/FixtureScripts.java | 14 ++--
.../fixturespec/FixtureScriptsSpecification.java | 10 +--
.../FixtureScriptsSpecificationProvider.java | 2 +-
.../fixtures/applib}/fixturespec/package-info.java | 4 +-
.../fixtures/applib}/legacy/FixtureClock.java | 2 +-
.../applib}/legacy/TickingFixtureClock.java | 2 +-
.../applib}/legacy/clock/ClockFixture.java | 10 +--
.../applib}/legacy/clock/TickingClockFixture.java | 12 ++--
.../fixtures/applib}/legacy/package-info.java | 4 +-
.../QueryResultsCacheControlDefault.java | 8 +--
.../legacy/setup/PersonaEnumPersistAll.java | 14 ++--
.../legacy/teardown/TeardownFixtureAbstract.java | 4 +-
.../legacy/teardown/TeardownFixtureAbstract2.java | 2 +-
.../applib}/modules/ModuleWithFixtures.java | 4 +-
.../applib}/modules/ModuleWithFixturesService.java | 6 +-
.../applib/services}/FixturesLifecycleService.java | 6 +-
.../{ => applib}/src/main/resources/prism.css | 0
.../{ => applib}/src/main/resources/prism1.14.js | 0
.../fixturescripts/ExecutionContextTest.java | 2 +-
.../ExecutionParameters_AsKeyValueMap_Test.java | 2 +-
.../fixturescripts/ExecutionParameters_Test.java | 2 +-
.../legacy/FixtureClockInstantiationTest.java | 5 +-
testing/fixtures/pom.xml | 74 +++-------------------
.../h2console/ui/webmodule/WebModuleH2Console.java | 2 +-
testing/pom.xml | 4 +-
testing/specsupport/pom.xml | 2 +-
valuetypes/pom.xml | 2 +-
.../extensions/sse/services/SseServiceDefault.java | 2 +-
.../sse/webmodule/WebModuleServerSentEvents.java | 2 +-
108 files changed, 210 insertions(+), 268 deletions(-)
diff --git a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
index 3174851..efd4df9 100644
--- a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
+++ b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
@@ -32,7 +32,7 @@ import org.springframework.context.annotation.PropertySources;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.asciidoc.ui.IsisModuleExtAsciidocUi;
-import org.apache.isis.extensions.fixtures.IsisModuleExtFixtures;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationServiceAllowBeatsVeto;
@@ -100,7 +100,7 @@ public class DemoApp extends SpringBootServletInitializer {
IsisModuleSecmanPersistenceJdo.class,
IsisModuleSecmanEncryptionJbcrypt.class,
- IsisModuleExtFixtures.class,
+ IsisModuleTstFixturesApplib.class,
IsisModuleIncModelMetaModel.class, // @Model support (incubator)
diff --git a/examples/smoketests/pom.xml b/examples/smoketests/pom.xml
index 62b6289..31cd3c2 100644
--- a/examples/smoketests/pom.xml
+++ b/examples/smoketests/pom.xml
@@ -76,7 +76,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.mappings</groupId>
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
index a0ba9eb..c48e23a 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.IsisModuleExtFixtures;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.apache.isis.testdomain.jdo.JdoTestDomainModule;
@@ -36,7 +36,7 @@ import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
IsisModuleSpringBoot.class,
IsisModuleSecurityBypass.class,
IsisModuleJdoDataNucleus5.class,
- IsisModuleExtFixtures.class
+ IsisModuleTstFixturesApplib.class
})
@ComponentScan(
basePackageClasses= {
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
index ef6f484..06945fb 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
@@ -28,7 +28,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.IsisModuleExtFixtures;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationServiceAllowBeatsVeto;
@@ -44,7 +44,7 @@ import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
IsisModuleSecurityShiro.class,
IsisModuleJdoDataNucleus5.class,
- IsisModuleExtFixtures.class
+ IsisModuleTstFixturesApplib.class
})
@ComponentScan(
basePackageClasses= {
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java
index 5e5bf6e..1a3e8f9 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java
@@ -23,10 +23,10 @@ import java.util.HashSet;
import javax.inject.Inject;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.BuilderScriptAbstract;
-import org.apache.isis.extensions.fixtures.fixturescripts.BuilderScriptWithResult;
-import org.apache.isis.extensions.fixtures.fixturescripts.BuilderScriptWithoutResult;
+import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.BuilderScriptAbstract;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.BuilderScriptWithResult;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.BuilderScriptWithoutResult;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
index b87ad02..031fb02 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
@@ -44,7 +44,7 @@ import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
index 0f7e346..022f513 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Inventory;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
index f31e7ce..d2fa7c6 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
@@ -42,7 +42,7 @@ import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java
index a967628..f30125b 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
index d7d322a..8e0ce0d 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
@@ -48,7 +48,7 @@ import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
index 2fe5bd1..cc5127b 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
@@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
index a424dc6..e413b27 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
index 88ebe68..48fb556 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
@@ -28,7 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
import static org.junit.Assert.assertNotNull;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
index 1fc15e8..b301ae1 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
index 90ac093..0599580 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 564375c..573882c 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -129,7 +129,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
diff --git a/extensions/security/secman/persistence-jdo/pom.xml b/extensions/security/secman/persistence-jdo/pom.xml
index e1a6431..fa82fba 100644
--- a/extensions/security/secman/persistence-jdo/pom.xml
+++ b/extensions/security/secman/persistence-jdo/pom.xml
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
index 42af90a..18c9f20 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.runtime.context.session.AppLifecycleEvent;
import lombok.val;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java
index a4eca7d..f592e20 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java
@@ -20,7 +20,7 @@ package org.apache.isis.extensions.secman.jdo.seed;
import javax.inject.Inject;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.jdo.seed.scripts.GlobalTenancy;
import org.apache.isis.extensions.secman.jdo.seed.scripts.IsisExtFixturesFixtureResultsRoleAndPermissions;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
index 0603145..d7f0dc2 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRepository;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRule;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractTenancyFixtureScript.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractTenancyFixtureScript.java
index 757ed32..b01d1f9 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractTenancyFixtureScript.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractTenancyFixtureScript.java
@@ -20,7 +20,7 @@ package org.apache.isis.extensions.secman.jdo.seed.scripts;
import javax.inject.Inject;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.extensions.secman.jdo.dom.tenancy.ApplicationTenancy;
import org.apache.isis.extensions.secman.jdo.dom.tenancy.ApplicationTenancyRepository;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractUserAndRolesFixtureScript.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractUserAndRolesFixtureScript.java
index 2c1722c..c8ac81f 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractUserAndRolesFixtureScript.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractUserAndRolesFixtureScript.java
@@ -26,7 +26,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.value.Password;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.extensions.secman.api.user.AccountType;
import org.apache.isis.extensions.secman.jdo.dom.role.ApplicationRole;
import org.apache.isis.extensions.secman.jdo.dom.role.ApplicationRoleRepository;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/GlobalTenancy.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/GlobalTenancy.java
index a5f0cae..9ded73b 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/GlobalTenancy.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/GlobalTenancy.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.extensions.secman.jdo.seed.scripts;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
public class GlobalTenancy extends AbstractTenancyFixtureScript {
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.java
index 933104a..475ecbb 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.extensions.secman.jdo.seed.scripts;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureResult;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResult;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRule;
diff --git a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
index 3f3d1d4..d9d47dc 100644
--- a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
+++ b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
@@ -43,7 +43,7 @@ import lombok.Getter;
* @since 2.0
*/
@Service
-@Named("isisExtCors.WebModuleServerCors")
+@Named("isisMapCors.WebModuleServerCors")
@Qualifier("CORS")
@Order(OrderPrecedence.HIGH)
public final class WebModuleCors extends WebModuleAbstract {
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 98ad091..055ffa8 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -74,7 +74,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
diff --git a/legacy/pom.xml b/legacy/pom.xml
index f156dea..a1dc7ed 100644
--- a/legacy/pom.xml
+++ b/legacy/pom.xml
@@ -84,7 +84,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
diff --git a/mappings/pom.xml b/mappings/pom.xml
index 32953e7..6dc7097 100644
--- a/mappings/pom.xml
+++ b/mappings/pom.xml
@@ -77,7 +77,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarService.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarService.java
index 41ea363..0f249ab 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarService.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarService.java
@@ -14,7 +14,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.clock.ClockService;
@Service
-@Named("isisExtBase.calendarService")
+@Named("isisSubBase.calendarService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/subdomains/excel/applib/pom.xml b/subdomains/excel/applib/pom.xml
index 446cd6d..eaf0963 100644
--- a/subdomains/excel/applib/pom.xml
+++ b/subdomains/excel/applib/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
</dependency>
<dependency>
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java
index 8d05318..aed5504 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java
@@ -28,7 +28,7 @@ import org.apache.isis.subdomains.excel.applib.dom.util.Mode;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisExtExcel.ExcelService")
+@Named("isisSubExcel.ExcelService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/subdomains/excel/fixture/pom.xml b/subdomains/excel/fixture/pom.xml
index 97f7f47..3c54576 100644
--- a/subdomains/excel/fixture/pom.xml
+++ b/subdomains/excel/fixture/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
</dependency>
<!--
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubExcelFixtures.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubExcelFixtures.java
index 787512a..b9ef710 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubExcelFixtures.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubExcelFixtures.java
@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Import;
import org.apache.isis.extensions.excel.ExcelModule;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.extensions.fixtures.modules.Module;
@Configuration
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
index c31d0ce..188f9a0 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
@@ -15,7 +15,7 @@ import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
import lombok.Setter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
index 70b8029..1f77de6 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
@@ -7,7 +7,7 @@ import org.apache.isis.extensions.excel.dom.ExcelMetaDataEnabled;
import org.apache.isis.extensions.excel.dom.FixtureAwareRowHandler;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
import lombok.Setter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
index 6350780..24b1f45 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
@@ -20,7 +20,7 @@ import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
import lombok.Setter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
index 25bddb6..c80acb2 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
@@ -7,9 +7,9 @@ import javax.inject.Inject;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.extensions.excel.dom.ExcelFixture;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureResult;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResult;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
@DomainService(
nature = NatureOfService.VIEW,
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
index 6f358d0..e5b9565 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
@@ -13,7 +13,7 @@ import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.extensions.excel.dom.ExcelFixture;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
index 9b750b6..794ad54 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
@@ -6,7 +6,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown2;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
public class DemoToDoItem_recreate_usingExcelFixture extends FixtureScript {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
index 695747b..aea4c93 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
@@ -9,7 +9,7 @@ import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
public class ExcelDemoToDoItem_recreate5_for extends FixtureScript {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
index ec44dfc..a5a4f6e 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
@@ -1,7 +1,7 @@
package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.extensions.fixtures.legacy.teardown.TeardownFixtureAbstract2;
+import org.apache.isis.testing.fixtures.applib.legacy.teardown.TeardownFixtureAbstract2;
public class ExcelDemoToDoItem_tearDown extends TeardownFixtureAbstract2 {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
index 2d4e51a..3a6dd12 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
@@ -3,7 +3,7 @@ package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescri
import javax.inject.Inject;
import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
public class ExcelDemoToDoItem_tearDown2 extends FixtureScript {
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
index e315b14..cc3b797 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
+++ b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
@@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.config.IsisPresets;
import org.apache.isis.subdomains.excel.fixtures.IsisModuleSubExcelFixtures;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
-import org.apache.isis.extensions.fixtures.IsisIntegrationTestAbstractWithFixtures;
+import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
import org.apache.isis.jdo.IsisBootDataNucleus;
import org.apache.isis.runtime.spring.IsisBoot;
import org.apache.isis.security.bypass.IsisBootSecurityBypass;
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
index dbff01b..dbc4a3f 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
+++ b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
@@ -13,9 +13,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler2;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturescripts.DemoFixture_extending_ExcelFixture2;
import org.apache.isis.subdomains.excel.integtests.ExcelModuleIntegTestAbstract;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureResult;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResult;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import lombok.val;
diff --git a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture.java b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture.java
index d8835d3..03d7d5f 100644
--- a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture.java
+++ b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture.java
@@ -22,9 +22,9 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
import org.apache.isis.subdomains.excel.applib.dom.util.ExcelServiceImpl;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureResultList;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResultList;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import lombok.Getter;
import lombok.Setter;
diff --git a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture2.java b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture2.java
index 07d77ff..e6b6aa0 100644
--- a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture2.java
+++ b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture2.java
@@ -16,8 +16,8 @@ import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
diff --git a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureRowHandler.java b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureRowHandler.java
index 43376c3..0b80230 100644
--- a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureRowHandler.java
+++ b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureRowHandler.java
@@ -2,7 +2,7 @@ package org.apache.isis.subdomains.excel.testing;
import java.util.List;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
public interface ExcelFixtureRowHandler {
List<Object> handleRow(
diff --git a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureWorkbookHandler.java b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureWorkbookHandler.java
index f656613..b5df801 100644
--- a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureWorkbookHandler.java
+++ b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureWorkbookHandler.java
@@ -2,7 +2,7 @@ package org.apache.isis.subdomains.excel.testing;
import java.util.List;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
public interface ExcelFixtureWorkbookHandler {
void workbookHandled(
diff --git a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/FixtureAwareRowHandler.java b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/FixtureAwareRowHandler.java
index ce212ac..ea8d2ab 100644
--- a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/FixtureAwareRowHandler.java
+++ b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/FixtureAwareRowHandler.java
@@ -1,7 +1,7 @@
package org.apache.isis.subdomains.excel.testing;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.subdomains.excel.applib.dom.RowHandler;
public interface FixtureAwareRowHandler<T extends FixtureAwareRowHandler<T>> extends RowHandler<T> {
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index f8d6d1f..1a59f6a 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -134,7 +134,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
diff --git a/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
index 9f7e326..7f091a7 100644
--- a/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
+++ b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
@@ -37,7 +37,7 @@ import lombok.experimental.UtilityClass;
* Borrowed from BeansEndpoint.
*/
@Service
-@Named("isisExtSpring.SpringBeansService")
+@Named("isisSubSpring.SpringBeansService")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Default")
public class SpringBeansService {
diff --git a/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/FakeDataService.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/FakeDataService.java
index baff8c0..b349e1c 100644
--- a/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/FakeDataService.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/FakeDataService.java
@@ -21,7 +21,7 @@ import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.repository.RepositoryService;
@Service
-@Named("isisExtFakeData.FakeDataService")
+@Named("isisTstFakeData.FakeDataService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/testing/fakedata/fixtures/pom.xml b/testing/fakedata/fixtures/pom.xml
index e7ef2b9..a1f9231 100644
--- a/testing/fakedata/fixtures/pom.xml
+++ b/testing/fakedata/fixtures/pom.xml
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
</dependency>
<dependency>
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java
index e8bd21e..c90ac12 100644
--- a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java
@@ -5,8 +5,8 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.extensions.fakedata.dom.IsisModuleExtFakeData;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.modules.ModuleWithFixtures;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts.FakeDataDemoObjectWithAll_tearDown;
@Configuration
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
index 10772e8..ddf0939 100644
--- a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
@@ -8,7 +8,7 @@ import com.google.common.collect.Lists;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.testing.fakedata.applib.services.FakeDataService;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts.data.FakeDataDemoObjectWithAll_create_withFakeData;
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java
index bfdd848..4bcf15c 100644
--- a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java
@@ -1,6 +1,6 @@
package org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts;
-import org.apache.isis.extensions.fixtures.legacy.teardown.TeardownFixtureAbstract2;
+import org.apache.isis.testing.fixtures.applib.legacy.teardown.TeardownFixtureAbstract2;
import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
public class FakeDataDemoObjectWithAll_tearDown extends TeardownFixtureAbstract2 {
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
index 626f4a6..71e837e 100644
--- a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
@@ -2,7 +2,7 @@ package org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescri
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.testing.fakedata.applib.services.FakeDataService;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAllMenu;
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
index 30f3ed3..c58f5e4 100644
--- a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
@@ -17,7 +17,7 @@ import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.applib.value.Password;
import org.apache.isis.testing.fakedata.applib.services.FakeDataService;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.EnumOf3;
import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
diff --git a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
index 9d64809..d9784a0 100644
--- a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
+++ b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
@@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.config.IsisPresets;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
-import org.apache.isis.extensions.fixtures.IsisIntegrationTestAbstractWithFixtures;
+import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
import org.apache.isis.jdo.IsisBootDataNucleus;
import org.apache.isis.runtime.spring.IsisBoot;
import org.apache.isis.security.bypass.IsisBootSecurityBypass;
diff --git a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/tests/Smoke_IntegTest.java b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/tests/Smoke_IntegTest.java
index 059135f..39bf4e6 100644
--- a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/tests/Smoke_IntegTest.java
+++ b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/tests/Smoke_IntegTest.java
@@ -20,7 +20,7 @@ import org.apache.isis.applib.value.Clob;
import org.apache.isis.applib.value.Password;
import org.apache.isis.extensions.fakedata.dom.services.FakeDataService;
import org.apache.isis.testing.fakedata.integtests.FakeDataModuleIntegTestAbstract;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.EnumOf3;
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
diff --git a/testing/fixtures/pom.xml b/testing/fixtures/applib/pom.xml
similarity index 88%
copy from testing/fixtures/pom.xml
copy to testing/fixtures/applib/pom.xml
index a296ae2..8d1d173 100644
--- a/testing/fixtures/pom.xml
+++ b/testing/fixtures/applib/pom.xml
@@ -16,18 +16,16 @@
<parent>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing</artifactId>
+ <artifactId>isis-testing-fixtures</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>isis-testing-fixtures</artifactId>
- <name>Apache Isis Testing - Fixtures</name>
- <description></description>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
+ <name>Apache Isis Testing - Fixtures (applib)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.testing.fixtures</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/testing/fixtures</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.testing.fixtures.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/testing/fixtures/applib</git-plugin.propertiesDir>
</properties>
<build>
@@ -68,7 +66,7 @@
<version>${jdo-api.version}</version>
<!-- provided by plugins -->
<scope>provided</scope>
- </dependency>
+ </dependency>p
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java
similarity index 85%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java
index 4bda40b..b3520fc 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures;
+package org.apache.isis.testing.fixtures.applib;
import javax.inject.Inject;
@@ -24,12 +24,12 @@ import org.joda.time.LocalDate;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.clock.ClockService;
-import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.BuilderScriptAbstract;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
-import org.apache.isis.extensions.fixtures.legacy.FixtureClock;
-import org.apache.isis.extensions.fixtures.legacy.TickingFixtureClock;
+import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.BuilderScriptAbstract;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.legacy.FixtureClock;
+import org.apache.isis.testing.fixtures.applib.legacy.TickingFixtureClock;
import org.apache.isis.integtestsupport.IsisIntegrationTestAbstract;
public abstract class IsisIntegrationTestAbstractWithFixtures extends IsisIntegrationTestAbstract {
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTstFixturesApplib.java
similarity index 72%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTstFixturesApplib.java
index 4c2c7df..de8ea35 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTstFixturesApplib.java
@@ -16,16 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures;
+package org.apache.isis.testing.fixtures.applib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.fixtures.fixturescripts.ExecutionParametersService;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
-import org.apache.isis.extensions.fixtures.legacy.queryresultscache.QueryResultsCacheControlDefault;
-import org.apache.isis.extensions.fixtures.modules.ModuleWithFixturesService;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.ExecutionParametersService;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.legacy.queryresultscache.QueryResultsCacheControlDefault;
+import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixturesService;
import org.apache.isis.subdomains.spring.applib.IsisModuleSubSpringApplib;
+import org.apache.isis.testing.fixtures.applib.services.FixturesLifecycleService;
@Configuration
@Import({
@@ -41,6 +42,6 @@ import org.apache.isis.subdomains.spring.applib.IsisModuleSubSpringApplib;
// @DomainService's
FixtureScripts.class,
})
-public class IsisModuleExtFixtures {
+public class IsisModuleTstFixturesApplib {
}
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/FixtureScriptWithExecutionStrategy.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/FixtureScriptWithExecutionStrategy.java
similarity index 85%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/FixtureScriptWithExecutionStrategy.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/FixtureScriptWithExecutionStrategy.java
index 5121cb5..2b1ffb5 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/FixtureScriptWithExecutionStrategy.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/FixtureScriptWithExecutionStrategy.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.api;
+package org.apache.isis.testing.fixtures.applib.api;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
-import org.apache.isis.extensions.fixtures.fixturespec.FixtureScriptsSpecification;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturespec.FixtureScriptsSpecification;
/**
* Overrides the {@link FixtureScriptsSpecification#getMultipleExecutionStrategy() globally-defined}
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithBuilderScript.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/PersonaWithBuilderScript.java
similarity index 87%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithBuilderScript.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/PersonaWithBuilderScript.java
index a1f3af6..1cf7f55 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithBuilderScript.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/PersonaWithBuilderScript.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.api;
+package org.apache.isis.testing.fixtures.applib.api;
-import org.apache.isis.extensions.fixtures.fixturescripts.BuilderScriptAbstract;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.BuilderScriptAbstract;
public interface PersonaWithBuilderScript<T extends BuilderScriptAbstract<?>> {
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithFinder.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/PersonaWithFinder.java
similarity index 94%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithFinder.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/PersonaWithFinder.java
index 1e0a1ab..e29b1a2 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithFinder.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/PersonaWithFinder.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.api;
+package org.apache.isis.testing.fixtures.applib.api;
import org.apache.isis.applib.services.registry.ServiceRegistry;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/WithPrereqs.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/WithPrereqs.java
similarity index 84%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/WithPrereqs.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/WithPrereqs.java
index cb3392a..b11455a 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/WithPrereqs.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/WithPrereqs.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.api;
+package org.apache.isis.testing.fixtures.applib.api;
-import org.apache.isis.extensions.fixtures.fixturescripts.BuilderScriptAbstract;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.BuilderScriptAbstract;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
public interface WithPrereqs<T> {
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/package-info.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/package-info.java
similarity index 95%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/package-info.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/package-info.java
index 56f6153..da3e2f0 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/package-info.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/package-info.java
@@ -23,4 +23,4 @@
*
* @see <a href="http://isis.apache.org/guides/ugtst/ugtst.html#_ugtst_fixture-scripts">Testing guide</a>.
*/
-package org.apache.isis.extensions.fixtures.api;
\ No newline at end of file
+package org.apache.isis.testing.fixtures.applib.api;
\ No newline at end of file
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstalledEvent.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/events/FixturesInstalledEvent.java
similarity index 94%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstalledEvent.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/events/FixturesInstalledEvent.java
index 25d191e..1de48d0 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstalledEvent.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/events/FixturesInstalledEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.extensions.fixtures.events;
+package org.apache.isis.testing.fixtures.applib.events;
import org.apache.isis.applib.events.domain.EventObjectBase;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstallingEvent.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/events/FixturesInstallingEvent.java
similarity index 94%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstallingEvent.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/events/FixturesInstallingEvent.java
index 9321fc0..f34dab3 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstallingEvent.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/events/FixturesInstallingEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.extensions.fixtures.events;
+package org.apache.isis.testing.fixtures.applib.events;
import org.apache.isis.applib.events.domain.EventObjectBase;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptAbstract.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptAbstract.java
similarity index 90%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptAbstract.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptAbstract.java
index d15dce7..5d5f3b7 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptAbstract.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptAbstract.java
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import java.util.List;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.extensions.fixtures.api.FixtureScriptWithExecutionStrategy;
-import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
-import org.apache.isis.extensions.fixtures.api.PersonaWithFinder;
-import org.apache.isis.extensions.fixtures.api.WithPrereqs;
+import org.apache.isis.testing.fixtures.applib.api.FixtureScriptWithExecutionStrategy;
+import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
+import org.apache.isis.testing.fixtures.applib.api.PersonaWithFinder;
+import org.apache.isis.testing.fixtures.applib.api.WithPrereqs;
import lombok.Getter;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithResult.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptWithResult.java
similarity index 95%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithResult.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptWithResult.java
index e913f88..d8fbfb1 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithResult.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptWithResult.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import org.apache.isis.applib.annotation.Programmatic;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithoutResult.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptWithoutResult.java
similarity index 94%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithoutResult.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptWithoutResult.java
index 3bb0ff8..0a8f4b1 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithoutResult.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptWithoutResult.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
/**
*
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters.java
similarity index 99%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters.java
index 3308dc9..e0b95ca 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParametersService.java
similarity index 83%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParametersService.java
index 8a70209..944e470 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParametersService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import javax.inject.Named;
@@ -29,8 +29,8 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
/**
- * Acts as a factory by the {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts} when
- * instantiating the {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript.ExecutionContext}.
+ * Acts as a factory by the {@link FixtureScripts} when
+ * instantiating the {@link FixtureScript.ExecutionContext}.
*
* <p>
* Factoring this out as a service potentially allows for extensions to parsing; and also acts as an
@@ -39,7 +39,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
* </p>
*/
@Service
-@Named("isisExtFixtures.ExecutionParametersService")
+@Named("isisTstFixtures.ExecutionParametersService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResult.java
similarity index 97%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResult.java
index 3933718..5a696d0 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResult.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import javax.inject.Inject;
import javax.xml.bind.annotation.XmlAccessType;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.layout.xml b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResult.layout.xml
similarity index 100%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.layout.xml
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResult.layout.xml
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResultList.java
similarity index 81%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResultList.java
index ec6248b..3703149 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResultList.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import java.util.Collections;
import java.util.List;
@@ -56,17 +56,17 @@ public class FixtureResultList {
* that any given fixture script instance is only executed once.
*
* <p>
- * (The {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts.MultipleExecutionStrategy} in contrast
+ * (The {@link FixtureScripts.MultipleExecutionStrategy} in contrast
* controls whether two instances of the same class can be executed).
* </p>
*
* <p>
* REVIEW: I think this should probably be removed; it certainly does nothing if
- * {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts.MultipleExecutionStrategy#IGNORE} is set,
+ * {@link FixtureScripts.MultipleExecutionStrategy#IGNORE} is set,
* and is arguably counter to the spirit of
- * {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts.MultipleExecutionStrategy#EXECUTE} being set.
+ * {@link FixtureScripts.MultipleExecutionStrategy#EXECUTE} being set.
* </p>
- * {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript}s used to generate this result list.
+ * {@link FixtureScript}s used to generate this result list.
*/
private final List<FixtureScript> fixtureScriptList = _Lists.newArrayList();
@@ -77,12 +77,12 @@ public class FixtureResultList {
}
/**
- * Wraps the object within a {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureResult} and add to this list.
+ * Wraps the object within a {@link FixtureResult} and add to this list.
*
* <P>
* If the object is not yet persisted, then the {@link FixtureScripts#getNonPersistedObjectsStrategy() FixtureScripts}'
- * configuration will determine whether it is {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts.NonPersistedObjectsStrategy#PERSIST eagerly persisted}
- * or simply {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts.NonPersistedObjectsStrategy#IGNORE ignored}.
+ * configuration will determine whether it is {@link FixtureScripts.NonPersistedObjectsStrategy#PERSIST eagerly persisted}
+ * or simply {@link FixtureScripts.NonPersistedObjectsStrategy#IGNORE ignored}.
* </P>
*/
public <T> T add(final FixtureScript fixtureScript, final String key, final T object) {
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScript.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java
similarity index 96%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScript.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java
index ce4dad3..63db2a3 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScript.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -50,9 +50,9 @@ import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.extensions.fixtures.api.FixtureScriptWithExecutionStrategy;
-import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
-import org.apache.isis.extensions.fixtures.api.WithPrereqs;
+import org.apache.isis.testing.fixtures.applib.api.FixtureScriptWithExecutionStrategy;
+import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
+import org.apache.isis.testing.fixtures.applib.api.WithPrereqs;
import lombok.Getter;
import lombok.Setter;
@@ -137,7 +137,7 @@ public abstract class FixtureScript {
public static class ExecutionContext {
/**
- * Null implementation, to assist with unit testing of {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript}s.
+ * Null implementation, to assist with unit testing of {@link FixtureScript}s.
*/
public static final ExecutionContext NOOP = new ExecutionContext((String)null, null) {
@Override
@@ -391,7 +391,7 @@ public abstract class FixtureScript {
/**
* Executes a child {@link FixtureScript fixture script}, injecting services into it first, and (for any results
- * that are {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
+ * that are {@link FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
* uses a key that is derived from the fixture's class name.
*/
@Programmatic
@@ -441,7 +441,7 @@ public abstract class FixtureScript {
/**
* Executes a child {@link FixtureScript fixture script}, injecting services into it first, and (for any results
- * that are {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
+ * that are {@link FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
* uses a key that is derived from the fixture's class name.
*
* @return the child fixture script.
@@ -453,7 +453,7 @@ public abstract class FixtureScript {
/**
* Executes a child {@link FixtureScript fixture script}, injecting services into it first, and (for any results
- * that are {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
+ * that are {@link FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
* uses a key that overriding the default name of the fixture script with one more meaningful in the context of this fixture.
*/
@Programmatic
@@ -470,7 +470,7 @@ public abstract class FixtureScript {
/**
* Executes a child {@link FixtureScript fixture script}, injecting services into it first, and (for any results
- * that are {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
+ * that are {@link FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
* uses a key that overriding the default name of the fixture script with one more meaningful in the context of this fixture.
*
* @return the child fixture script.
@@ -707,7 +707,7 @@ public abstract class FixtureScript {
private ExecutionContext executionContext;
/**
- * Entry point for {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts}
+ * Entry point for {@link FixtureScripts}
* service to call.
*
* <p>
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
similarity index 97%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
index 219562a..b5fddf2 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import java.util.List;
import java.util.Map;
@@ -55,11 +55,11 @@ import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
-import org.apache.isis.extensions.fixtures.events.FixturesInstalledEvent;
-import org.apache.isis.extensions.fixtures.events.FixturesInstallingEvent;
-import org.apache.isis.extensions.fixtures.fixturespec.FixtureScriptsSpecification;
-import org.apache.isis.extensions.fixtures.fixturespec.FixtureScriptsSpecificationProvider;
+import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
+import org.apache.isis.testing.fixtures.applib.events.FixturesInstalledEvent;
+import org.apache.isis.testing.fixtures.applib.events.FixturesInstallingEvent;
+import org.apache.isis.testing.fixtures.applib.fixturespec.FixtureScriptsSpecification;
+import org.apache.isis.testing.fixtures.applib.fixturespec.FixtureScriptsSpecificationProvider;
import lombok.Getter;
import lombok.Setter;
@@ -82,7 +82,7 @@ public class FixtureScripts extends AbstractService {
/**
* How to handle objects that are to be
* {@link FixtureScripts#newFixtureResult(FixtureScript, String, Object, boolean) added}
- * into a {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureResult} but which are not yet persisted.
+ * into a {@link FixtureResult} but which are not yet persisted.
*/
public enum NonPersistedObjectsStrategy {
PERSIST,
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecification.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturespec/FixtureScriptsSpecification.java
similarity index 94%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecification.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturespec/FixtureScriptsSpecification.java
index 4efa2af..5a320c9 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecification.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturespec/FixtureScriptsSpecification.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturespec;
+package org.apache.isis.testing.fixtures.applib.fixturespec;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fixtures.api.FixtureScriptWithExecutionStrategy;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureResultList;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.api.FixtureScriptWithExecutionStrategy;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResultList;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
/**
* Pulls together the various state that influences the behaviour of {@link FixtureScripts} service.
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecificationProvider.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturespec/FixtureScriptsSpecificationProvider.java
similarity index 94%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecificationProvider.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturespec/FixtureScriptsSpecificationProvider.java
index 39e9b64..b327fd2 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecificationProvider.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturespec/FixtureScriptsSpecificationProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturespec;
+package org.apache.isis.testing.fixtures.applib.fixturespec;
import org.apache.isis.applib.annotation.Programmatic;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/package-info.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturespec/package-info.java
similarity index 78%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/package-info.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturespec/package-info.java
index 5334d2b..ed3c294 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/package-info.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturespec/package-info.java
@@ -18,8 +18,8 @@
*/
/**
- * The {@link org.apache.isis.extensions.fixtures.fixturespec.FixtureScriptsSpecificationProvider} SPI service configures the {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts} domain service.
+ * The {@link org.apache.isis.testing.fixtures.applib.fixturespec.FixtureScriptsSpecificationProvider} SPI service configures the {@link org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts} domain service.
*
* @see <a href="http://isis.apache.org/migration-notes/migration-notes.html#_migration-notes_1.8.0-to-1.9.0_fixture-scripts-specification-provider">Reference guide</a>
*/
-package org.apache.isis.extensions.fixtures.fixturespec;
\ No newline at end of file
+package org.apache.isis.testing.fixtures.applib.fixturespec;
\ No newline at end of file
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/FixtureClock.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/FixtureClock.java
similarity index 99%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/FixtureClock.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/FixtureClock.java
index e771f7b..2e023ef 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/FixtureClock.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/FixtureClock.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.extensions.fixtures.legacy;
+package org.apache.isis.testing.fixtures.applib.legacy;
import java.time.Instant;
import java.util.Calendar;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/TickingFixtureClock.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/TickingFixtureClock.java
similarity index 98%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/TickingFixtureClock.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/TickingFixtureClock.java
index d741c69..275fbc0 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/TickingFixtureClock.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/TickingFixtureClock.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.legacy;
+package org.apache.isis.testing.fixtures.applib.legacy;
import java.sql.Timestamp;
import java.time.Instant;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/ClockFixture.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/clock/ClockFixture.java
similarity index 91%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/ClockFixture.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/clock/ClockFixture.java
index 9374794..3537c18 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/ClockFixture.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/clock/ClockFixture.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.legacy.clock;
+package org.apache.isis.testing.fixtures.applib.legacy.clock;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
@@ -25,10 +25,10 @@ import org.joda.time.format.DateTimeFormatter;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.clock.Clock;
-import org.apache.isis.extensions.fixtures.api.FixtureScriptWithExecutionStrategy;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
-import org.apache.isis.extensions.fixtures.legacy.FixtureClock;
+import org.apache.isis.testing.fixtures.applib.api.FixtureScriptWithExecutionStrategy;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.legacy.FixtureClock;
@Programmatic
class ClockFixture extends FixtureScript implements FixtureScriptWithExecutionStrategy {
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/TickingClockFixture.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/clock/TickingClockFixture.java
similarity index 90%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/TickingClockFixture.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/clock/TickingClockFixture.java
index 5006c2c..c031f16 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/TickingClockFixture.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/clock/TickingClockFixture.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.legacy.clock;
+package org.apache.isis.testing.fixtures.applib.legacy.clock;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
@@ -25,11 +25,11 @@ import org.joda.time.format.DateTimeFormatter;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.clock.Clock;
-import org.apache.isis.extensions.fixtures.api.FixtureScriptWithExecutionStrategy;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
-import org.apache.isis.extensions.fixtures.legacy.FixtureClock;
-import org.apache.isis.extensions.fixtures.legacy.TickingFixtureClock;
+import org.apache.isis.testing.fixtures.applib.api.FixtureScriptWithExecutionStrategy;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.legacy.FixtureClock;
+import org.apache.isis.testing.fixtures.applib.legacy.TickingFixtureClock;
@Programmatic
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/package-info.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/package-info.java
similarity index 91%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/package-info.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/package-info.java
index 1ce74fb..a9a89e5 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/package-info.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/package-info.java
@@ -22,7 +22,7 @@
* interface and supporting classes.
*
* <p>
- * <b>NOTE THAT</b> {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript} interface provides a more complete
+ * <b>NOTE THAT</b> {@link org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript} interface provides a more complete
* approach to handling fixtures, and should generally be used in preference to
* {@link org.apache.isis.extensions.fixtures.legacy.InstallableFixture}.
* </p>
@@ -42,4 +42,4 @@
* </ul>
*
*/
-package org.apache.isis.extensions.fixtures.legacy;
\ No newline at end of file
+package org.apache.isis.testing.fixtures.applib.legacy;
\ No newline at end of file
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlDefault.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/queryresultscache/QueryResultsCacheControlDefault.java
similarity index 87%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlDefault.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/queryresultscache/QueryResultsCacheControlDefault.java
index b835a7e..6a96e39 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlDefault.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/queryresultscache/QueryResultsCacheControlDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.legacy.queryresultscache;
+package org.apache.isis.testing.fixtures.applib.legacy.queryresultscache;
import javax.inject.Named;
@@ -29,15 +29,15 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.queryresultscache.QueryResultCacheControl;
import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
-import org.apache.isis.extensions.fixtures.events.FixturesInstalledEvent;
-import org.apache.isis.extensions.fixtures.events.FixturesInstallingEvent;
+import org.apache.isis.testing.fixtures.applib.events.FixturesInstalledEvent;
+import org.apache.isis.testing.fixtures.applib.events.FixturesInstallingEvent;
/**
* In separate class because {@link QueryResultsCache} itself is request-scoped
*/
@Service
-@Named("isisExtFixtures.QueryResultsCacheControlDefault")
+@Named("isisTstFixtures.QueryResultsCacheControlDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/setup/PersonaEnumPersistAll.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/setup/PersonaEnumPersistAll.java
similarity index 84%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/setup/PersonaEnumPersistAll.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/setup/PersonaEnumPersistAll.java
index cd67a3d..d71d045 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/setup/PersonaEnumPersistAll.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/setup/PersonaEnumPersistAll.java
@@ -16,21 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.legacy.setup;
+package org.apache.isis.testing.fixtures.applib.legacy.setup;
import java.util.List;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.extensions.fixtures.api.FixtureScriptWithExecutionStrategy;
-import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.BuilderScriptAbstract;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.api.FixtureScriptWithExecutionStrategy;
+import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.BuilderScriptAbstract;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
@Programmatic
public class PersonaEnumPersistAll<
-E extends Enum<E> & PersonaWithBuilderScript<? extends BuilderScriptAbstract<T>>,
+E extends Enum<E> & PersonaWithBuilderScript<? extends BuilderScriptAbstract<T>>,
T>
extends FixtureScript
implements FixtureScriptWithExecutionStrategy {
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract.java
similarity index 98%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract.java
index 3003d5a..16e186c 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.legacy.teardown;
+package org.apache.isis.testing.fixtures.applib.legacy.teardown;
import javax.inject.Inject;
import javax.jdo.PersistenceManagerFactory;
@@ -28,7 +28,7 @@ import javax.jdo.metadata.TypeMetadata;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport;
@Programmatic
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract2.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract2.java
similarity index 93%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract2.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract2.java
index 6b6465c..ec1deb8 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract2.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract2.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.legacy.teardown;
+package org.apache.isis.testing.fixtures.applib.legacy.teardown;
public abstract class TeardownFixtureAbstract2 extends TeardownFixtureAbstract {
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixtures.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixtures.java
similarity index 94%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixtures.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixtures.java
index 4158106..391e859 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixtures.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixtures.java
@@ -1,9 +1,9 @@
-package org.apache.isis.extensions.fixtures.modules;
+package org.apache.isis.testing.fixtures.applib.modules;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
/**
* A module is a class that implements this {@link ModuleWithFixtures} interface, but in addition is expected to be annotated with
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixturesService.java
similarity index 97%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixturesService.java
index b586331..9cb0005 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixturesService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.modules;
+package org.apache.isis.testing.fixtures.applib.modules;
import java.util.ArrayList;
import java.util.Arrays;
@@ -39,7 +39,7 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.subdomains.spring.applib.service.BeanDescriptor;
import org.apache.isis.subdomains.spring.applib.service.ContextBeans;
import org.apache.isis.subdomains.spring.applib.service.SpringBeansService;
@@ -50,7 +50,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisExtFixtures.ModuleService")
+@Named("isisTstFixtures.ModuleService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
similarity index 93%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
index 5facc2b..23283e2 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures;
+package org.apache.isis.testing.fixtures.applib.services;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -31,11 +31,11 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.extensions.fixtures.legacy.FixtureClock;
+import org.apache.isis.testing.fixtures.applib.legacy.FixtureClock;
import org.apache.isis.runtime.session.IsisSessionFactory;
@Service
-@Named("isisExtFixtures.FixturesLifecycleService")
+@Named("isisTstFixtures.FixturesLifecycleService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/testing/fixtures/src/main/resources/prism.css b/testing/fixtures/applib/src/main/resources/prism.css
similarity index 100%
rename from testing/fixtures/src/main/resources/prism.css
rename to testing/fixtures/applib/src/main/resources/prism.css
diff --git a/testing/fixtures/src/main/resources/prism1.14.js b/testing/fixtures/applib/src/main/resources/prism1.14.js
similarity index 100%
rename from testing/fixtures/src/main/resources/prism1.14.js
rename to testing/fixtures/applib/src/main/resources/prism1.14.js
diff --git a/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionContextTest.java b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionContextTest.java
similarity index 98%
rename from testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionContextTest.java
rename to testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionContextTest.java
index 12cdf49..36747f8 100644
--- a/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionContextTest.java
+++ b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionContextTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import java.util.Map;
diff --git a/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
similarity index 97%
rename from testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
rename to testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
index e7183b4..3dc8ab0 100644
--- a/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
+++ b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import java.util.Map;
diff --git a/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_Test.java b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters_Test.java
similarity index 99%
rename from testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_Test.java
rename to testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters_Test.java
index c29ab80..44a1057 100644
--- a/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_Test.java
+++ b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters_Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/legacy/FixtureClockInstantiationTest.java
similarity index 92%
rename from testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java
rename to testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/legacy/FixtureClockInstantiationTest.java
index 0d30744..f4913ad 100644
--- a/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java
+++ b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/legacy/FixtureClockInstantiationTest.java
@@ -17,8 +17,9 @@
* under the License.
*/
-package org.apache.isis.extensions.fixtures.legacy;
+package org.apache.isis.testing.fixtures.applib.legacy;
+import org.hamcrest.CoreMatchers;
import org.junit.Before;
import org.junit.Test;
@@ -45,7 +46,7 @@ public class FixtureClockInstantiationTest {
public void canInitializeFixtureClockMultipleTimesButAlwaysGetTheSameFixtureClock() {
final FixtureClock fixtureClock1 = FixtureClock.initialize();
final FixtureClock fixtureClock2 = FixtureClock.initialize();
- assertThat(fixtureClock1, is(fixtureClock2));
+ assertThat(fixtureClock1, CoreMatchers.is(fixtureClock2));
}
@Test
diff --git a/testing/fixtures/pom.xml b/testing/fixtures/pom.xml
index a296ae2..b02bff5 100644
--- a/testing/fixtures/pom.xml
+++ b/testing/fixtures/pom.xml
@@ -18,76 +18,18 @@
<groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>isis-testing-fixtures</artifactId>
- <name>Apache Isis Testing - Fixtures</name>
- <description></description>
+ <name>Apache Isis Testing - Fixtures (parent)</name>
+ <description>
+ Library to initialize the system under test, either for integration testing or for prototyping.
+ </description>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.testing.fixtures</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/testing/fixtures</git-plugin.propertiesDir>
- </properties>
+ <packaging>pom</packaging>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-spring-applib</artifactId>
- </dependency>
-
- <!-- JDO API (non transient, provided by plugin) -->
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <version>${jdo-api.version}</version>
- <!-- provided by plugins -->
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-persistence-jdo-applib</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-integtestsupport</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
+ <modules>
+ <module>applib</module>
+ </modules>
</project>
diff --git a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
index 7aa48b2..07a7249 100644
--- a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
+++ b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
@@ -44,7 +44,7 @@ import lombok.Getter;
import lombok.val;
@Service
-@Named("isisExtH2Console.WebModuleH2Console")
+@Named("isisTstH2Console.WebModuleH2Console")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("H2Console")
public class WebModuleH2Console extends WebModuleAbstract {
diff --git a/testing/pom.xml b/testing/pom.xml
index 6a45751..4158d04 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -118,10 +118,10 @@
<modules>
<module>fakedata</module>
+ <module>fixtures</module>
<module>h2console</module>
<module>hsqldbmgr</module>
- <module>fixtures</module>
<module>specsupport</module>
<module>unittestsupport/impl</module>
</modules>
diff --git a/testing/specsupport/pom.xml b/testing/specsupport/pom.xml
index e4457af..b464493 100644
--- a/testing/specsupport/pom.xml
+++ b/testing/specsupport/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
</dependency>
<!-- TESTING -->
diff --git a/valuetypes/pom.xml b/valuetypes/pom.xml
index d5314a8..d984405 100644
--- a/valuetypes/pom.xml
+++ b/valuetypes/pom.xml
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
index eac8a9a..0a9be80 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
+++ b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
@@ -63,7 +63,7 @@ import lombok.extern.log4j.Log4j2;
*
*/
@Service
-@Named("isisExtSse.SseServiceDefault")
+@Named("isisValSse.SseServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java
index cb33df2..e0c03d1 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java
+++ b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java
@@ -42,7 +42,7 @@ import lombok.Getter;
* @since 2.0
*/
@Service
-@Named("isisExtSse.WebModuleServerSentEvents")
+@Named("isisValSse.WebModuleServerSentEvents")
@Qualifier("ServerSentEvents")
@Order(OrderPrecedence.MIDPOINT)
public final class WebModuleServerSentEvents extends WebModuleAbstract {
[isis] 15/21: ISIS-2259: reorganises excel subdomain,
factors out excel.applib vs excel.testing
Posted by da...@apache.org.
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 4295ffbffa81fcad5102fdebc6d81b63fe8bce83
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 09:53:25 2020 +0000
ISIS-2259: reorganises excel subdomain, factors out excel.applib vs excel.testing
Also - makes dependency from applib to commons optional
---
core/applib/pom.xml | 24 ++++++++++++-
.../apache/isis/applib/annotation/Defaulted.java | 5 ++-
.../org/apache/isis/applib/annotation/Value.java | 16 +++------
.../isis/applib/domain/DomainObjectList.java | 4 +--
.../applib/events/domain/AbstractDomainEvent.java | 11 +++---
.../isis/applib/events/ui/AbstractUiEvent.java | 4 +--
.../jaxbadapters/PersistentEntitiesAdapter.java | 4 +--
.../layout/component/CollectionLayoutData.java | 4 +--
.../isis/applib/layout/component/FieldSet.java | 6 ++--
.../layout/component/PropertyLayoutData.java | 4 +--
.../isis/applib/layout/grid/GridAbstract.java | 19 +++++-----
.../isis/applib/layout/grid/bootstrap3/BS3Col.java | 14 ++++----
.../applib/layout/grid/bootstrap3/BS3Grid.java | 19 +++++-----
.../isis/applib/layout/grid/bootstrap3/BS3Row.java | 4 +--
.../isis/applib/layout/grid/bootstrap3/BS3Tab.java | 4 +--
.../applib/layout/grid/bootstrap3/BS3TabGroup.java | 4 +--
.../applib/layout/menubars/MenuBarsAbstract.java | 4 +--
.../applib/layout/menubars/bootstrap3/BS3Menu.java | 4 +--
.../layout/menubars/bootstrap3/BS3MenuBar.java | 5 +--
.../layout/menubars/bootstrap3/BS3MenuSection.java | 5 +--
.../isis/applib/mixins/dto/Dto_downloadXsd.java | 2 +-
.../org/apache/isis/applib/util}/ZipWriter.java | 2 +-
subdomains/excel/{impl => applib}/pom.xml | 17 +++------
.../excel/applib/IsisModuleSubExcelApplib.java} | 4 +--
.../excel/applib}/dom/AggregationType.java | 2 +-
.../excel/applib}/dom/ExcelMetaDataEnabled.java | 2 +-
.../subdomains/excel/applib}/dom/ExcelService.java | 6 ++--
.../subdomains/excel/applib}/dom/HyperLink.java | 2 +-
.../subdomains/excel/applib}/dom/PivotColumn.java | 2 +-
.../excel/applib}/dom/PivotDecoration.java | 2 +-
.../subdomains/excel/applib}/dom/PivotRow.java | 2 +-
.../subdomains/excel/applib}/dom/PivotValue.java | 2 +-
.../subdomains/excel/applib}/dom/RowHandler.java | 2 +-
.../excel/applib}/dom/WorksheetContent.java | 2 +-
.../excel/applib}/dom/WorksheetSpec.java | 4 +--
.../excel/applib}/dom/util/AnnotationList.java | 2 +-
.../excel/applib}/dom/util/AnnotationTriplet.java | 2 +-
.../excel/applib}/dom/util/CellMarshaller.java | 2 +-
.../excel/applib}/dom/util/ExcelConverter.java | 24 ++++++-------
.../applib}/dom/util/ExcelFileBlobConverter.java | 4 +--
.../excel/applib}/dom/util/ExcelServiceImpl.java | 14 ++++----
.../subdomains/excel/applib}/dom/util/Mode.java | 2 +-
.../excel/applib}/dom/util/PivotUtils.java | 4 +--
.../excel/applib}/dom/util/SheetPivoter.java | 6 ++--
.../excel/applib}/dom/util/AnnotationListTest.java | 2 +-
.../applib}/dom/util/AnnotationTripletTest.java | 2 +-
.../excel/applib}/dom/util/PivotUtilsTest.java | 2 +-
.../excel/applib}/dom/util/SheetPivoterTest.java | 2 +-
subdomains/excel/fixture/pom.xml | 11 ++++--
.../fixtures/IsisModuleSubExcelFixtures.java} | 6 ++--
.../contributions/ExcelDemoToDoItem_export.java | 8 ++---
.../contributions/ExcelDemoToDoItem_export2.java | 6 ++--
.../BulkUpdateLineItemForDemoToDoItem.java | 10 +++---
.../BulkUpdateLineItemForDemoToDoItem.layout.xml | 0
.../BulkUpdateManagerForDemoToDoItem.java | 10 +++---
.../BulkUpdateManagerForDemoToDoItem.layout.xml | 0
.../bulkupdate/BulkUpdateMenuForDemoToDoItem.java | 6 ++--
.../pivot/ExcelPivotByCategoryAndSubcategory.java | 6 ++--
.../ExcelPivotByCategoryAndSubcategoryMenu.java | 4 +--
.../demotodoitem/DemoToDoItemRowHandler.java | 10 +++---
.../demotodoitem/DemoToDoItemRowHandler2.java | 6 ++--
.../ExcelUploadRowHandler4ToDoItem.java | 10 +++---
.../ExcelUploadServiceForDemoToDoItem.java | 4 +--
.../DemoFixture_extending_ExcelFixture2.java | 4 +--
.../DemoToDoItem_create_usingExcelFixture.java | 6 ++--
.../DemoToDoItem_recreate_usingExcelFixture.java | 4 +--
.../demomodule/fixturescripts/MoreToDoItems.xlsx | Bin
.../demomodule/fixturescripts/ToDoItems.xlsx | Bin
.../fixtures/demoapp/todomodule/dom/Category.java | 2 +-
.../todomodule/dom/DependenciesComparator.java | 2 +-
.../todomodule/dom/ExcelDemoToDoItem-done.png | Bin
.../todomodule/dom/ExcelDemoToDoItem-todo.png | Bin
.../demoapp/todomodule/dom/ExcelDemoToDoItem.java | 2 +-
.../todomodule/dom/ExcelDemoToDoItem.layout.xml | 0
.../demoapp/todomodule/dom/ExcelDemoToDoItem.png | Bin
.../todomodule/dom/ExcelDemoToDoItemMenu.java | 2 +-
.../demoapp/todomodule/dom/Subcategory.java | 2 +-
.../ExcelDemoToDoItem_recreate5_for.java | 10 +++---
.../ExcelDemoToDoItem_recreate5_forSven.java | 2 +-
.../fixturescripts/ExcelDemoToDoItem_tearDown.java | 4 +--
.../ExcelDemoToDoItem_tearDown2.java | 2 +-
subdomains/excel/integtests/pom.xml | 10 ++++++
.../integtests/ExcelModuleIntegTestAbstract.java | 6 ++--
.../ExcelModuleDemoMetaDataEnabled_IntegTest.java | 8 ++---
...uleDemoToDoItemBulkUpdateManager_IntegTest.java | 14 ++++----
.../ExcelModuleDemoUploadService_IntegTest.java | 12 +++----
.../tests/ToDoItemsWithMultipleSheets.xlsx | Bin
.../excel/integtests/tests/toDoItems-expected.xlsx | Bin
.../excel/integtests/tests/toDoItems-updated.xlsx | Bin
subdomains/excel/pom.xml | 39 +++++++++++++++++++++
.../excel/{impl => }/src/main/doc/antora.yml | 0
.../{impl => }/src/main/doc/modules/excel/nav.adoc | 0
.../src/main/doc/modules/excel/pages/about.adoc | 0
.../doc/modules/excel/partials/module-nav.adoc | 0
subdomains/excel/testing/pom.xml | 38 ++++++++++++++++++++
.../subdomains/excel/testing}/ExcelFixture.java | 5 +--
.../subdomains/excel/testing}/ExcelFixture2.java | 4 ++-
.../excel/testing}/ExcelFixtureRowHandler.java | 2 +-
.../testing}/ExcelFixtureWorkbookHandler.java | 2 +-
.../excel/testing}/FixtureAwareRowHandler.java | 3 +-
.../excel/testing/IsisModuleSubExcelTesting.java} | 4 +--
subdomains/pom.xml | 13 +++----
102 files changed, 346 insertions(+), 238 deletions(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 380f390..1e3e25d 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -71,9 +71,31 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-commons</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-schema</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>javaee-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- TESTS -->
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java
index f01d66b..3cc72fc 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java
@@ -26,7 +26,6 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.apache.isis.applib.adapters.DefaultsProvider;
-import org.apache.isis.commons.internal.encoding.Encodable;
/**
* Indicates that the class should have a default, by providing a link to a
@@ -41,8 +40,8 @@ import org.apache.isis.commons.internal.encoding.Encodable;
* of {@link DefaultsProvider} could adjust the default it provides according to
* circumstance, for example).
*
- * @see Encodable
- * @see Parseable
+ * @see <code>Encodable</code>
+ * @see <code>Parseable</code>
* @see Value
*
* <p>
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Value.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
index 36269fa..03e8dd2 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
@@ -27,33 +27,27 @@ import java.lang.annotation.Target;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.ValueSemanticsProvider;
-import org.apache.isis.commons.internal.encoding.Encodable;
/**
* Indicates that the class has value semantics.
*
* <p>
* By "value semantics" all we actually mean that the class is
- * {@link Aggregated} and so therefore (conceptually) is not shared between
+ * aggregated (or embedded) and so therefore (conceptually) is not shared between
* instances of classes. However, values very often have other semantics, and so
* this annotation allows these to also be specified:
- * <li>it may be parseable (as per {@link Parseable})</li>
- * <li>it may be encodeable (as per {@link Encodable})</li>
- * <li>it may be immutable (as per {@link Immutable}), and by default is
- * presumed that it is</li>
+ * <li>it may be parseable</li>
+ * <li>it may be encodeable</li>
+ * <li>it may be immutable, and by default is presumed that it is</li>
* <li>it may follow the equal-by-content contract (as per
* {@link EqualByContent}), and by default is presumed that it does.</i> </ul>
*
* <p>
* Note also that though a value is conceptually not shared, if it is also
- * {@link Immutable immutable} then it is in fact safe to share objects (as in
+ * immutable then it is in fact safe to share objects (as in
* the flyweight pattern). In addition, the {@link EqualByContent} semantic
* means that we needn't care whether value types are being shared or not.
*
- * @see Aggregated
- * @see Parseable
- * @see Encodable
- * @see Immutable
* @see EqualByContent
*
* <p>
diff --git a/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java b/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
index 5d64609..2a13734 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.applib.domain;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
@@ -35,7 +36,6 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.jaxbadapters.PersistentEntitiesAdapter;
-import org.apache.isis.commons.internal.collections._Lists;
@XmlRootElement(name = "list")
@XmlType(
@@ -161,7 +161,7 @@ public class DomainObjectList {
public static class ObjectsDomainEvent extends CollectionDomainEvent<Object> { }
@XmlJavaTypeAdapter(PersistentEntitiesAdapter.class)
- private List<Object> objects = _Lists.newArrayList();
+ private List<Object> objects = new ArrayList<>();
@Collection(
domainEvent = ObjectsDomainEvent.class,
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java b/core/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
index b3bfd81..4d4ac5f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
@@ -18,14 +18,17 @@
*/
package org.apache.isis.applib.events.domain;
+import java.util.HashMap;
import java.util.Map;
+import javax.annotation.Nullable;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.ToString;
-import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.exceptions._Exceptions;
public abstract class AbstractDomainEvent<S> extends EventObjectBase<S> {
@@ -99,8 +102,8 @@ public abstract class AbstractDomainEvent<S> extends EventObjectBase<S> {
}
/**
- * When the {@link org.apache.isis.applib.services.command.Command} is made available on the {@link org.apache.isis.applib.events.domain.ActionDomainEvent}
- * via {@link org.apache.isis.applib.events.domain.ActionDomainEvent#getCommand()}.
+ * When the {@link org.apache.isis.applib.services.command.Command} is made available on the
+ * {@link org.apache.isis.applib.events.domain.ActionDomainEvent} via {@link CommandContext#getCommand()}.
*/
public boolean isExecutingOrLater() {
return isExecuting() || isExecuted();
@@ -315,7 +318,7 @@ public abstract class AbstractDomainEvent<S> extends EventObjectBase<S> {
/**
* Provides a mechanism to pass data to the next {@link #getEventPhase() phase}.
*/
- private final Map<Object, Object> userData = _Maps.newHashMap();
+ private final Map<Object, Object> userData = new HashMap<>();
/**
* Obtain user-data, as set by a previous {@link #getEventPhase() phase}.
diff --git a/core/applib/src/main/java/org/apache/isis/applib/events/ui/AbstractUiEvent.java b/core/applib/src/main/java/org/apache/isis/applib/events/ui/AbstractUiEvent.java
index a6ecf17..72df250 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/events/ui/AbstractUiEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/events/ui/AbstractUiEvent.java
@@ -18,10 +18,10 @@
*/
package org.apache.isis.applib.events.ui;
+import java.util.HashMap;
import java.util.Map;
import org.apache.isis.applib.events.domain.EventObjectBase;
-import org.apache.isis.commons.internal.collections._Maps;
public abstract class AbstractUiEvent<S> extends EventObjectBase<S> {
@@ -42,7 +42,7 @@ public abstract class AbstractUiEvent<S> extends EventObjectBase<S> {
/**
* Provides a mechanism to pass data around.
*/
- private final Map<Object, Object> userData = _Maps.newHashMap();
+ private final Map<Object, Object> userData = new HashMap<>();
/**
* Obtain user-data, as set by any other subscribers.
diff --git a/core/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntitiesAdapter.java b/core/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntitiesAdapter.java
index efc9c41..0bea114 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntitiesAdapter.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntitiesAdapter.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.applib.jaxbadapters;
+import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
@@ -25,7 +26,6 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
-import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.schema.common.v1.OidsDto;
import lombok.val;
@@ -37,7 +37,7 @@ public class PersistentEntitiesAdapter extends XmlAdapter<OidsDto, List<Object>>
@Override
public List<Object> unmarshal(final OidsDto oidsDto) {
- List<Object> domainObjects = _Lists.newArrayList();
+ List<Object> domainObjects = new ArrayList<>();
for (val oidDto : oidsDto.getOid()) {
val bookmark = Bookmark.from(oidDto);
val domainObject = bookmarkService.lookup(bookmark);
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java b/core/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java
index 40fed23..46d4bb2 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.layout.component;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
@@ -29,7 +30,6 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.links.Link;
-import org.apache.isis.commons.internal.collections._Lists;
/**
* Describes the layout of a single collection, broadly corresponds to the {@link org.apache.isis.applib.annotation.CollectionLayout} annotation.
@@ -198,7 +198,7 @@ HasCssClass, HasDescribedAs, HasHidden, HasNamed {
- private List<ActionLayoutData> actions = _Lists.newArrayList();
+ private List<ActionLayoutData> actions = new ArrayList<>();
// no wrapper
@Override
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSet.java b/core/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSet.java
index 52a90f7..335d65a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSet.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSet.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.layout.component;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
@@ -29,7 +30,6 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.layout.grid.bootstrap3.BS3Col;
-import org.apache.isis.commons.internal.collections._Lists;
/**
* A {@link MemberRegion region} of the page containing a set of
@@ -135,7 +135,7 @@ Serializable {
- private List<ActionLayoutData> actions = _Lists.newArrayList();
+ private List<ActionLayoutData> actions = new ArrayList<>();
// no wrapper
@Override
@@ -151,7 +151,7 @@ Serializable {
- private List<PropertyLayoutData> properties = _Lists.newArrayList();
+ private List<PropertyLayoutData> properties = new ArrayList<>();
// no wrapper; required=false because may be auto-generated
@XmlElement(name = "property", required = false)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/component/PropertyLayoutData.java b/core/applib/src/main/java/org/apache/isis/applib/layout/component/PropertyLayoutData.java
index 6c66a32..817a6aa 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/component/PropertyLayoutData.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/component/PropertyLayoutData.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.layout.component;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
@@ -33,7 +34,6 @@ import org.apache.isis.applib.annotation.RenderDay;
import org.apache.isis.applib.annotation.Repainting;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.links.Link;
-import org.apache.isis.commons.internal.collections._Lists;
/**
* Describes the layout of a single property, broadly corresponds to the {@link org.apache.isis.applib.annotation.PropertyLayout} annotation.
@@ -234,7 +234,7 @@ HasCssClass, HasDescribedAs, HasHidden, HasNamed {
this.repainting = repainting;
}
- private List<ActionLayoutData> actions = _Lists.newArrayList();
+ private List<ActionLayoutData> actions = new ArrayList<>();
// no wrapper
@Override
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/GridAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/GridAbstract.java
index 7c6dfb7..5ebfa9d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/GridAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/GridAbstract.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.applib.layout.grid;
+import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -33,8 +34,6 @@ import org.apache.isis.applib.layout.component.FieldSetOwner;
import org.apache.isis.applib.layout.component.PropertyLayoutData;
import org.apache.isis.applib.layout.grid.bootstrap3.BS3Grid;
import org.apache.isis.applib.services.layout.LayoutService;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
/**
* All top-level page layout classes should implement this interface.
@@ -103,7 +102,7 @@ public abstract class GridAbstract implements Grid {
if(actionLayoutDatas == null) {
return;
}
- for (final ActionLayoutData actionLayoutData : _Lists.newArrayList(actionLayoutDatas)) {
+ for (final ActionLayoutData actionLayoutData : new ArrayList<>(actionLayoutDatas)) {
actionLayoutData.setOwner(actionLayoutDataOwner);
visitor.visit(actionLayoutData);
}
@@ -115,12 +114,12 @@ public abstract class GridAbstract implements Grid {
*/
protected void traverseFieldSets(final FieldSetOwner fieldSetOwner, final GridAbstract.Visitor visitor) {
final List<FieldSet> fieldSets = fieldSetOwner.getFieldSets();
- for (FieldSet fieldSet : _Lists.newArrayList(fieldSets)) {
+ for (FieldSet fieldSet : new ArrayList<>(fieldSets)) {
fieldSet.setOwner(fieldSetOwner);
visitor.visit(fieldSet);
traverseActions(fieldSet, visitor);
final List<PropertyLayoutData> properties = fieldSet.getProperties();
- for (final PropertyLayoutData property : _Lists.newArrayList(properties)) {
+ for (final PropertyLayoutData property : new ArrayList<>(properties)) {
property.setOwner(fieldSet);
visitor.visit(property);
traverseActions(property, visitor);
@@ -135,7 +134,7 @@ public abstract class GridAbstract implements Grid {
protected void traverseCollections(
final CollectionLayoutDataOwner owner, final GridAbstract.Visitor visitor) {
final List<CollectionLayoutData> collections = owner.getCollections();
- for (CollectionLayoutData collection : _Lists.newArrayList(collections)) {
+ for (CollectionLayoutData collection : new ArrayList<>(collections)) {
collection.setOwner(owner);
visitor.visit(collection);
traverseActions(collection, visitor);
@@ -147,7 +146,7 @@ public abstract class GridAbstract implements Grid {
@Programmatic
@XmlTransient
public LinkedHashMap<String, PropertyLayoutData> getAllPropertiesById() {
- final LinkedHashMap<String, PropertyLayoutData> propertiesById = _Maps.newLinkedHashMap();
+ final LinkedHashMap<String, PropertyLayoutData> propertiesById = new LinkedHashMap<>();
visit(new BS3Grid.VisitorAdapter() {
@Override
public void visit(final PropertyLayoutData propertyLayoutData) {
@@ -162,7 +161,7 @@ public abstract class GridAbstract implements Grid {
@Programmatic
@XmlTransient
public LinkedHashMap<String, CollectionLayoutData> getAllCollectionsById() {
- final LinkedHashMap<String, CollectionLayoutData> collectionsById = _Maps.newLinkedHashMap();
+ final LinkedHashMap<String, CollectionLayoutData> collectionsById = new LinkedHashMap<>();
visit(new BS3Grid.VisitorAdapter() {
@Override
@@ -178,7 +177,7 @@ public abstract class GridAbstract implements Grid {
@Programmatic
@XmlTransient
public LinkedHashMap<String, ActionLayoutData> getAllActionsById() {
- final LinkedHashMap<String, ActionLayoutData> actionsById = _Maps.newLinkedHashMap();
+ final LinkedHashMap<String, ActionLayoutData> actionsById = new LinkedHashMap<>();
visit(new BS3Grid.VisitorAdapter() {
@Override
@@ -193,7 +192,7 @@ public abstract class GridAbstract implements Grid {
@Programmatic
@XmlTransient
public LinkedHashMap<String, FieldSet> getAllFieldSetsByName() {
- final LinkedHashMap<String, FieldSet> fieldSetsByName = _Maps.newLinkedHashMap();
+ final LinkedHashMap<String, FieldSet> fieldSetsByName = new LinkedHashMap<>();
visit(new BS3Grid.VisitorAdapter() {
@Override
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Col.java b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Col.java
index 141549d..7f44432 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Col.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Col.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.applib.layout.grid.bootstrap3;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
@@ -34,7 +35,6 @@ import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
import org.apache.isis.applib.layout.component.DomainObjectLayoutDataOwner;
import org.apache.isis.applib.layout.component.FieldSet;
import org.apache.isis.applib.layout.component.FieldSetOwner;
-import org.apache.isis.commons.internal.collections._Lists;
/**
* A column within a row which, depending on its {@link #getSpan()}, could be as narrow as 1/12th of the page's width, all the way up to spanning the entire page.
@@ -158,7 +158,7 @@ CollectionLayoutDataOwner, DomainObjectLayoutDataOwner {
}
- private List<SizeSpan> sizeSpans = _Lists.newArrayList();
+ private List<SizeSpan> sizeSpans = new ArrayList<>();
// no wrapper
@XmlElement(name = "sizeSpan", required = false)
@@ -172,7 +172,7 @@ CollectionLayoutDataOwner, DomainObjectLayoutDataOwner {
- private List<ActionLayoutData> actions = _Lists.newArrayList();
+ private List<ActionLayoutData> actions = new ArrayList<>();
// no wrapper
@Override
@@ -188,7 +188,7 @@ CollectionLayoutDataOwner, DomainObjectLayoutDataOwner {
- private List<BS3Row> rows = _Lists.newArrayList();
+ private List<BS3Row> rows = new ArrayList<>();
// no wrapper
@Override
@@ -203,7 +203,7 @@ CollectionLayoutDataOwner, DomainObjectLayoutDataOwner {
- private List<BS3TabGroup> tabGroups = _Lists.newArrayList();
+ private List<BS3TabGroup> tabGroups = new ArrayList<>();
// no wrapper
@Override
@@ -218,7 +218,7 @@ CollectionLayoutDataOwner, DomainObjectLayoutDataOwner {
- private List<FieldSet> fieldSets = _Lists.newArrayList();
+ private List<FieldSet> fieldSets = new ArrayList<>();
// no wrapper
@Override
@@ -233,7 +233,7 @@ CollectionLayoutDataOwner, DomainObjectLayoutDataOwner {
- private List<CollectionLayoutData> collections = _Lists.newArrayList();
+ private List<CollectionLayoutData> collections = new ArrayList<>();
// no wrapper
@Override
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java
index 9db5cd2..f50e427 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.applib.layout.grid.bootstrap3;
+import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -36,8 +37,6 @@ import org.apache.isis.applib.layout.component.PropertyLayoutData;
import org.apache.isis.applib.layout.grid.Grid;
import org.apache.isis.applib.layout.grid.GridAbstract;
import org.apache.isis.applib.mixins.dto.Dto;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
/**
* This is the top-level for rendering the domain object's properties, collections and actions. It simply consists
@@ -79,7 +78,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
- private List<BS3Row> rows = _Lists.newArrayList();
+ private List<BS3Row> rows = new ArrayList<>();
// no wrapper
@Override
@@ -94,7 +93,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
- private List<String> metadataErrors = _Lists.newArrayList();
+ private List<String> metadataErrors = new ArrayList<>();
/**
* For diagnostics; populated by the framework if and only if a metadata error.
@@ -170,7 +169,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
protected void traverseRows(final BS3RowOwner rowOwner, final Grid.Visitor visitor) {
final BS3Grid.Visitor bs3Visitor = asBs3Visitor(visitor);
final List<BS3Row> rows = rowOwner.getRows();
- for (BS3Row bs3Row : _Lists.newArrayList(rows)) {
+ for (BS3Row bs3Row : new ArrayList<>(rows)) {
bs3Row.setOwner(this);
bs3Visitor.preVisit(bs3Row);
bs3Visitor.visit(bs3Row);
@@ -182,7 +181,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
private void traverseCols(final Grid.Visitor visitor, final BS3Row bs3Row) {
final BS3Grid.Visitor bs3Visitor = asBs3Visitor(visitor);
final List<BS3RowContent> cols = bs3Row.getCols();
- for (BS3RowContent rowContent : _Lists.newArrayList(cols)) {
+ for (BS3RowContent rowContent : new ArrayList<>(cols)) {
rowContent.setOwner(bs3Row);
if(rowContent instanceof BS3Col) {
final BS3Col bs3Col = (BS3Col) rowContent;
@@ -219,7 +218,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
final Grid.Visitor visitor) {
final BS3Grid.Visitor bs3Visitor = asBs3Visitor(visitor);
final List<BS3TabGroup> tabGroups = bs3TabGroupOwner.getTabGroups();
- for (BS3TabGroup bs3TabGroup : _Lists.newArrayList(tabGroups)) {
+ for (BS3TabGroup bs3TabGroup : new ArrayList<>(tabGroups)) {
bs3TabGroup.setOwner(bs3TabGroupOwner);
bs3Visitor.preVisit(bs3TabGroup);
bs3Visitor.visit(bs3TabGroup);
@@ -233,7 +232,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
final Grid.Visitor visitor) {
final BS3Grid.Visitor bs3Visitor = asBs3Visitor(visitor);
final List<BS3Tab> tabs = bs3TabOwner.getTabs();
- for (BS3Tab tab : _Lists.newArrayList(tabs)) {
+ for (BS3Tab tab : new ArrayList<>(tabs)) {
tab.setOwner(bs3TabOwner);
bs3Visitor.preVisit(tab);
bs3Visitor.visit(tab);
@@ -270,7 +269,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
@Programmatic
@XmlTransient
public LinkedHashMap<String, BS3Tab> getAllTabsByName() {
- final LinkedHashMap<String, BS3Tab> tabsByName = _Maps.newLinkedHashMap();
+ final LinkedHashMap<String, BS3Tab> tabsByName = new LinkedHashMap<>();
visit(new BS3Grid.VisitorAdapter() {
@Override
@@ -285,7 +284,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
@Programmatic
@XmlTransient
public LinkedHashMap<String, HasCssId> getAllCssId() {
- final LinkedHashMap<String, HasCssId> divsByCssId = _Maps.newLinkedHashMap();
+ final LinkedHashMap<String, HasCssId> divsByCssId = new LinkedHashMap<>();
visit(new BS3Grid.VisitorAdapter() {
@Override
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Row.java b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Row.java
index 77b5f70..9fc2d77 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Row.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Row.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.applib.layout.grid.bootstrap3;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
@@ -28,7 +29,6 @@ import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.collections._Lists;
/**
* Contains a row of content, either on the top-level {@link BS3Grid page} or at any other lower-level element that can
@@ -67,7 +67,7 @@ public class BS3Row extends BS3ElementAbstract implements HasCssId, BS3RowConten
- private List<BS3RowContent> cols = _Lists.newArrayList();
+ private List<BS3RowContent> cols = new ArrayList<>();
// no wrapper
@XmlElementRefs({
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Tab.java b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Tab.java
index ec54b10..772e6d4 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Tab.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Tab.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.applib.layout.grid.bootstrap3;
+import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Predicate;
@@ -32,7 +33,6 @@ import org.apache.isis.applib.layout.component.ActionLayoutData;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
import org.apache.isis.applib.layout.component.PropertyLayoutData;
-import org.apache.isis.commons.internal.collections._Lists;
/**
* Represents a tab within a {@link BS3TabGroup tab group}.
@@ -63,7 +63,7 @@ public class BS3Tab extends BS3ElementAbstract implements BS3RowOwner {
}
- private List<BS3Row> rows = _Lists.newArrayList();
+ private List<BS3Row> rows = new ArrayList<>();
// no wrapper
@Override
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroup.java b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroup.java
index 9ff4a2c..02471b6 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroup.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroup.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.applib.layout.grid.bootstrap3;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
@@ -26,7 +27,6 @@ import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.collections._Lists;
/**
* Represents a tab group containing one or more {@link BS3Tab tab}s.
@@ -79,7 +79,7 @@ public class BS3TabGroup extends BS3ElementAbstract implements BS3TabOwner {
- private List<BS3Tab> tabs = _Lists.newArrayList();
+ private List<BS3Tab> tabs = new ArrayList<>();
// no wrapper; required=false because may be auto-generated
@Override
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java
index a99eb21..aa38830 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
-import org.apache.isis.commons.internal.collections._Maps;
+
import lombok.val;
@@ -55,7 +55,7 @@ public abstract class MenuBarsAbstract implements MenuBars, Serializable {
public LinkedHashMap<String, ServiceActionLayoutData> getAllServiceActionsByObjectTypeAndId() {
val serviceActionsByObjectTypeAndId =
- _Maps.<String, ServiceActionLayoutData>newLinkedHashMap();
+ new LinkedHashMap<String, ServiceActionLayoutData>();
visit(serviceActionLayoutData -> {
serviceActionsByObjectTypeAndId
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3Menu.java b/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3Menu.java
index f35be92..a7ccaf0 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3Menu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3Menu.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.layout.menubars.bootstrap3;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAttribute;
@@ -27,7 +28,6 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.layout.menubars.Menu;
-import org.apache.isis.commons.internal.collections._Lists;
import lombok.ToString;
@@ -82,7 +82,7 @@ public class BS3Menu implements Menu, Serializable {
- private List<BS3MenuSection> sections = _Lists.newArrayList();
+ private List<BS3MenuSection> sections = new ArrayList<>();
// no wrapper
@XmlElement(name = "section", required = true)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBar.java b/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBar.java
index c46e29f..cb65485 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBar.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBar.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.layout.menubars.bootstrap3;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
@@ -26,7 +27,7 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.layout.menubars.MenuBar;
-import org.apache.isis.commons.internal.collections._Lists;
+
/**
* Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information of {@link org.apache.isis.applib.annotation.DomainServiceLayout} that have the same value of {@link DomainServiceLayout#named()}.
@@ -45,7 +46,7 @@ public class BS3MenuBar implements MenuBar, Serializable {
}
- private List<BS3Menu> menus = _Lists.newArrayList();
+ private List<BS3Menu> menus = new ArrayList<>();
// no wrapper
@XmlElement(name = "menu", required = true)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuSection.java b/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuSection.java
index 451805d..79716b6 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuSection.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuSection.java
@@ -19,6 +19,7 @@
package org.apache.isis.applib.layout.menubars.bootstrap3;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
@@ -27,7 +28,7 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
import org.apache.isis.applib.layout.component.ServiceActionLayoutDataOwner;
import org.apache.isis.applib.layout.menubars.MenuSection;
-import org.apache.isis.commons.internal.collections._Lists;
+
/**
* Corresponds to a domain service that contributes its serviceActions under a particular {@link BS3MenuBar}.
@@ -46,7 +47,7 @@ public class BS3MenuSection implements MenuSection, Serializable, ServiceActionL
}
- private List<ServiceActionLayoutData> serviceActions = _Lists.newArrayList();
+ private List<ServiceActionLayoutData> serviceActions = new ArrayList<>();
// no wrapper
@Override
diff --git a/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java
index f297601..e724daf 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java
@@ -33,8 +33,8 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.mixins.MixinConstants;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.message.MessageService;
+import org.apache.isis.applib.util.ZipWriter;
import org.apache.isis.applib.value.BlobClobFactory;
-import org.apache.isis.commons.compression.ZipWriter;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/compression/ZipWriter.java b/core/applib/src/main/java/org/apache/isis/applib/util/ZipWriter.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/commons/compression/ZipWriter.java
rename to core/applib/src/main/java/org/apache/isis/applib/util/ZipWriter.java
index 595af5a..d60adc5 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/compression/ZipWriter.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/util/ZipWriter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.commons.compression;
+package org.apache.isis.applib.util;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/subdomains/excel/impl/pom.xml b/subdomains/excel/applib/pom.xml
similarity index 85%
rename from subdomains/excel/impl/pom.xml
rename to subdomains/excel/applib/pom.xml
index f1829d9..20f0268 100644
--- a/subdomains/excel/impl/pom.xml
+++ b/subdomains/excel/applib/pom.xml
@@ -14,23 +14,16 @@
<parent>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains</artifactId>
+ <artifactId>isis-subdomains-excel</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-subdomains-excel-dom</artifactId>
- <name>Apache Isis Sub - Excel</name>
-
- <description>
- A domain service for Apache Isis', allowing collections
- of (view model) objects to be exported/imported to/from an
- Excel spreadsheet. Also support for excel-based fixtures.
- </description>
+ <artifactId>isis-subdomains-excel-applib</artifactId>
+ <name>Apache Isis Sub - Excel (applib)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.excel.dom</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/excel/dom</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.subdomains.excel.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/subdomains/excel/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/IsisModuleExtExcel.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/IsisModuleSubExcelApplib.java
similarity index 63%
copy from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/IsisModuleExtExcel.java
copy to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/IsisModuleSubExcelApplib.java
index c3c2c09..43bf630 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/IsisModuleExtExcel.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/IsisModuleSubExcelApplib.java
@@ -1,9 +1,9 @@
-package org.apache.isis.extensions.excel;
+package org.apache.isis.subdomains.excel.applib;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleExtExcel {
+public class IsisModuleSubExcelApplib {
}
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/AggregationType.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/AggregationType.java
similarity index 50%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/AggregationType.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/AggregationType.java
index c8384b3..9921c3c 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/AggregationType.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/AggregationType.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom;
+package org.apache.isis.subdomains.excel.applib.dom;
public enum AggregationType {
SUM,
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelMetaDataEnabled.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelMetaDataEnabled.java
similarity index 74%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelMetaDataEnabled.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelMetaDataEnabled.java
index 03cc123..c80e3a4 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelMetaDataEnabled.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelMetaDataEnabled.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom;
+package org.apache.isis.subdomains.excel.applib.dom;
public interface ExcelMetaDataEnabled {
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelService.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java
similarity index 97%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelService.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java
index 774486f..8d05318 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelService.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom;
+package org.apache.isis.subdomains.excel.applib.dom;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -22,8 +22,8 @@ import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.extensions.excel.dom.util.ExcelServiceImpl;
-import org.apache.isis.extensions.excel.dom.util.Mode;
+import org.apache.isis.subdomains.excel.applib.dom.util.ExcelServiceImpl;
+import org.apache.isis.subdomains.excel.applib.dom.util.Mode;
import lombok.extern.log4j.Log4j2;
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/HyperLink.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/HyperLink.java
similarity index 74%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/HyperLink.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/HyperLink.java
index b964d65..52fc543 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/HyperLink.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/HyperLink.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom;
+package org.apache.isis.subdomains.excel.applib.dom;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotColumn.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotColumn.java
similarity index 76%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotColumn.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotColumn.java
index dcf5d27..80da3e7 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotColumn.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotColumn.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom;
+package org.apache.isis.subdomains.excel.applib.dom;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotDecoration.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotDecoration.java
similarity index 76%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotDecoration.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotDecoration.java
index b4e5207..cdf97f6 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotDecoration.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotDecoration.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom;
+package org.apache.isis.subdomains.excel.applib.dom;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotRow.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotRow.java
similarity index 74%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotRow.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotRow.java
index f097fae..5a67e5d 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotRow.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotRow.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom;
+package org.apache.isis.subdomains.excel.applib.dom;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotValue.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotValue.java
similarity index 81%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotValue.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotValue.java
index d6aec5c..82ae0e4 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/PivotValue.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/PivotValue.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom;
+package org.apache.isis.subdomains.excel.applib.dom;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/RowHandler.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/RowHandler.java
similarity index 64%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/RowHandler.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/RowHandler.java
index ef245d6..46fe479 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/RowHandler.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/RowHandler.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom;
+package org.apache.isis.subdomains.excel.applib.dom;
public interface RowHandler<T extends RowHandler<T>> {
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetContent.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/WorksheetContent.java
similarity index 89%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetContent.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/WorksheetContent.java
index caaf163..b9701a9 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetContent.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/WorksheetContent.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom;
+package org.apache.isis.subdomains.excel.applib.dom;
import java.util.List;
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetSpec.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/WorksheetSpec.java
similarity index 96%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetSpec.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/WorksheetSpec.java
index d8a02d7..aba72ec 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/WorksheetSpec.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/WorksheetSpec.java
@@ -1,11 +1,11 @@
-package org.apache.isis.extensions.excel.dom;
+package org.apache.isis.subdomains.excel.applib.dom;
import java.util.List;
import javax.inject.Inject;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.extensions.excel.dom.util.Mode;
+import org.apache.isis.subdomains.excel.applib.dom.util.Mode;
import lombok.Setter;
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/AnnotationList.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/AnnotationList.java
similarity index 91%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/AnnotationList.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/AnnotationList.java
index 7390264..7129633 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/AnnotationList.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/AnnotationList.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom.util;
+package org.apache.isis.subdomains.excel.applib.dom.util;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/AnnotationTriplet.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/AnnotationTriplet.java
similarity index 92%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/AnnotationTriplet.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/AnnotationTriplet.java
index ce27174..651cbcb 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/AnnotationTriplet.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/AnnotationTriplet.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom.util;
+package org.apache.isis.subdomains.excel.applib.dom.util;
public class AnnotationTriplet implements Comparable<AnnotationTriplet>{
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/CellMarshaller.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/CellMarshaller.java
similarity index 99%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/CellMarshaller.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/CellMarshaller.java
index 75963ae..5726795 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/CellMarshaller.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/CellMarshaller.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom.util;
+package org.apache.isis.subdomains.excel.applib.dom.util;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelConverter.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelConverter.java
similarity index 96%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelConverter.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelConverter.java
index d0228e4..a8a2112 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelConverter.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelConverter.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom.util;
+package org.apache.isis.subdomains.excel.applib.dom.util;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -39,17 +39,17 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.util.ObjectContracts;
-import org.apache.isis.extensions.excel.dom.AggregationType;
-import org.apache.isis.extensions.excel.dom.ExcelMetaDataEnabled;
-import org.apache.isis.extensions.excel.dom.ExcelService;
-import org.apache.isis.extensions.excel.dom.HyperLink;
-import org.apache.isis.extensions.excel.dom.PivotColumn;
-import org.apache.isis.extensions.excel.dom.PivotDecoration;
-import org.apache.isis.extensions.excel.dom.PivotRow;
-import org.apache.isis.extensions.excel.dom.PivotValue;
-import org.apache.isis.extensions.excel.dom.RowHandler;
-import org.apache.isis.extensions.excel.dom.WorksheetContent;
-import org.apache.isis.extensions.excel.dom.WorksheetSpec;
+import org.apache.isis.subdomains.excel.applib.dom.AggregationType;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelMetaDataEnabled;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
+import org.apache.isis.subdomains.excel.applib.dom.HyperLink;
+import org.apache.isis.subdomains.excel.applib.dom.PivotColumn;
+import org.apache.isis.subdomains.excel.applib.dom.PivotDecoration;
+import org.apache.isis.subdomains.excel.applib.dom.PivotRow;
+import org.apache.isis.subdomains.excel.applib.dom.PivotValue;
+import org.apache.isis.subdomains.excel.applib.dom.RowHandler;
+import org.apache.isis.subdomains.excel.applib.dom.WorksheetContent;
+import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
import org.apache.isis.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.spec.ManagedObject;
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelFileBlobConverter.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelFileBlobConverter.java
similarity index 92%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelFileBlobConverter.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelFileBlobConverter.java
index ef3de72..035d64b 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelFileBlobConverter.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelFileBlobConverter.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom.util;
+package org.apache.isis.subdomains.excel.applib.dom.util;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -11,7 +11,7 @@ import com.google.common.io.Resources;
import org.apache.poi.util.IOUtils;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.dom.ExcelService;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
public class ExcelFileBlobConverter {
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelServiceImpl.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelServiceImpl.java
similarity index 95%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelServiceImpl.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelServiceImpl.java
index ec177f4..3bfa3e5 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/ExcelServiceImpl.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelServiceImpl.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom.util;
+package org.apache.isis.subdomains.excel.applib.dom.util;
import java.io.File;
import java.io.IOException;
@@ -14,12 +14,12 @@ import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.extensions.excel.dom.ExcelService;
-import org.apache.isis.extensions.excel.dom.PivotColumn;
-import org.apache.isis.extensions.excel.dom.PivotRow;
-import org.apache.isis.extensions.excel.dom.PivotValue;
-import org.apache.isis.extensions.excel.dom.WorksheetContent;
-import org.apache.isis.extensions.excel.dom.WorksheetSpec;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
+import org.apache.isis.subdomains.excel.applib.dom.PivotColumn;
+import org.apache.isis.subdomains.excel.applib.dom.PivotRow;
+import org.apache.isis.subdomains.excel.applib.dom.PivotValue;
+import org.apache.isis.subdomains.excel.applib.dom.WorksheetContent;
+import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
import org.apache.isis.metamodel.objectmanager.ObjectManager;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.context.session.RuntimeContextBase;
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/Mode.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/Mode.java
similarity index 79%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/Mode.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/Mode.java
index a136a89..d519e7e 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/Mode.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/Mode.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom.util;
+package org.apache.isis.subdomains.excel.applib.dom.util;
/**
* Created by jodo on 31/03/17.
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/PivotUtils.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/PivotUtils.java
similarity index 97%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/PivotUtils.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/PivotUtils.java
index 31ea218..b13017c 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/PivotUtils.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/PivotUtils.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom.util;
+package org.apache.isis.subdomains.excel.applib.dom.util;
import java.util.List;
@@ -6,7 +6,7 @@ import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.Row;
-import org.apache.isis.extensions.excel.dom.AggregationType;
+import org.apache.isis.subdomains.excel.applib.dom.AggregationType;
public class PivotUtils {
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/SheetPivoter.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/SheetPivoter.java
similarity index 99%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/SheetPivoter.java
rename to subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/SheetPivoter.java
index 75afc60..c0b9823 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/util/SheetPivoter.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/SheetPivoter.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom.util;
+package org.apache.isis.subdomains.excel.applib.dom.util;
import java.util.ArrayList;
import java.util.Arrays;
@@ -16,8 +16,8 @@ import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.util.CellReference;
-import org.apache.isis.extensions.excel.dom.AggregationType;
-import org.apache.isis.extensions.excel.dom.ExcelService;
+import org.apache.isis.subdomains.excel.applib.dom.AggregationType;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
public class SheetPivoter {
diff --git a/subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationListTest.java b/subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/dom/util/AnnotationListTest.java
similarity index 94%
rename from subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationListTest.java
rename to subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/dom/util/AnnotationListTest.java
index 674f5ca..1380664 100644
--- a/subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationListTest.java
+++ b/subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/dom/util/AnnotationListTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom.util;
+package org.apache.isis.subdomains.excel.applib.dom.util;
import java.util.Arrays;
import java.util.List;
diff --git a/subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationTripletTest.java b/subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/dom/util/AnnotationTripletTest.java
similarity index 96%
rename from subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationTripletTest.java
rename to subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/dom/util/AnnotationTripletTest.java
index 432492f..4838f29 100644
--- a/subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/AnnotationTripletTest.java
+++ b/subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/dom/util/AnnotationTripletTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom.util;
+package org.apache.isis.subdomains.excel.applib.dom.util;
import java.util.Arrays;
import java.util.Collections;
diff --git a/subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/PivotUtilsTest.java b/subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/dom/util/PivotUtilsTest.java
similarity index 99%
rename from subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/PivotUtilsTest.java
rename to subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/dom/util/PivotUtilsTest.java
index 0857532..2d90767 100644
--- a/subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/PivotUtilsTest.java
+++ b/subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/dom/util/PivotUtilsTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom.util;
+package org.apache.isis.subdomains.excel.applib.dom.util;
import java.util.Arrays;
import java.util.List;
diff --git a/subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/SheetPivoterTest.java b/subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/dom/util/SheetPivoterTest.java
similarity index 99%
rename from subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/SheetPivoterTest.java
rename to subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/dom/util/SheetPivoterTest.java
index e8db5c3..6b66420 100644
--- a/subdomains/excel/impl/src/test/java/org/apache/isis/extensions/excel/dom/util/SheetPivoterTest.java
+++ b/subdomains/excel/applib/src/test/java/org/apache/isis/subdomains/excel/applib/dom/util/SheetPivoterTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom.util;
+package org.apache.isis.subdomains.excel.applib.dom.util;
import java.util.Arrays;
import java.util.List;
diff --git a/subdomains/excel/fixture/pom.xml b/subdomains/excel/fixture/pom.xml
index b4b52d0..1d7d9dd 100644
--- a/subdomains/excel/fixture/pom.xml
+++ b/subdomains/excel/fixture/pom.xml
@@ -13,8 +13,8 @@
<name>Apache Isis Sub - Excel (Fixtures)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.subdomains.excel.fixtures</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/subdomains/excel/fixtures</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.subdomains.excel.fixture</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/subdomains/excel/fixture</git-plugin.propertiesDir>
</properties>
<build>
@@ -56,7 +56,12 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-excel-dom</artifactId>
+ <artifactId>isis-subdomains-excel-applib</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-excel-testing</artifactId>
</dependency>
<dependency>
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/ExcelFixturesModule.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubExcelFixtures.java
similarity index 79%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/ExcelFixturesModule.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubExcelFixtures.java
index 94171dc..787512a 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/ExcelFixturesModule.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubExcelFixtures.java
@@ -1,11 +1,11 @@
-package org.apache.isis.extensions.excel.fixtures;
+package org.apache.isis.subdomains.excel.fixtures;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.extensions.excel.ExcelModule;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import org.apache.isis.extensions.fixtures.modules.Module;
@@ -16,7 +16,7 @@ import org.apache.isis.extensions.fixtures.modules.Module;
IsisExtFixturesModule.class
})
@ComponentScan
-public class ExcelFixturesModule implements Module {
+public class IsisModuleSubExcelFixtures implements Module {
@Override public FixtureScript getTeardownFixture() {
return new ExcelDemoToDoItem_tearDown();
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
similarity index 82%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
index d49b876..9239582 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.contributions;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.contributions;
import javax.inject.Inject;
@@ -7,9 +7,9 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.Contributed;
import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.dom.ExcelService;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
@Mixin(method = "act")
public class ExcelDemoToDoItem_export {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
similarity index 89%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
index 3d1b595..99d1452 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.contributions;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.contributions;
import javax.inject.Inject;
@@ -8,8 +8,8 @@ import org.apache.isis.applib.annotation.Contributed;
import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.extensions.excel.dom.ExcelService;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
@Mixin(method = "act")
public class ExcelDemoToDoItem_export2 {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
similarity index 93%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
index 7379edc..b93efed 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -9,10 +9,10 @@ import javax.jdo.annotations.Column;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.user.UserService;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
import lombok.Getter;
import lombok.NoArgsConstructor;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml
similarity index 100%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
similarity index 94%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
index 0fb191c..b562f7d 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate;
import java.util.List;
import java.util.stream.Collectors;
@@ -25,11 +25,11 @@ import org.apache.isis.applib.value.Blob;
import org.apache.isis.extensions.excel.dom.ExcelService;
import org.apache.isis.extensions.excel.dom.WorksheetContent;
import org.apache.isis.extensions.excel.dom.WorksheetSpec;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
-import static org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem.Predicates.*;
+import static org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem.Predicates.*;
import lombok.Getter;
import lombok.Setter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml
similarity index 100%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
similarity index 87%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
index 06b81cd..ec358cf 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate;
import javax.inject.Inject;
@@ -7,8 +7,8 @@ import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.extensions.excel.dom.ExcelService;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
@DomainService(
nature = NatureOfService.VIEW,
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
similarity index 85%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
index ebb8b24..0cdf79a 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.pivot;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.pivot;
import java.math.BigDecimal;
@@ -8,8 +8,8 @@ import org.apache.isis.extensions.excel.dom.AggregationType;
import org.apache.isis.extensions.excel.dom.PivotColumn;
import org.apache.isis.extensions.excel.dom.PivotRow;
import org.apache.isis.extensions.excel.dom.PivotValue;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
import lombok.Getter;
import lombok.Setter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
similarity index 92%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
index 50d7844..3b3c022 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.pivot;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.pivot;
import java.util.ArrayList;
import java.util.List;
@@ -8,7 +8,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.extensions.excel.dom.ExcelService;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
@DomainService(
nature = NatureOfService.VIEW,
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
similarity index 89%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
index 7f99ac7..c31d0ce 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -11,10 +11,10 @@ import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.extensions.excel.dom.ExcelFixture;
import org.apache.isis.extensions.excel.dom.ExcelFixtureRowHandler;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import lombok.Getter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
similarity index 89%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
index 88bf050..70b8029 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
@@ -1,12 +1,12 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem;
import java.math.BigDecimal;
import org.apache.isis.extensions.excel.dom.ExcelFixture2;
import org.apache.isis.extensions.excel.dom.ExcelMetaDataEnabled;
import org.apache.isis.extensions.excel.dom.FixtureAwareRowHandler;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import lombok.Getter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
similarity index 87%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
index 200a2af..6350780 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.excelupload;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.excelupload;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -16,10 +16,10 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.extensions.excel.dom.ExcelFixture;
import org.apache.isis.extensions.excel.dom.ExcelFixtureRowHandler;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import lombok.Getter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
similarity index 92%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
index 71613b5..25bddb6 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.excelupload;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.excelupload;
import java.util.List;
@@ -6,7 +6,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.extensions.excel.dom.ExcelFixture;
-import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureResult;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
similarity index 91%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
index f1a67e7..4bddf70 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturescripts;
import com.google.common.io.Resources;
@@ -6,7 +6,7 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.extensions.excel.dom.ExcelFixture2;
import org.apache.isis.extensions.excel.dom.WorksheetSpec;
import org.apache.isis.extensions.excel.dom.util.Mode;
-import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler2;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler2;
import lombok.Getter;
import lombok.Setter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
similarity index 91%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
index dc22446..6f358d0 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturescripts;
import java.net.URL;
import java.util.List;
@@ -11,8 +11,8 @@ import com.google.common.io.Resources;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.extensions.excel.dom.ExcelFixture;
-import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import lombok.Getter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
similarity index 89%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
index fba1b7b..9b750b6 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
@@ -1,11 +1,11 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturescripts;
import javax.inject.Inject;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown2;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown2;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
public class DemoToDoItem_recreate_usingExcelFixture extends FixtureScript {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx
similarity index 100%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/ToDoItems.xlsx b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/ToDoItems.xlsx
similarity index 100%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/ToDoItems.xlsx
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/ToDoItems.xlsx
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Category.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/Category.java
similarity index 92%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Category.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/Category.java
index 3b5311a..d102cdf 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Category.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/Category.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom;
import java.util.Arrays;
import java.util.List;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java
similarity index 92%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java
index 562f460..462c613 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom;
import java.util.Comparator;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-done.png b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-done.png
similarity index 100%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-done.png
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-done.png
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png
similarity index 100%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
similarity index 99%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
index 1982133..494d6f6 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom;
import java.math.BigDecimal;
import java.time.LocalDate;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml
similarity index 100%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.png b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.png
similarity index 100%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.png
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.png
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
similarity index 99%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
index 75825ec..957f4f2 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom;
import java.math.BigDecimal;
import java.time.LocalDate;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Subcategory.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/Subcategory.java
similarity index 93%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Subcategory.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/Subcategory.java
index 71f18e9..fb4d6aa 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Subcategory.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/Subcategory.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom;
import java.util.Collections;
import java.util.List;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
similarity index 92%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
index 07dd513..695747b 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
@@ -1,14 +1,14 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts;
import java.math.BigDecimal;
import java.time.LocalDate;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
public class ExcelDemoToDoItem_recreate5_for extends FixtureScript {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java
similarity index 75%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java
index 70aa1f0..9a56036 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts;
public class ExcelDemoToDoItem_recreate5_forSven extends ExcelDemoToDoItem_recreate5_for {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
similarity index 73%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
index 055dc9e..ec44dfc 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
@@ -1,6 +1,6 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.extensions.fixtures.legacy.teardown.TeardownFixtureAbstract2;
public class ExcelDemoToDoItem_tearDown extends TeardownFixtureAbstract2 {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
similarity index 95%
rename from subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
rename to subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
index c46dfc0..2d4e51a 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts;
+package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts;
import javax.inject.Inject;
diff --git a/subdomains/excel/integtests/pom.xml b/subdomains/excel/integtests/pom.xml
index 1e896f0..689ac6c 100644
--- a/subdomains/excel/integtests/pom.xml
+++ b/subdomains/excel/integtests/pom.xml
@@ -14,6 +14,10 @@
<name>Apache Isis Sub - Excel (Integ Tests)</name>
<properties>
+
+ <!-- TODO: reinstate -->
+ <skipTests>true</skipTests>
+
<jar-plugin.automaticModuleName>org.apache.isis.subdomains.excel.integtests</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/subdomains/excel/integtests</git-plugin.propertiesDir>
@@ -114,6 +118,12 @@
-->
<dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-persistence-jdo-datanucleus5</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
similarity index 90%
rename from subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
rename to subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
index 2789e10..e315b14 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
+++ b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.integtests;
+package org.apache.isis.subdomains.excel.integtests;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
@@ -9,7 +9,7 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.config.IsisPresets;
-import org.apache.isis.extensions.excel.fixtures.ExcelFixturesModule;
+import org.apache.isis.subdomains.excel.fixtures.IsisModuleSubExcelFixtures;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
import org.apache.isis.extensions.fixtures.IsisIntegrationTestAbstractWithFixtures;
import org.apache.isis.jdo.IsisBootDataNucleus;
@@ -40,7 +40,7 @@ public abstract class ExcelModuleIntegTestAbstract extends IsisIntegrationTestAb
new ExcelFixturesModule(),
FakeDataModule.class
*/
- ExcelFixturesModule.class
+ IsisModuleSubExcelFixtures.class
})
public static class AppManifest {
}
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
similarity index 89%
rename from subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
rename to subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
index a4b1cce..dbff01b 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
+++ b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.integtests.tests;
+package org.apache.isis.subdomains.excel.integtests.tests;
import java.util.ArrayList;
import java.util.List;
@@ -10,9 +10,9 @@ import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
-import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler2;
-import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoFixture_extending_ExcelFixture2;
-import org.apache.isis.extensions.excel.integtests.ExcelModuleIntegTestAbstract;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler2;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturescripts.DemoFixture_extending_ExcelFixture2;
+import org.apache.isis.subdomains.excel.integtests.ExcelModuleIntegTestAbstract;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureResult;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
similarity index 89%
rename from subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
rename to subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
index 122f0a4..1865a0a 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
+++ b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.integtests.tests;
+package org.apache.isis.subdomains.excel.integtests.tests;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -19,12 +19,12 @@ import org.junit.jupiter.api.Test;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.extensions.excel.dom.ExcelService;
-import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem;
-import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem;
-import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateMenuForDemoToDoItem;
-import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoToDoItem_recreate_usingExcelFixture;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
-import org.apache.isis.extensions.excel.integtests.ExcelModuleIntegTestAbstract;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateMenuForDemoToDoItem;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturescripts.DemoToDoItem_recreate_usingExcelFixture;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
+import org.apache.isis.subdomains.excel.integtests.ExcelModuleIntegTestAbstract;
public class ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest extends ExcelModuleIntegTestAbstract {
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
similarity index 78%
rename from subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
rename to subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
index 305410e..30bd8cf 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
+++ b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.integtests.tests;
+package org.apache.isis.subdomains.excel.integtests.tests;
import java.net.URL;
import java.util.List;
@@ -13,11 +13,11 @@ import org.junit.jupiter.api.Test;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.extensions.excel.dom.util.ExcelFileBlobConverter;
-import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.excelupload.ExcelUploadServiceForDemoToDoItem;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
-import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
-import org.apache.isis.extensions.excel.integtests.ExcelModuleIntegTestAbstract;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.excelupload.ExcelUploadServiceForDemoToDoItem;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
+import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
+import org.apache.isis.subdomains.excel.integtests.ExcelModuleIntegTestAbstract;
public class ExcelModuleDemoUploadService_IntegTest extends ExcelModuleIntegTestAbstract {
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ToDoItemsWithMultipleSheets.xlsx b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ToDoItemsWithMultipleSheets.xlsx
similarity index 100%
rename from subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ToDoItemsWithMultipleSheets.xlsx
rename to subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ToDoItemsWithMultipleSheets.xlsx
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-expected.xlsx b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/toDoItems-expected.xlsx
similarity index 100%
rename from subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-expected.xlsx
rename to subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/toDoItems-expected.xlsx
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-updated.xlsx b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/toDoItems-updated.xlsx
similarity index 100%
rename from subdomains/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-updated.xlsx
rename to subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/toDoItems-updated.xlsx
diff --git a/subdomains/excel/pom.xml b/subdomains/excel/pom.xml
new file mode 100644
index 0000000..78ab857
--- /dev/null
+++ b/subdomains/excel/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>isis-subdomains-excel</artifactId>
+ <name>Apache Isis Sub - Excel (parent)</name>
+
+ <description>
+ A domain service for Apache Isis', allowing collections
+ of (view model) objects to be exported/imported to/from an
+ Excel spreadsheet. Also support for excel-based fixtures.
+ </description>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>applib</module>
+ <module>fixture</module>
+ <module>integtests</module>
+ <module>testing</module>
+ </modules>
+
+</project>
diff --git a/subdomains/excel/impl/src/main/doc/antora.yml b/subdomains/excel/src/main/doc/antora.yml
similarity index 100%
rename from subdomains/excel/impl/src/main/doc/antora.yml
rename to subdomains/excel/src/main/doc/antora.yml
diff --git a/subdomains/excel/impl/src/main/doc/modules/excel/nav.adoc b/subdomains/excel/src/main/doc/modules/excel/nav.adoc
similarity index 100%
rename from subdomains/excel/impl/src/main/doc/modules/excel/nav.adoc
rename to subdomains/excel/src/main/doc/modules/excel/nav.adoc
diff --git a/subdomains/excel/impl/src/main/doc/modules/excel/pages/about.adoc b/subdomains/excel/src/main/doc/modules/excel/pages/about.adoc
similarity index 100%
rename from subdomains/excel/impl/src/main/doc/modules/excel/pages/about.adoc
rename to subdomains/excel/src/main/doc/modules/excel/pages/about.adoc
diff --git a/subdomains/excel/impl/src/main/doc/modules/excel/partials/module-nav.adoc b/subdomains/excel/src/main/doc/modules/excel/partials/module-nav.adoc
similarity index 100%
rename from subdomains/excel/impl/src/main/doc/modules/excel/partials/module-nav.adoc
rename to subdomains/excel/src/main/doc/modules/excel/partials/module-nav.adoc
diff --git a/subdomains/excel/testing/pom.xml b/subdomains/excel/testing/pom.xml
new file mode 100644
index 0000000..75890bd
--- /dev/null
+++ b/subdomains/excel/testing/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-excel</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>isis-subdomains-excel-testing</artifactId>
+ <name>Apache Isis Sub - Excel (testing support)</name>
+
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.subdomains.excel.testing</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/subdomains/excel/testing</git-plugin.propertiesDir>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-excel-applib</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture.java b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture.java
similarity index 97%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture.java
rename to subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture.java
index ca9fed7..d8835d3 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture.java
+++ b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom;
+package org.apache.isis.subdomains.excel.testing;
import java.io.IOException;
import java.net.URL;
@@ -20,7 +20,8 @@ import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.dom.util.ExcelServiceImpl;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
+import org.apache.isis.subdomains.excel.applib.dom.util.ExcelServiceImpl;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureResultList;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture2.java b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture2.java
similarity index 96%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture2.java
rename to subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture2.java
index 40ba09d..07d77ff 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixture2.java
+++ b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture2.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom;
+package org.apache.isis.subdomains.excel.testing;
import java.io.IOException;
import java.net.URL;
@@ -18,6 +18,8 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
+import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
import lombok.Getter;
import lombok.Setter;
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixtureRowHandler.java b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureRowHandler.java
similarity index 86%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixtureRowHandler.java
rename to subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureRowHandler.java
index 328c428..43376c3 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixtureRowHandler.java
+++ b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureRowHandler.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom;
+package org.apache.isis.subdomains.excel.testing;
import java.util.List;
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixtureWorkbookHandler.java b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureWorkbookHandler.java
similarity index 86%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixtureWorkbookHandler.java
rename to subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureWorkbookHandler.java
index ec910d9..f656613 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/ExcelFixtureWorkbookHandler.java
+++ b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureWorkbookHandler.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.excel.dom;
+package org.apache.isis.subdomains.excel.testing;
import java.util.List;
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/FixtureAwareRowHandler.java b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/FixtureAwareRowHandler.java
similarity index 72%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/FixtureAwareRowHandler.java
rename to subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/FixtureAwareRowHandler.java
index 3454a52..ce212ac 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/dom/FixtureAwareRowHandler.java
+++ b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/FixtureAwareRowHandler.java
@@ -1,7 +1,8 @@
-package org.apache.isis.extensions.excel.dom;
+package org.apache.isis.subdomains.excel.testing;
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.subdomains.excel.applib.dom.RowHandler;
public interface FixtureAwareRowHandler<T extends FixtureAwareRowHandler<T>> extends RowHandler<T> {
diff --git a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/IsisModuleExtExcel.java b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/IsisModuleSubExcelTesting.java
similarity index 63%
rename from subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/IsisModuleExtExcel.java
rename to subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/IsisModuleSubExcelTesting.java
index c3c2c09..2f6cd70 100644
--- a/subdomains/excel/impl/src/main/java/org/apache/isis/extensions/excel/IsisModuleExtExcel.java
+++ b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/IsisModuleSubExcelTesting.java
@@ -1,9 +1,9 @@
-package org.apache.isis.extensions.excel;
+package org.apache.isis.subdomains.excel.testing;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@ComponentScan
-public class IsisModuleExtExcel {
+public class IsisModuleSubExcelTesting {
}
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 3544fbf..8fbf1d3 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -76,7 +76,12 @@
<dependency>
<groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-excel-dom</artifactId>
+ <artifactId>isis-subdomains-excel-applib</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-excel-testing</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
@@ -125,11 +130,7 @@
<module>docx</module>
-->
-<!--
- <module>excel/fixture</module>
- <module>excel/integtests</module>
--->
- <module>excel/impl</module>
+ <module>excel</module>
<module>spring/impl</module>