You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/10 11:18:09 UTC
[isis] 20/21: ISIS-2259: reorg fakedata module
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>