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/13 21:14:02 UTC
[isis] 05/07: ISIS-2062: tidies up some docs
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7d98a5c101198fc3a99ee4d4e105c0e5e59b20a9
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Nov 12 21:11:05 2019 +0100
ISIS-2062: tidies up some docs
---
.../testing/modules/ROOT/partials/component-nav.adoc | 4 ++--
antora/components/toc/modules/ROOT/pages/components.adoc | 4 ++--
.../what-is-apache-isis/powered-by/gesconsultor-grc.adoc | 2 +-
.../modules/ROOT/pages/what-is-apache-isis/screencasts.adoc | 6 +++---
.../hints-and-tips/how-run-fixtures-on-app-startup.adoc | 2 +-
.../src/main/_adoc/modules/applib-ant/pages/Inject.adoc | 2 +-
.../modules/applib-svc/pages/testing/FixtureScripts.adoc | 2 +-
.../_adoc/modules/applib-svc/pages/testing/SudoService.adoc | 2 +-
.../modules/applib-svc/pages/testing/SwitchUserService.adoc | 2 +-
.../src/main/doc/modules/applib-ant/pages/Inject.adoc | 2 +-
.../applib-cm/pages/classes/super/FixtureScript.adoc | 2 +-
.../applib-cm/pages/classes/super/FixtureScripts.adoc | 2 +-
.../modules/applib-svc/pages/testing/FixtureScripts.adoc | 2 +-
.../doc/modules/applib-svc/pages/testing/SudoService.adoc | 2 +-
.../modules/applib-svc/pages/testing/SwitchUserService.adoc | 2 +-
.../simpleapp/src/main/doc/modules/ROOT/pages/about.adoc | 4 ++--
extensions/core/spring/src/main/doc/modules/spring/nav.adoc | 2 +-
.../main/doc/modules/ext-fixtures/partials/module-nav.adoc | 3 ---
.../src/main/doc/modules/fixtures}/_attributes.adoc | 0
.../src/main/doc/modules/fixtures/attachments}/.gitkeep | 0
.../src/main/doc/modules/fixtures}/examples/.gitkeep | 0
.../src/main/doc/modules/fixtures/images}/.gitkeep | 0
.../modules/{ext-fixtures => fixtures}/images/composite.png | Bin
.../modules/{ext-fixtures => fixtures}/images/flat-1.png | Bin
.../modules/{ext-fixtures => fixtures}/images/flat-2.png | Bin
.../images/organizing-fixture-scripts.pptx | Bin
.../images/prompt-specifying-number.png | Bin
.../modules/{ext-fixtures => fixtures}/images/prompt.png | Bin
.../{ext-fixtures => fixtures}/images/prototyping-menu.png | Bin
.../{ext-fixtures => fixtures}/images/result-list.png | Bin
.../src/main/doc/modules/fixtures}/nav.adoc | 0
.../src/main/doc/modules/fixtures/pages}/_attributes.adoc | 0
.../doc/modules/{ext-fixtures => fixtures}/pages/about.adoc | 0
.../fixtures/pages/fixture-scripts}/_attributes.adoc | 0
.../pages/fixture-scripts/api-and-usage.adoc | 2 +-
.../pages/fixture-scripts/sudo-service.adoc | 0
.../pages/fixture-scripts/ticking-clock-fixture.adoc | 0
.../main/doc/modules/fixtures/partials}/_attributes.adoc | 0
.../src/main/doc/modules/fixtures/partials/module-nav.adoc | 3 +++
.../doc/modules/ext-specsupport/partials/module-nav.adoc | 3 ---
.../src/main/doc/modules/specsupport}/_attributes.adoc | 0
.../src/main/doc/modules/specsupport/attachments}/.gitkeep | 0
.../src/main/doc/modules/specsupport}/examples/.gitkeep | 0
.../src/main/doc/modules/specsupport/images}/.gitkeep | 0
.../src/main/doc/modules/specsupport}/nav.adoc | 0
.../main/doc/modules/specsupport/pages}/_attributes.adoc | 0
.../{ext-specsupport => specsupport}/pages/about.adoc | 0
.../specsupport/pages/bdd-spec-support}/_attributes.adoc | 0
.../pages/bdd-spec-support/how-it-works.adoc | 0
.../pages/bdd-spec-support/maven-configuration.adoc | 0
.../pages/bdd-spec-support/writing-a-bdd-spec.adoc | 0
.../main/doc/modules/specsupport/partials}/_attributes.adoc | 0
.../main/doc/modules/specsupport/partials/module-nav.adoc | 3 +++
53 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/antora/components/testing/modules/ROOT/partials/component-nav.adoc b/antora/components/testing/modules/ROOT/partials/component-nav.adoc
index ace20b6..44234b8 100644
--- a/antora/components/testing/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/testing/modules/ROOT/partials/component-nav.adoc
@@ -3,7 +3,7 @@
include::testing:ROOT:partial$module-nav.adoc[]
include::testing:unit-test-support:partial$module-nav.adoc[]
include::testing:integ-test-support:partial$module-nav.adoc[]
-include::testing:ext-specsupport:partial$module-nav.adoc[]
-include::testing:ext-fixtures:partial$module-nav.adoc[]
+include::testing:specsupport:partial$module-nav.adoc[]
+include::testing:fixtures:partial$module-nav.adoc[]
diff --git a/antora/components/toc/modules/ROOT/pages/components.adoc b/antora/components/toc/modules/ROOT/pages/components.adoc
index eced74e..dcd46a8 100644
--- a/antora/components/toc/modules/ROOT/pages/components.adoc
+++ b/antora/components/toc/modules/ROOT/pages/components.adoc
@@ -15,8 +15,8 @@ _Extensions:_
* xref:vw:excel-download:about.adoc[Excel Download]
* xref:vw:asciidoc:about.adoc[Asciidoc value type ]
* xref:vw:markdown:about.adoc[Markdown value type]
-* xref:ext-sse:ROOT:about.adoc[Server Sent Events]
-* xref:ext-incubator:ROOT:about.adoc[Incubator]
+* xref:sse:ROOT:about.adoc[Server Sent Events]
+* xref:incubator:ROOT:about.adoc[Incubator]
== Restful Objects Viewer
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/gesconsultor-grc.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/gesconsultor-grc.adoc
index 9aa0ca4..613c4aa 100644
--- a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/gesconsultor-grc.adoc
+++ b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/gesconsultor-grc.adoc
@@ -80,7 +80,7 @@ At the last count more than 400 domain entities, across 6 different Bounded Cont
At the Domain level, we also extensively use the xref:userguide:fun:building-blocks.adoc#domain-events[domain events] functionality available in Apache Isis, along with many of the (non-ASF) link:https://platform.incode.org[Incode Platform^] (such as audit, security and excel modules).
-The GRC platform currently has more than 5600 automated tests, about 2000 being xref:testing:ext-specsupport:about.adoc[BDD tests] and 3600 xref:testing:integ-test-support:about.adoc[integration tests], all leveraging Apache Isis' extensive testing capabilities.
+The GRC platform currently has more than 5600 automated tests, about 2000 being xref:testing:specsupport:about.adoc[BDD tests] and 3600 xref:testing:integ-test-support:about.adoc[integration tests], all leveraging Apache Isis' extensive testing capabilities.
== Summing up
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
index 7740a96..a312b98 100644
--- a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
+++ b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
@@ -79,7 +79,7 @@ include::screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=pH02g0l2GKY[005^] +
-Using xref:ext-fixtures:ROOT:about.adoc[fixture scripts] to initialize the database, eg while prototyping and for demos
+Using xref:fixtures:ROOT:about.adoc[fixture scripts] to initialize the database, eg while prototyping and for demos
||x|||||||||
@@ -187,7 +187,7 @@ How to implement a derived collection on a domain object.
|link:https://www.youtube.com/watch?v=l_oZymgb65I[017^] +
-Extending a xref:ext-fixtures:ROOT:about.adoc[fixture script] to more easily demonstrate new functionality.
+Extending a xref:fixtures:ROOT:about.adoc[fixture script] to more easily demonstrate new functionality.
||x|||||||||
@@ -367,7 +367,7 @@ How to provide a set of xref:refguide:applib-cm:methods.adoc#choices[choices] (a
|link:https://www.youtube.com/watch?v=fKo6aTPK-gk[035^] +
-How to use the xref:refguide:applib-cm:methods.adoc#choices[choices] supporting methods as a source for default values within a xref:ext-fixtures:ROOT:about.adoc[fixture script].
+How to use the xref:refguide:applib-cm:methods.adoc#choices[choices] supporting methods as a source for default values within a xref:fixtures:ROOT:about.adoc[fixture script].
||x|||||||x||
diff --git a/antora/components/toc/modules/devguide/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc b/antora/components/toc/modules/devguide/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc
index 2e2251f..175f7b4 100644
--- a/antora/components/toc/modules/devguide/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc
+++ b/antora/components/toc/modules/devguide/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc
@@ -13,7 +13,7 @@ Hook up into the webapp start?
Use events?_
-The standard approach is to use xref:ext-fixtures:ROOT:about.adoc[fixture scripts].
+The standard approach is to use xref:fixtures:ROOT:about.adoc[fixture scripts].
These can be run in on start-up typically by being specified in the xref:refguide:applib-cm:classes/AppManifest-bootstrapping.adoc[`AppManifest`], see for example the xref:simpleapp:ROOT:about.adoc[SimpleApp archetype].
Alternatively just set `isis.fixtures` and `isis.persistor.datanucleus.install-fixtures` properties.
diff --git a/core/applib/src/main/_adoc/modules/applib-ant/pages/Inject.adoc b/core/applib/src/main/_adoc/modules/applib-ant/pages/Inject.adoc
index 40836d8..1df9ac7 100644
--- a/core/applib/src/main/_adoc/modules/applib-ant/pages/Inject.adoc
+++ b/core/applib/src/main/_adoc/modules/applib-ant/pages/Inject.adoc
@@ -5,7 +5,7 @@ include::_attributes.adoc[]
Apache Isis automatically injects domain services into other domain services and also into domain objects and view models.
-In fact, it also injects domain services into xref:testing:integ-test-support:about.adoc[integration tests] and xref:ext-fixtures:ROOT:about.adoc[fixture scripts].
+In fact, it also injects domain services into xref:testing:integ-test-support:about.adoc[integration tests] and xref:fixtures:ROOT:about.adoc[fixture scripts].
[NOTE]
====
diff --git a/core/applib/src/main/_adoc/modules/applib-svc/pages/testing/FixtureScripts.adoc b/core/applib/src/main/_adoc/modules/applib-svc/pages/testing/FixtureScripts.adoc
index c0e3feb..7aefec6 100644
--- a/core/applib/src/main/_adoc/modules/applib-svc/pages/testing/FixtureScripts.adoc
+++ b/core/applib/src/main/_adoc/modules/applib-svc/pages/testing/FixtureScripts.adoc
@@ -6,7 +6,7 @@ include::_attributes.adoc[]
-The `FixtureScripts` service provides the ability to execute xref:ext-fixtures:ROOT:about.adoc#api-and-usage[fixture scripts].
+The `FixtureScripts` service provides the ability to execute xref:fixtures:ROOT:about.adoc#api-and-usage[fixture scripts].
The default implementation of this service, `FixtureScriptsDefault`, uses the associated xref:refguide:applib-svc:testing/FixtureScriptsSpecificationProvider.adoc[`FixtureScriptsSpecificationProvider`] to obtain a `FixtureScriptsSpecification`.
This configures this service, for example telling it which package to search for `FixtureScript` classes, how to execute those classes, and hints that influence the UI.
diff --git a/core/applib/src/main/_adoc/modules/applib-svc/pages/testing/SudoService.adoc b/core/applib/src/main/_adoc/modules/applib-svc/pages/testing/SudoService.adoc
index ca5c59a..f69c5fa 100644
--- a/core/applib/src/main/_adoc/modules/applib-svc/pages/testing/SudoService.adoc
+++ b/core/applib/src/main/_adoc/modules/applib-svc/pages/testing/SudoService.adoc
@@ -7,7 +7,7 @@ include::_attributes.adoc[]
The `SudoService` allows the current user reported by the xref:refguide:applib-svc:core-domain-api/UserService.adoc[`UserService`] to be temporarily changed to some other user.
-This is useful both for xref:testing:integ-test-support:about.adoc[integration testing] (eg if testing a workflow system whereby objects are moved from one user to another) and while running xref:ext-fixtures:ROOT:about.adoc[fixture scripts] (eg setting up objects that would normally require several users to have acted upon the objects).
+This is useful both for xref:testing:integ-test-support:about.adoc[integration testing] (eg if testing a workflow system whereby objects are moved from one user to another) and while running xref:fixtures:ROOT:about.adoc[fixture scripts] (eg setting up objects that would normally require several users to have acted upon the objects).
== API
diff --git a/core/applib/src/main/_adoc/modules/applib-svc/pages/testing/SwitchUserService.adoc b/core/applib/src/main/_adoc/modules/applib-svc/pages/testing/SwitchUserService.adoc
index 95e87d2..cd81ffa 100644
--- a/core/applib/src/main/_adoc/modules/applib-svc/pages/testing/SwitchUserService.adoc
+++ b/core/applib/src/main/_adoc/modules/applib-svc/pages/testing/SwitchUserService.adoc
@@ -13,7 +13,7 @@ different users of the system.
[NOTE]
====
-This service is deprecated; use xref:ext-fixtures:ROOT:about.adoc[fixture scripts] and the
+This service is deprecated; use xref:fixtures:ROOT:about.adoc[fixture scripts] and the
xref:refguide:applib-svc:testing/SudoService.adoc[`SudoService`] instead.
====
diff --git a/core/applib/src/main/doc/modules/applib-ant/pages/Inject.adoc b/core/applib/src/main/doc/modules/applib-ant/pages/Inject.adoc
index 40836d8..1df9ac7 100644
--- a/core/applib/src/main/doc/modules/applib-ant/pages/Inject.adoc
+++ b/core/applib/src/main/doc/modules/applib-ant/pages/Inject.adoc
@@ -5,7 +5,7 @@ include::_attributes.adoc[]
Apache Isis automatically injects domain services into other domain services and also into domain objects and view models.
-In fact, it also injects domain services into xref:testing:integ-test-support:about.adoc[integration tests] and xref:ext-fixtures:ROOT:about.adoc[fixture scripts].
+In fact, it also injects domain services into xref:testing:integ-test-support:about.adoc[integration tests] and xref:fixtures:ROOT:about.adoc[fixture scripts].
[NOTE]
====
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScript.adoc b/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScript.adoc
index cb3da88..a95f722 100644
--- a/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScript.adoc
+++ b/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScript.adoc
@@ -17,5 +17,5 @@ protected abstract void execute(final ExecutionContext executionContext);
In this method the fixture script can in theory do anything, but in practice it is recommended that it uses injected domain services to set up data.
The provided `ExecutionContext` is used to invoke child fixture scripts, and alsocan be used to store references to any created objects (so that the calling test can access these objects/so that they are rendered in the view model).
-See the see the xref:ext-fixtures:ROOT:about.adoc[user guide's testing chapter] for further discussion on the use of fixture scripts, in particular xref:ext-fixtures:ROOT:about.adoc#api-and-usage[fixture scripts' API and usage].
+See the see the xref:fixtures:ROOT:about.adoc[user guide's testing chapter] for further discussion on the use of fixture scripts, in particular xref:fixtures:ROOT:about.adoc#api-and-usage[fixture scripts' API and usage].
diff --git a/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScripts.adoc b/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScripts.adoc
index 4720b79..6f07be7 100644
--- a/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScripts.adoc
+++ b/core/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScripts.adoc
@@ -8,4 +8,4 @@ This abstract class constitutes the API of a domain service to execute xref:refg
For more information, see xref:refguide:applib-svc:testing/FixtureScripts.adoc[`FixtureScripts`] in the domain services guide.
-See the see the xref:ext-fixtures:ROOT:about.adoc[testing guide] for further discussion on the use of fixture scripts, in particular xref:ext-fixtures:ROOT:about.adoc#api-and-usage[fixture scripts' API and usage].
+See the see the xref:fixtures:ROOT:about.adoc[testing guide] for further discussion on the use of fixture scripts, in particular xref:fixtures:ROOT:about.adoc#api-and-usage[fixture scripts' API and usage].
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScripts.adoc b/core/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScripts.adoc
index c0e3feb..7aefec6 100644
--- a/core/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScripts.adoc
+++ b/core/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScripts.adoc
@@ -6,7 +6,7 @@ include::_attributes.adoc[]
-The `FixtureScripts` service provides the ability to execute xref:ext-fixtures:ROOT:about.adoc#api-and-usage[fixture scripts].
+The `FixtureScripts` service provides the ability to execute xref:fixtures:ROOT:about.adoc#api-and-usage[fixture scripts].
The default implementation of this service, `FixtureScriptsDefault`, uses the associated xref:refguide:applib-svc:testing/FixtureScriptsSpecificationProvider.adoc[`FixtureScriptsSpecificationProvider`] to obtain a `FixtureScriptsSpecification`.
This configures this service, for example telling it which package to search for `FixtureScript` classes, how to execute those classes, and hints that influence the UI.
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/testing/SudoService.adoc b/core/applib/src/main/doc/modules/applib-svc/pages/testing/SudoService.adoc
index ca5c59a..f69c5fa 100644
--- a/core/applib/src/main/doc/modules/applib-svc/pages/testing/SudoService.adoc
+++ b/core/applib/src/main/doc/modules/applib-svc/pages/testing/SudoService.adoc
@@ -7,7 +7,7 @@ include::_attributes.adoc[]
The `SudoService` allows the current user reported by the xref:refguide:applib-svc:core-domain-api/UserService.adoc[`UserService`] to be temporarily changed to some other user.
-This is useful both for xref:testing:integ-test-support:about.adoc[integration testing] (eg if testing a workflow system whereby objects are moved from one user to another) and while running xref:ext-fixtures:ROOT:about.adoc[fixture scripts] (eg setting up objects that would normally require several users to have acted upon the objects).
+This is useful both for xref:testing:integ-test-support:about.adoc[integration testing] (eg if testing a workflow system whereby objects are moved from one user to another) and while running xref:fixtures:ROOT:about.adoc[fixture scripts] (eg setting up objects that would normally require several users to have acted upon the objects).
== API
diff --git a/core/applib/src/main/doc/modules/applib-svc/pages/testing/SwitchUserService.adoc b/core/applib/src/main/doc/modules/applib-svc/pages/testing/SwitchUserService.adoc
index 95e87d2..cd81ffa 100644
--- a/core/applib/src/main/doc/modules/applib-svc/pages/testing/SwitchUserService.adoc
+++ b/core/applib/src/main/doc/modules/applib-svc/pages/testing/SwitchUserService.adoc
@@ -13,7 +13,7 @@ different users of the system.
[NOTE]
====
-This service is deprecated; use xref:ext-fixtures:ROOT:about.adoc[fixture scripts] and the
+This service is deprecated; use xref:fixtures:ROOT:about.adoc[fixture scripts] and the
xref:refguide:applib-svc:testing/SudoService.adoc[`SudoService`] instead.
====
diff --git a/examples/apps/simpleapp/src/main/doc/modules/ROOT/pages/about.adoc b/examples/apps/simpleapp/src/main/doc/modules/ROOT/pages/about.adoc
index b0aa78d..d4602b9 100644
--- a/examples/apps/simpleapp/src/main/doc/modules/ROOT/pages/about.adoc
+++ b/examples/apps/simpleapp/src/main/doc/modules/ROOT/pages/about.adoc
@@ -408,7 +408,7 @@ public class SimpleModule extends ModuleAbstract {
}
----
-In the `fixture` subpackage is the `SimpleObject_persona` "persona" which uses the corresponding `SimpleObjectBuilder` builder script; further discussion on this pattern xref:ext-fixtures:ROOT:about.adoc#persona-and-builders.adoc[here].
+In the `fixture` subpackage is the `SimpleObject_persona` "persona" which uses the corresponding `SimpleObjectBuilder` builder script; further discussion on this pattern xref:fixtures:ROOT:about.adoc#persona-and-builders.adoc[here].
These fixtures are also used by "local" integration tests, which reside under `src/test/java`.
There are also unit tests and "glue" for the BDD specs:
@@ -670,7 +670,7 @@ image::simpleapp-webapp-before-launch.png[width="600px",link="{imagesdir}/simple
== Running with Fixtures
It is also possible to start the application with a pre-defined set of data; useful for demos or manual exploratory testing.
-This is done by specifying a xref:ext-fixtures:ROOT:about.adoc[fixture script] on the command line.
+This is done by specifying a xref:fixtures:ROOT:about.adoc[fixture script] on the command line.
If you are running the app from an IDE, then you can specify the fixture script using the `--fixture` flag. The archetype provides the `domainapp.fixture.scenarios.RecreateSimpleObjects` fixture script, for example:
diff --git a/extensions/core/spring/src/main/doc/modules/spring/nav.adoc b/extensions/core/spring/src/main/doc/modules/spring/nav.adoc
index f47e22a..8189461 100644
--- a/extensions/core/spring/src/main/doc/modules/spring/nav.adoc
+++ b/extensions/core/spring/src/main/doc/modules/spring/nav.adoc
@@ -1,2 +1,2 @@
-include::extensions:ext-spring:partial$component-nav.adoc[]
+include::extensions:spring:partial$component-nav.adoc[]
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/partials/module-nav.adoc b/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/partials/module-nav.adoc
deleted file mode 100644
index c6af38a..0000000
--- a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/partials/module-nav.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-* xref:testing:ext-fixtures:about.adoc[Fixture Scripts (extension)]
-
-
diff --git a/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/_attributes.adoc b/extensions/testing/fixtures/src/main/doc/modules/fixtures/_attributes.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/_attributes.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/_attributes.adoc
diff --git a/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/images/.gitkeep b/extensions/testing/fixtures/src/main/doc/modules/fixtures/attachments/.gitkeep
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/images/.gitkeep
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/attachments/.gitkeep
diff --git a/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/examples/.gitkeep b/extensions/testing/fixtures/src/main/doc/modules/fixtures/examples/.gitkeep
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/examples/.gitkeep
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/examples/.gitkeep
diff --git a/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/attachments/.gitkeep b/extensions/testing/fixtures/src/main/doc/modules/fixtures/images/.gitkeep
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/attachments/.gitkeep
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/images/.gitkeep
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/composite.png b/extensions/testing/fixtures/src/main/doc/modules/fixtures/images/composite.png
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/composite.png
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/images/composite.png
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/flat-1.png b/extensions/testing/fixtures/src/main/doc/modules/fixtures/images/flat-1.png
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/flat-1.png
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/images/flat-1.png
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/flat-2.png b/extensions/testing/fixtures/src/main/doc/modules/fixtures/images/flat-2.png
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/flat-2.png
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/images/flat-2.png
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/organizing-fixture-scripts.pptx b/extensions/testing/fixtures/src/main/doc/modules/fixtures/images/organizing-fixture-scripts.pptx
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/organizing-fixture-scripts.pptx
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/images/organizing-fixture-scripts.pptx
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/prompt-specifying-number.png b/extensions/testing/fixtures/src/main/doc/modules/fixtures/images/prompt-specifying-number.png
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/prompt-specifying-number.png
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/images/prompt-specifying-number.png
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/prompt.png b/extensions/testing/fixtures/src/main/doc/modules/fixtures/images/prompt.png
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/prompt.png
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/images/prompt.png
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/prototyping-menu.png b/extensions/testing/fixtures/src/main/doc/modules/fixtures/images/prototyping-menu.png
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/prototyping-menu.png
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/images/prototyping-menu.png
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/result-list.png b/extensions/testing/fixtures/src/main/doc/modules/fixtures/images/result-list.png
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/result-list.png
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/images/result-list.png
diff --git a/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/nav.adoc b/extensions/testing/fixtures/src/main/doc/modules/fixtures/nav.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/nav.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/nav.adoc
diff --git a/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/partials/_attributes.adoc b/extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/_attributes.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/partials/_attributes.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/_attributes.adoc
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/about.adoc b/extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/about.adoc
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/about.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/about.adoc
diff --git a/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/_attributes.adoc b/extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/_attributes.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/_attributes.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/_attributes.adoc
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/api-and-usage.adoc b/extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc
similarity index 99%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/api-and-usage.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc
index 6639e2f..5aec4bf 100644
--- a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/api-and-usage.adoc
+++ b/extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc
@@ -39,7 +39,7 @@ public class DomainAppFixtureScriptsSpecificationProvider
}
----
<1> search for all fixture scripts under the package containing this class
-<2> if the same fixture script (class) is encountered more than once, then run anyway; more on this in xref:testing:ext-fixtures:about/api-and-usage.adoc#organizing[Organizing Fixture scripts], below.
+<2> if the same fixture script (class) is encountered more than once, then run anyway; more on this in xref:testing:fixtures:about/api-and-usage.adoc#organizing[Organizing Fixture scripts], below.
<3> specify the fixture script class to provide as the default for the service's "run fixture script" action
<4> whether the service's "run fixture script" action should display other fixture scripts using a choices drop down or (if there are very many of them) using an auto-complete
<5> if present, enables a "recreate objects and return first" action to be displayed in the UI
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/sudo-service.adoc b/extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/sudo-service.adoc
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/sudo-service.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/sudo-service.adoc
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc b/extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc
diff --git a/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/_attributes.adoc b/extensions/testing/fixtures/src/main/doc/modules/fixtures/partials/_attributes.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/_attributes.adoc
rename to extensions/testing/fixtures/src/main/doc/modules/fixtures/partials/_attributes.adoc
diff --git a/extensions/testing/fixtures/src/main/doc/modules/fixtures/partials/module-nav.adoc b/extensions/testing/fixtures/src/main/doc/modules/fixtures/partials/module-nav.adoc
new file mode 100644
index 0000000..393e1a0
--- /dev/null
+++ b/extensions/testing/fixtures/src/main/doc/modules/fixtures/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+* xref:testing:fixtures:about.adoc[Fixture Scripts (extension)]
+
+
diff --git a/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/partials/module-nav.adoc b/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/partials/module-nav.adoc
deleted file mode 100644
index 3948a13..0000000
--- a/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/partials/module-nav.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-* xref:testing:ext-specsupport:about.adoc[BDD Spec Support (extension)]
-
-
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/_attributes.adoc b/extensions/testing/specsupport/src/main/doc/modules/specsupport/_attributes.adoc
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/_attributes.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/specsupport/_attributes.adoc
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/.gitkeep b/extensions/testing/specsupport/src/main/doc/modules/specsupport/attachments/.gitkeep
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/images/.gitkeep
rename to extensions/testing/specsupport/src/main/doc/modules/specsupport/attachments/.gitkeep
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/examples/.gitkeep b/extensions/testing/specsupport/src/main/doc/modules/specsupport/examples/.gitkeep
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/examples/.gitkeep
rename to extensions/testing/specsupport/src/main/doc/modules/specsupport/examples/.gitkeep
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/attachments/.gitkeep b/extensions/testing/specsupport/src/main/doc/modules/specsupport/images/.gitkeep
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/attachments/.gitkeep
rename to extensions/testing/specsupport/src/main/doc/modules/specsupport/images/.gitkeep
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/nav.adoc b/extensions/testing/specsupport/src/main/doc/modules/specsupport/nav.adoc
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/nav.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/specsupport/nav.adoc
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/partials/_attributes.adoc b/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/_attributes.adoc
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/partials/_attributes.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/_attributes.adoc
diff --git a/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/about.adoc b/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/about.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/about.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/about.adoc
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/_attributes.adoc b/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/_attributes.adoc
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/fixture-scripts/_attributes.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/_attributes.adoc
diff --git a/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/how-it-works.adoc b/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/how-it-works.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/how-it-works.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/how-it-works.adoc
diff --git a/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/maven-configuration.adoc b/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/maven-configuration.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/maven-configuration.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/maven-configuration.adoc
diff --git a/extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc b/extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc
similarity index 100%
rename from extensions/testing/specsupport/src/main/doc/modules/ext-specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc
diff --git a/extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/_attributes.adoc b/extensions/testing/specsupport/src/main/doc/modules/specsupport/partials/_attributes.adoc
similarity index 100%
rename from extensions/testing/fixtures/src/main/doc/modules/ext-fixtures/pages/_attributes.adoc
rename to extensions/testing/specsupport/src/main/doc/modules/specsupport/partials/_attributes.adoc
diff --git a/extensions/testing/specsupport/src/main/doc/modules/specsupport/partials/module-nav.adoc b/extensions/testing/specsupport/src/main/doc/modules/specsupport/partials/module-nav.adoc
new file mode 100644
index 0000000..08113af
--- /dev/null
+++ b/extensions/testing/specsupport/src/main/doc/modules/specsupport/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+* xref:testing:specsupport:about.adoc[BDD Spec Support (extension)]
+
+