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

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

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

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

commit 418be78ebacf75a3b7efb526043f504c256e6404
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Nov 28 16:18:30 2019 +0000

    ISIS-2186: changes package org.incode.module.fakedata-> org.apache.isis.extensions.fakedata
---
 .../module/fakedata/fixture/FakeDataFixturesModule.java  |   2 +-
 .../FakeDataDemoObjectWithAll_create3.java               |   2 +-
 .../FakeDataDemoObjectWithAll_create_withFakeData.java   |   2 +-
 .../FakeDataDemoObjectWithAll_update_withFakeData.java   |   2 +-
 .../apache/isis/extensions/fakedata/FakeDataModule.java  |  11 +++++++++++
 .../fakedata/dom/AbstractRandomValueGenerator.java       |   2 +-
 .../isis/extensions}/fakedata/dom/Addresses.java         |   2 +-
 .../isis/extensions}/fakedata/dom/BigDecimals.java       |   2 +-
 .../isis/extensions}/fakedata/dom/BigIntegers.java       |   2 +-
 .../isis/extensions}/fakedata/dom/Books.java             |   2 +-
 .../isis/extensions}/fakedata/dom/Booleans.java          |   4 +---
 .../isis/extensions}/fakedata/dom/Bytes.java             |   2 +-
 .../isis/extensions}/fakedata/dom/Chars.java             |   2 +-
 .../isis/extensions}/fakedata/dom/Collections.java       |   2 +-
 .../isis/extensions}/fakedata/dom/Comms.java             |   2 +-
 .../isis/extensions}/fakedata/dom/CreditCards.java       |   2 +-
 .../isis/extensions}/fakedata/dom/Doubles.java           |   2 +-
 .../isis/extensions}/fakedata/dom/Enums.java             |   2 +-
 .../isis/extensions}/fakedata/dom/FakeDataService.java   |   2 +-
 .../isis/extensions}/fakedata/dom/Floats.java            |   2 +-
 .../isis/extensions}/fakedata/dom/Integers.java          |   2 +-
 .../isis/extensions}/fakedata/dom/IsisBlobs.java         |   2 +-
 .../isis/extensions}/fakedata/dom/IsisClobs.java         |   5 +----
 .../isis/extensions}/fakedata/dom/IsisMoneys.java        |   2 +-
 .../isis/extensions}/fakedata/dom/IsisPasswords.java     |   2 +-
 .../isis/extensions}/fakedata/dom/JavaSqlDates.java      |   2 +-
 .../isis/extensions}/fakedata/dom/JavaSqlTimestamps.java |   2 +-
 .../isis/extensions}/fakedata/dom/JavaUtilDates.java     |   2 +-
 .../isis/extensions}/fakedata/dom/JodaDateTimes.java     |   2 +-
 .../isis/extensions}/fakedata/dom/JodaLocalDates.java    |   2 +-
 .../isis/extensions}/fakedata/dom/JodaPeriods.java       |   2 +-
 .../isis/extensions}/fakedata/dom/Longs.java             |   2 +-
 .../isis/extensions}/fakedata/dom/Lorem.java             |   3 +--
 .../isis/extensions}/fakedata/dom/Names.java             |   2 +-
 .../isis/extensions}/fakedata/dom/Shorts.java            |   2 +-
 .../isis/extensions}/fakedata/dom/Strings.java           |   2 +-
 .../isis/extensions}/fakedata/dom/Urls.java              |   2 +-
 .../isis/extensions}/fakedata/dom/Uuids.java             |   2 +-
 .../fakedata/dom/blobs/Pawson-Naked-Objects-thesis.pdf   | Bin
 .../extensions}/fakedata/dom/blobs/image01-150x150.jpg   | Bin
 .../extensions}/fakedata/dom/blobs/image01-2048x1536.jpg | Bin
 .../extensions}/fakedata/dom/blobs/image01-240x180.jpg   | Bin
 .../extensions}/fakedata/dom/blobs/image01-4000x3000.jpg | Bin
 .../extensions}/fakedata/dom/blobs/image01-640x480.jpg   | Bin
 .../extensions}/fakedata/dom/blobs/image02-150x150.jpg   | Bin
 .../extensions}/fakedata/dom/blobs/image02-2048x1536.jpg | Bin
 .../extensions}/fakedata/dom/blobs/image02-240x180.jpg   | Bin
 .../extensions}/fakedata/dom/blobs/image02-4000x3000.jpg | Bin
 .../extensions}/fakedata/dom/blobs/image02-640x480.jpg   | Bin
 .../fakedata/dom/blobs/rick-mugridge-paper.pdf           | Bin
 .../isis/extensions}/fakedata/dom/clobs/RTF-Spec-1.7.rtf |   0
 .../isis/extensions}/fakedata/dom/clobs/a_and_c.xml      |   0
 .../isis/extensions}/fakedata/dom/clobs/all_well.xml     |   0
 .../isis/extensions}/fakedata/dom/clobs/as_you.xml       |   0
 .../isis/extensions}/fakedata/dom/clobs/com_err.xml      |   0
 .../isis/extensions}/fakedata/dom/clobs/config.rtf       |   0
 .../isis/extensions}/fakedata/dom/clobs/coriolan.xml     |   0
 .../isis/extensions}/fakedata/dom/clobs/cymbelin.xml     |   0
 .../isis/extensions}/fakedata/dom/clobs/dream.xml        |   0
 .../isis/extensions}/fakedata/dom/clobs/dsssl.dtd        |   0
 .../isis/extensions}/fakedata/dom/clobs/fot.dtd          |   0
 .../isis/extensions}/fakedata/dom/clobs/hamlet.xml       |   0
 .../isis/extensions}/fakedata/dom/clobs/hen_iv_1.xml     |   0
 .../isis/extensions}/fakedata/dom/clobs/hen_iv_2.xml     |   0
 .../isis/extensions}/fakedata/dom/clobs/hen_v.xml        |   0
 .../isis/extensions}/fakedata/dom/clobs/hen_vi_1.xml     |   0
 .../isis/extensions}/fakedata/dom/clobs/hen_vi_2.xml     |   0
 .../isis/extensions}/fakedata/dom/clobs/hen_vi_3.xml     |   0
 .../isis/extensions}/fakedata/dom/clobs/hen_viii.xml     |   0
 .../isis/extensions}/fakedata/dom/clobs/j_caesar.xml     |   0
 .../isis/extensions}/fakedata/dom/clobs/john.xml         |   0
 .../isis/extensions}/fakedata/dom/clobs/lear.xml         |   0
 .../isis/extensions}/fakedata/dom/clobs/lll.xml          |   0
 .../isis/extensions}/fakedata/dom/clobs/m_for_m.xml      |   0
 .../isis/extensions}/fakedata/dom/clobs/m_wives.xml      |   0
 .../isis/extensions}/fakedata/dom/clobs/macbeth.xml      |   0
 .../isis/extensions}/fakedata/dom/clobs/merchant.xml     |   0
 .../isis/extensions}/fakedata/dom/clobs/much_ado.xml     |   0
 .../isis/extensions}/fakedata/dom/clobs/othello.xml      |   0
 .../isis/extensions}/fakedata/dom/clobs/pericles.xml     |   0
 .../isis/extensions}/fakedata/dom/clobs/play.dtd         |   0
 .../isis/extensions}/fakedata/dom/clobs/r_and_j.xml      |   0
 .../isis/extensions}/fakedata/dom/clobs/rich_ii.xml      |   0
 .../isis/extensions}/fakedata/dom/clobs/rich_iii.xml     |   0
 .../isis/extensions}/fakedata/dom/clobs/sample.rtf       |   0
 .../isis/extensions}/fakedata/dom/clobs/shaksper.htm     |   0
 .../isis/extensions}/fakedata/dom/clobs/style-sheet.dtd  |   0
 .../isis/extensions}/fakedata/dom/clobs/t_night.xml      |   0
 .../isis/extensions}/fakedata/dom/clobs/taming.xml       |   0
 .../isis/extensions}/fakedata/dom/clobs/tempest.xml      |   0
 .../isis/extensions}/fakedata/dom/clobs/testrtf.rtf      |   0
 .../isis/extensions}/fakedata/dom/clobs/timon.xml        |   0
 .../isis/extensions}/fakedata/dom/clobs/titus.xml        |   0
 .../isis/extensions}/fakedata/dom/clobs/troilus.xml      |   0
 .../isis/extensions}/fakedata/dom/clobs/two_gent.xml     |   0
 .../isis/extensions}/fakedata/dom/clobs/vs               |   0
 .../isis/extensions}/fakedata/dom/clobs/vx               |   0
 .../isis/extensions}/fakedata/dom/clobs/win_tale.xml     |   0
 .../isis/extensions}/fakedata/dom/clobs/xml.dcl          |   0
 .../isis/extensions}/fakedata/dom/clobs/xml.soc          |   0
 .../org/isisaddons/module/fakedata/FakeDataModule.java   |  15 ---------------
 .../extensions}/fakedata/dom/FakeDataServiceTest.java    |   2 +-
 .../integtests/FakeDataModuleIntegTestAbstract.java      |   2 +-
 .../fakedata/integtests/tests/Bootstrap_IntegTest.java   |   4 ++--
 .../fakedata/integtests/tests/Smoke_IntegTest.java       |   7 +++----
 105 files changed, 55 insertions(+), 66 deletions(-)

diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/FakeDataFixturesModule.java b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/FakeDataFixturesModule.java
index 71eeb5f..e514b91 100644
--- a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/FakeDataFixturesModule.java
+++ b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/FakeDataFixturesModule.java
@@ -2,7 +2,7 @@ package org.isisaddons.module.fakedata.fixture;
 
 import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
 import org.apache.isis.extensions.fixtures.modules.Module;
-import org.isisaddons.module.fakedata.FakeDataModule;
+import org.apache.isis.extensions.fakedata.FakeDataModule;
 import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts.FakeDataDemoObjectWithAll_tearDown;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
index e1c106b..98a8aee 100644
--- a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
+++ b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
@@ -7,7 +7,7 @@ import com.google.common.collect.Lists;
 import org.apache.isis.applib.annotation.Programmatic;
 
 import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.isisaddons.module.fakedata.dom.FakeDataService;
+import org.apache.isis.extensions.fakedata.dom.FakeDataService;
 import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
 import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts.data.FakeDataDemoObjectWithAll_create_withFakeData;
 
diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
index 7374fc0..581906d 100644
--- a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
+++ b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
@@ -3,7 +3,7 @@ package org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts
 import org.apache.isis.applib.annotation.Programmatic;
 
 import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.isisaddons.module.fakedata.dom.FakeDataService;
+import org.apache.isis.extensions.fakedata.dom.FakeDataService;
 import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
 import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAllMenu;
 
diff --git a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
index 667bc3d..f2874f2 100644
--- a/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
+++ b/extensions/lib/fakedata/fixture/src/main/java/org/isisaddons/module/fakedata/fixture/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
@@ -17,7 +17,7 @@ import org.apache.isis.applib.value.Clob;
 import org.apache.isis.applib.value.Money;
 import org.apache.isis.applib.value.Password;
 
-import org.isisaddons.module.fakedata.dom.FakeDataService;
+import org.apache.isis.extensions.fakedata.dom.FakeDataService;
 import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
 import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.EnumOf3;
 
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/FakeDataModule.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/FakeDataModule.java
new file mode 100644
index 0000000..285e318
--- /dev/null
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/FakeDataModule.java
@@ -0,0 +1,11 @@
+package org.apache.isis.extensions.fakedata;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration
+@ComponentScan
+public class FakeDataModule {
+
+}
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/AbstractRandomValueGenerator.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/AbstractRandomValueGenerator.java
similarity index 78%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/AbstractRandomValueGenerator.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/AbstractRandomValueGenerator.java
index 17e9937..bbb598b 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/AbstractRandomValueGenerator.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/AbstractRandomValueGenerator.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 abstract class AbstractRandomValueGenerator {
 
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Addresses.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Addresses.java
similarity index 96%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Addresses.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Addresses.java
index ab6d32d..3d38146 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Addresses.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Addresses.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 public class Addresses extends AbstractRandomValueGenerator {
 
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/BigDecimals.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/BigDecimals.java
similarity index 94%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/BigDecimals.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/BigDecimals.java
index 1f65185..4aedfe4 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/BigDecimals.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/BigDecimals.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import java.math.BigDecimal;
 import org.apache.isis.applib.annotation.Programmatic;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/BigIntegers.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/BigIntegers.java
similarity index 88%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/BigIntegers.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/BigIntegers.java
index 6ab90aa..9f11f84 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/BigIntegers.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/BigIntegers.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import java.math.BigInteger;
 import org.apache.isis.applib.annotation.Programmatic;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Books.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Books.java
similarity index 89%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Books.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Books.java
index bdbfcdf..34c95eb 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Books.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Books.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 public class Books extends AbstractRandomValueGenerator {
 
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Booleans.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Booleans.java
similarity index 84%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Booleans.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Booleans.java
index 0f5c53c..1430a25 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Booleans.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Booleans.java
@@ -1,6 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
-
-import org.apache.isis.applib.annotation.Programmatic;
+package org.apache.isis.extensions.fakedata.dom;
 
 public class Booleans extends AbstractRandomValueGenerator {
 
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Bytes.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Bytes.java
similarity index 91%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Bytes.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Bytes.java
index ca9ef70..040aa32 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Bytes.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Bytes.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import org.apache.isis.applib.annotation.Programmatic;
 
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Chars.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Chars.java
similarity index 94%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Chars.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Chars.java
index ea6f296..c347185 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Chars.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Chars.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import org.apache.isis.applib.annotation.Programmatic;
 
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Collections.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Collections.java
similarity index 99%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Collections.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Collections.java
index 00308a2..c533087 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Collections.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Collections.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Comms.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Comms.java
similarity index 93%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Comms.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Comms.java
index fac34d2..1922bae 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Comms.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Comms.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 public class Comms extends AbstractRandomValueGenerator {
 
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/CreditCards.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/CreditCards.java
similarity index 93%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/CreditCards.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/CreditCards.java
index b31789a..b976866 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/CreditCards.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/CreditCards.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import com.github.javafaker.service.FakeValuesService;
 import org.apache.isis.applib.annotation.Programmatic;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Doubles.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Doubles.java
similarity index 92%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Doubles.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Doubles.java
index 0c77d29..7f59fc3 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Doubles.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Doubles.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.isis.applib.annotation.Programmatic;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Enums.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Enums.java
similarity index 89%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Enums.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Enums.java
index 287cfe2..d7ff823 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Enums.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Enums.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import org.apache.isis.applib.annotation.Programmatic;
 
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/FakeDataService.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/FakeDataService.java
similarity index 99%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/FakeDataService.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/FakeDataService.java
index d7e00c2..9a49936 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/FakeDataService.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/FakeDataService.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import java.util.Locale;
 import java.util.Random;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Floats.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Floats.java
similarity index 87%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Floats.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Floats.java
index 82661a2..2614a47 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Floats.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Floats.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.isis.applib.annotation.Programmatic;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Integers.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Integers.java
similarity index 92%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Integers.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Integers.java
index bcbf16b..788e932 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Integers.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Integers.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.isis.applib.annotation.Programmatic;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/IsisBlobs.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisBlobs.java
similarity index 98%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/IsisBlobs.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisBlobs.java
index 8fff8e5..0f7c2c9 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/IsisBlobs.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisBlobs.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import java.io.IOException;
 import java.net.URL;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/IsisClobs.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisClobs.java
similarity index 94%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/IsisClobs.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisClobs.java
index 15b8dba..b7f06d5 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/IsisClobs.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisClobs.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import java.io.IOException;
 import java.net.URL;
@@ -7,9 +7,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import com.google.common.base.Charsets;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
 import com.google.common.io.CharSource;
 import com.google.common.io.Resources;
 
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/IsisMoneys.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisMoneys.java
similarity index 89%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/IsisMoneys.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisMoneys.java
index 580873e..98f8fe8 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/IsisMoneys.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisMoneys.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.value.Money;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/IsisPasswords.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisPasswords.java
similarity index 88%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/IsisPasswords.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisPasswords.java
index ba3cfcf..6e06a81 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/IsisPasswords.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/IsisPasswords.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.value.Password;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/JavaSqlDates.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/JavaSqlDates.java
similarity index 93%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/JavaSqlDates.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/JavaSqlDates.java
index 93c535d..bd8e3d0 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/JavaSqlDates.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/JavaSqlDates.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import java.sql.Date;
 import org.joda.time.DateTime;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/JavaSqlTimestamps.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/JavaSqlTimestamps.java
similarity index 90%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/JavaSqlTimestamps.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/JavaSqlTimestamps.java
index 7a6c059..acc061f 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/JavaSqlTimestamps.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/JavaSqlTimestamps.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import java.sql.Timestamp;
 import java.util.Date;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/JavaUtilDates.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/JavaUtilDates.java
similarity index 89%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/JavaUtilDates.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/JavaUtilDates.java
index 334821a..e0e57e7 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/JavaUtilDates.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/JavaUtilDates.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import org.joda.time.DateTime;
 import org.apache.isis.applib.annotation.Programmatic;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/JodaDateTimes.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/JodaDateTimes.java
similarity index 95%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/JodaDateTimes.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/JodaDateTimes.java
index 3b5de29..70375d6 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/JodaDateTimes.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/JodaDateTimes.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import org.joda.time.DateTime;
 import org.joda.time.Period;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/JodaLocalDates.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/JodaLocalDates.java
similarity index 95%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/JodaLocalDates.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/JodaLocalDates.java
index 2ea67ce..4a2152c 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/JodaLocalDates.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/JodaLocalDates.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import org.joda.time.LocalDate;
 import org.joda.time.Period;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/JodaPeriods.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/JodaPeriods.java
similarity index 95%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/JodaPeriods.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/JodaPeriods.java
index 5a5b15a..9259f46 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/JodaPeriods.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/JodaPeriods.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import org.joda.time.Period;
 import org.apache.isis.applib.annotation.Programmatic;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Longs.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Longs.java
similarity index 87%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Longs.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Longs.java
index 6dedf88..8576aa8 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Longs.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Longs.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.isis.applib.annotation.Programmatic;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Lorem.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Lorem.java
similarity index 90%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Lorem.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Lorem.java
index 161045f..8e6bf7f 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Lorem.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Lorem.java
@@ -1,7 +1,6 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import java.util.List;
-import org.apache.isis.applib.annotation.Programmatic;
 
 public class Lorem extends AbstractRandomValueGenerator {
 
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Names.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Names.java
similarity index 94%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Names.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Names.java
index 2b5b9bb..f19a273 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Names.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Names.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import org.apache.isis.applib.annotation.Programmatic;
 
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Shorts.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Shorts.java
similarity index 91%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Shorts.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Shorts.java
index 539d32a..2dca128 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Shorts.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Shorts.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import org.apache.isis.applib.annotation.Programmatic;
 
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Strings.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Strings.java
similarity index 94%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Strings.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Strings.java
index ad88f1f..cceff10 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Strings.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Strings.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import org.apache.isis.applib.annotation.Programmatic;
 
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Urls.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Urls.java
similarity index 93%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Urls.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Urls.java
index 7a33371..036f1e9 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Urls.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Urls.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import java.net.MalformedURLException;
 import java.net.URL;
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Uuids.java b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Uuids.java
similarity index 83%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Uuids.java
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Uuids.java
index dc4bd0a..9f3c364 100644
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/Uuids.java
+++ b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/Uuids.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import java.util.UUID;
 
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/Pawson-Naked-Objects-thesis.pdf b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/Pawson-Naked-Objects-thesis.pdf
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/Pawson-Naked-Objects-thesis.pdf
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/Pawson-Naked-Objects-thesis.pdf
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image01-150x150.jpg b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image01-150x150.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image01-150x150.jpg
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image01-150x150.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image01-2048x1536.jpg b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image01-2048x1536.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image01-2048x1536.jpg
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image01-2048x1536.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image01-240x180.jpg b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image01-240x180.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image01-240x180.jpg
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image01-240x180.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image01-4000x3000.jpg b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image01-4000x3000.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image01-4000x3000.jpg
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image01-4000x3000.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image01-640x480.jpg b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image01-640x480.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image01-640x480.jpg
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image01-640x480.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image02-150x150.jpg b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image02-150x150.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image02-150x150.jpg
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image02-150x150.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image02-2048x1536.jpg b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image02-2048x1536.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image02-2048x1536.jpg
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image02-2048x1536.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image02-240x180.jpg b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image02-240x180.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image02-240x180.jpg
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image02-240x180.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image02-4000x3000.jpg b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image02-4000x3000.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image02-4000x3000.jpg
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image02-4000x3000.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image02-640x480.jpg b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image02-640x480.jpg
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/image02-640x480.jpg
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/image02-640x480.jpg
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/rick-mugridge-paper.pdf b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/rick-mugridge-paper.pdf
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/blobs/rick-mugridge-paper.pdf
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/blobs/rick-mugridge-paper.pdf
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/RTF-Spec-1.7.rtf b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/RTF-Spec-1.7.rtf
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/RTF-Spec-1.7.rtf
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/RTF-Spec-1.7.rtf
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/a_and_c.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/a_and_c.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/a_and_c.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/a_and_c.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/all_well.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/all_well.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/all_well.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/all_well.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/as_you.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/as_you.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/as_you.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/as_you.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/com_err.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/com_err.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/com_err.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/com_err.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/config.rtf b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/config.rtf
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/config.rtf
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/config.rtf
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/coriolan.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/coriolan.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/coriolan.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/coriolan.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/cymbelin.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/cymbelin.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/cymbelin.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/cymbelin.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/dream.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/dream.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/dream.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/dream.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/dsssl.dtd b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/dsssl.dtd
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/dsssl.dtd
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/dsssl.dtd
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/fot.dtd b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/fot.dtd
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/fot.dtd
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/fot.dtd
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/hamlet.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/hamlet.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/hamlet.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/hamlet.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/hen_iv_1.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/hen_iv_1.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/hen_iv_1.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/hen_iv_1.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/hen_iv_2.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/hen_iv_2.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/hen_iv_2.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/hen_iv_2.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/hen_v.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/hen_v.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/hen_v.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/hen_v.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/hen_vi_1.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/hen_vi_1.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/hen_vi_1.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/hen_vi_1.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/hen_vi_2.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/hen_vi_2.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/hen_vi_2.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/hen_vi_2.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/hen_vi_3.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/hen_vi_3.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/hen_vi_3.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/hen_vi_3.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/hen_viii.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/hen_viii.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/hen_viii.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/hen_viii.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/j_caesar.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/j_caesar.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/j_caesar.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/j_caesar.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/john.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/john.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/john.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/john.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/lear.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/lear.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/lear.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/lear.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/lll.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/lll.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/lll.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/lll.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/m_for_m.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/m_for_m.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/m_for_m.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/m_for_m.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/m_wives.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/m_wives.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/m_wives.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/m_wives.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/macbeth.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/macbeth.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/macbeth.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/macbeth.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/merchant.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/merchant.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/merchant.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/merchant.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/much_ado.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/much_ado.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/much_ado.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/much_ado.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/othello.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/othello.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/othello.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/othello.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/pericles.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/pericles.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/pericles.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/pericles.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/play.dtd b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/play.dtd
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/play.dtd
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/play.dtd
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/r_and_j.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/r_and_j.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/r_and_j.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/r_and_j.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/rich_ii.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/rich_ii.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/rich_ii.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/rich_ii.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/rich_iii.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/rich_iii.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/rich_iii.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/rich_iii.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/sample.rtf b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/sample.rtf
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/sample.rtf
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/sample.rtf
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/shaksper.htm b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/shaksper.htm
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/shaksper.htm
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/shaksper.htm
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/style-sheet.dtd b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/style-sheet.dtd
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/style-sheet.dtd
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/style-sheet.dtd
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/t_night.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/t_night.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/t_night.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/t_night.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/taming.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/taming.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/taming.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/taming.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/tempest.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/tempest.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/tempest.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/tempest.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/testrtf.rtf b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/testrtf.rtf
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/testrtf.rtf
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/testrtf.rtf
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/timon.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/timon.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/timon.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/timon.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/titus.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/titus.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/titus.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/titus.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/troilus.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/troilus.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/troilus.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/troilus.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/two_gent.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/two_gent.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/two_gent.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/two_gent.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/vs b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/vs
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/vs
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/vs
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/vx b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/vx
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/vx
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/vx
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/win_tale.xml b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/win_tale.xml
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/win_tale.xml
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/win_tale.xml
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/xml.dcl b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/xml.dcl
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/xml.dcl
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/xml.dcl
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/xml.soc b/extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/xml.soc
similarity index 100%
rename from extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/dom/clobs/xml.soc
rename to extensions/lib/fakedata/impl/src/main/java/org/apache/isis/extensions/fakedata/dom/clobs/xml.soc
diff --git a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/FakeDataModule.java b/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/FakeDataModule.java
deleted file mode 100644
index 417f08f..0000000
--- a/extensions/lib/fakedata/impl/src/main/java/org/isisaddons/module/fakedata/FakeDataModule.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.isisaddons.module.fakedata;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-@Configuration
-@ComponentScan
-public class FakeDataModule {
-
-    public abstract static class ActionDomainEvent<S> extends org.apache.isis.applib.events.domain.ActionDomainEvent<S> {}
-    public abstract static class CollectionDomainEvent<S,T> extends org.apache.isis.applib.events.domain.CollectionDomainEvent<S,T> {}
-    public abstract static class PropertyDomainEvent<S,T> extends org.apache.isis.applib.events.domain.PropertyDomainEvent<S,T> { }
-
-}
diff --git a/extensions/lib/fakedata/impl/src/test/java/org/isisaddons/module/fakedata/dom/FakeDataServiceTest.java b/extensions/lib/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/FakeDataServiceTest.java
similarity index 99%
rename from extensions/lib/fakedata/impl/src/test/java/org/isisaddons/module/fakedata/dom/FakeDataServiceTest.java
rename to extensions/lib/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/FakeDataServiceTest.java
index 8a9f754..7dfb28a 100644
--- a/extensions/lib/fakedata/impl/src/test/java/org/isisaddons/module/fakedata/dom/FakeDataServiceTest.java
+++ b/extensions/lib/fakedata/impl/src/test/java/org/apache/isis/extensions/fakedata/dom/FakeDataServiceTest.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.dom;
+package org.apache.isis.extensions.fakedata.dom;
 
 import java.net.URL;
 import java.sql.Timestamp;
diff --git a/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/FakeDataModuleIntegTestAbstract.java b/extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
similarity index 96%
rename from extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
rename to extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
index 4a6b22e..c187531 100644
--- a/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
+++ b/extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.integtests;
+package org.apache.isis.extensions.fakedata.integtests;
 
 
 import org.apache.isis.config.IsisPresets;
diff --git a/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/tests/Bootstrap_IntegTest.java b/extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java
similarity index 85%
rename from extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/tests/Bootstrap_IntegTest.java
rename to extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java
index 798ab68..996ee53 100644
--- a/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/tests/Bootstrap_IntegTest.java
+++ b/extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Bootstrap_IntegTest.java
@@ -16,9 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.isisaddons.module.fakedata.integtests.tests;
+package org.apache.isis.extensions.fakedata.integtests.tests;
 
-import org.isisaddons.module.fakedata.integtests.FakeDataModuleIntegTestAbstract;
+import org.apache.isis.extensions.fakedata.integtests.FakeDataModuleIntegTestAbstract;
 import org.junit.jupiter.api.Test;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/tests/Smoke_IntegTest.java b/extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java
similarity index 99%
rename from extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/tests/Smoke_IntegTest.java
rename to extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java
index 13768fd..15edbd2 100644
--- a/extensions/lib/fakedata/integtests/src/test/java/org/isisaddons/module/fakedata/integtests/tests/Smoke_IntegTest.java
+++ b/extensions/lib/fakedata/integtests/src/test/java/org/apache/isis/extensions/fakedata/integtests/tests/Smoke_IntegTest.java
@@ -1,4 +1,4 @@
-package org.isisaddons.module.fakedata.integtests.tests;
+package org.apache.isis.extensions.fakedata.integtests.tests;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -19,16 +19,15 @@ import org.apache.isis.applib.value.Clob;
 import org.apache.isis.applib.value.Money;
 import org.apache.isis.applib.value.Password;
 
-import org.isisaddons.module.fakedata.dom.FakeDataService;
+import org.apache.isis.extensions.fakedata.dom.FakeDataService;
 import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
 import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAllMenu;
 import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.EnumOf3;
 import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts.FakeDataDemoObjectWithAll_create3;
 import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts.data.FakeDataDemoObjectWithAll_update_withFakeData;
-import org.isisaddons.module.fakedata.integtests.FakeDataModuleIntegTestAbstract;
+import org.apache.isis.extensions.fakedata.integtests.FakeDataModuleIntegTestAbstract;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.transaction.annotation.Transactional;
 
 public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {