You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2023/06/17 14:33:48 UTC
[causeway] 07/07: CAUSEWAY-3395: moves partial-only classes into partials folder
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/causeway.git
commit 061e88fe7d21d63eef0b8ce7bd984ac4f27f5bae
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jun 17 15:33:28 2023 +0100
CAUSEWAY-3395: moves partial-only classes into partials folder
otherwise they are created as separate pages, indexed, but then orphaned if discovered by search box
---
.../comguide/modules/ROOT/pages/about.adoc | 2 -
.../modules/ROOT/pages/cutting-a-release.adoc | 2 +-
.../comguide/modules/ROOT/pages/policies.adoc | 4 +-
.../{pages => partials}/policies/git-policy.adoc | 0
.../policies/versioning-policy.adoc | 0
.../conguide/modules/git/pages/about.adoc | 4 +-
.../components/docs/modules/ROOT/pages/about.adoc | 2 +-
...creencasts-older.adoc => screencasts-older.txt} | 1 +
.../{screencasts.adoc => screencasts.txt} | 44 ++++++++--------
.../module-nav/what-is-apache-causeway.adoc | 3 +-
.../screencasts/playlists.adoc | 0
.../modules/applib-ant/pages/XmlRootElement.adoc | 3 +-
.../refguide/modules/applib-ant/pages/about.adoc | 12 ++---
.../applib-ant/pages/about/hooks/examples.adoc | 0
.../applib-ant/{pages => partials}/about/jaxb.adoc | 0
.../applib-ant/{pages => partials}/about/jdo.adoc | 0
.../applib-ant/{pages => partials}/about/jee.adoc | 0
.../applib-ant/{pages => partials}/about/jpa.adoc | 0
.../applib-ant/{pages => partials}/about/main.adoc | 0
.../{pages => partials}/about/other.adoc | 0
.../{pages => partials}/about/partial.adoc | 0
.../modules/applib-classes/pages/events.adoc | 6 +--
.../modules/applib-classes/pages/layout.adoc | 4 +-
.../roles-mixins-contributees/contributee.adoc | 42 ---------------
.../pages/roles-mixins-contributees/mixins.adoc | 61 ----------------------
.../modules/applib-classes/pages/spec.adoc | 2 +-
.../modules/applib-classes/pages/value-types.adoc | 9 ++++
.../{pages => partials}/events/domainevent.adoc | 0
.../{pages => partials}/events/lifecycleevent.adoc | 0
.../{pages => partials}/events/uievent.adoc | 0
.../{pages => partials}/layout/column-order.adoc | 0
.../{pages => partials}/layout/menubars.adoc | 0
.../{pages => partials}/layout/object-layout.adoc | 0
.../modules/applib-methods/pages/lifecycle.adoc | 14 ++---
.../modules/applib-methods/pages/prefixes.adoc | 16 +++---
.../modules/applib-methods/pages/ui-hints.adoc | 8 +--
.../{pages => partials}/lifecycle/created.adoc | 0
.../{pages => partials}/lifecycle/loaded.adoc | 0
.../{pages => partials}/lifecycle/persisted.adoc | 0
.../{pages => partials}/lifecycle/persisting.adoc | 0
.../{pages => partials}/lifecycle/removing.adoc | 0
.../{pages => partials}/lifecycle/updated.adoc | 0
.../{pages => partials}/lifecycle/updating.adoc | 0
.../{pages => partials}/prefixes/autoComplete.adoc | 0
.../{pages => partials}/prefixes/choices.adoc | 0
.../{pages => partials}/prefixes/default.adoc | 0
.../{pages => partials}/prefixes/disable.adoc | 0
.../{pages => partials}/prefixes/get.adoc | 0
.../{pages => partials}/prefixes/hide.adoc | 0
.../{pages => partials}/prefixes/set.adoc | 0
.../{pages => partials}/prefixes/validate.adoc | 0
.../{pages => partials}/ui-hints/cssClass.adoc | 0
.../{pages => partials}/ui-hints/iconName.adoc | 0
.../{pages => partials}/ui-hints/layout.adoc | 0
.../{pages => partials}/ui-hints/title.adoc | 0
.../refguide/modules/applib-svc/pages/about.adoc | 2 +-
antora/components/relnotes/modules/ROOT/nav.adoc | 3 +-
.../modules/ROOT/pages/2018/2.0.0-M1/mignotes.adoc | 16 +++---
.../relnotes/modules/ROOT/pages/about.adoc | 10 ++++
.../2018/2.0.0-M1/mignotes/meta-annotations.adoc | 0
.../2018/2.0.0-M1/mignotes/moved-types.adoc | 0
.../2018/2.0.0-M1/mignotes/other-changes.adoc | 0
.../2.0.0-M1/mignotes/removed-annotations.adoc | 0
.../mignotes/removed-configuration-properties.adoc | 0
.../2018/2.0.0-M1/mignotes/removed-types.adoc | 0
.../2.0.0-M1/mignotes/updated-annotations.adoc | 0
.../2018/2.0.0-M1/mignotes/updated-classes.adoc | 0
.../setupguide/modules/intellij/nav.adoc | 1 +
.../modules/intellij/pages/hints-and-tips.adoc | 11 ++--
.../coding-standards.adoc => coding-standards.txt} | 2 +
...ound-times.adoc => faster-turnaround-times.txt} | 3 ++
.../file-templates.adoc => file-templates.txt} | 2 +
.../live-templates.adoc => live-templates.txt} | 2 +
.../modules/petclinic/pages/040-pet-entity.adoc | 2 +-
.../modules/btb/pages/hints-and-tips.adoc | 18 +++----
.../modules/btb/pages/programming-model.adoc | 4 +-
.../hints-and-tips/are-you-sure.adoc | 0
.../hints-and-tips/custom-css.adoc | 0
.../how-to-handle-void-and-null-results.adoc | 0
.../how-to-implement-a-spellchecker.adoc | 0
.../hints-and-tips/persisted-title.adoc | 0
.../replacing-default-service-implementations.adoc | 0
.../subclass-properties-in-tables.adoc | 0
.../hints-and-tips/transactions-and-errors.adoc | 0
.../hints-and-tips/vetoing-visibility.adoc | 0
.../programming-model/custom-validator.adoc | 0
.../programming-model/finetuning.adoc | 0
.../modules/fun/pages/concepts-patterns.adoc | 14 ++---
.../fun/pages/domain-entities-and-services.adoc | 8 +--
.../modules/fun/pages/object-members.adoc | 6 +--
.../userguide/modules/fun/pages/overview.adoc | 14 ++---
.../modules/fun/pages/programming-model.adoc | 8 ---
.../components/userguide/modules/fun/pages/ui.adoc | 12 ++---
...apache-causeway-vs-cqrs-and-event-sourcing.adoc | 0
.../concepts-patterns/architecture.adoc | 0
.../concepts-patterns/core-values.adoc | 0
.../concepts-patterns/deployment-options.adoc | 0
.../concepts-patterns/domain-driven-design.adoc | 0
.../concepts-patterns/metamodel.adoc | 0
.../concepts-patterns/naked-objects-pattern.adoc | 0
.../domain-entities-and-services/crud.adoc | 0
.../domain-entities.adoc | 0
.../domain-services.adoc | 2 +-
.../inject-services.adoc | 0
.../object-members/actions.adoc | 0
.../object-members/collections.adoc | 0
.../object-members/properties.adoc | 0
.../overview/business-rules.adoc | 0
.../fun/{pages => partials}/overview/events.adoc | 2 +-
.../{pages => partials}/overview/identifiers.adoc | 0
.../fun/{pages => partials}/overview/modules.adoc | 0
.../overview/object-members.adoc | 0
.../overview/programming-model.adoc | 0
.../overview/types-of-domain-objects.adoc | 0
.../ui/action-icons-and-css.adoc | 0
.../{pages => partials}/ui/menubars-layout.adoc | 2 +-
.../ui/names-and-descriptions.adoc | 0
.../fun/{pages => partials}/ui/object-layout.adoc | 4 +-
.../ui/object-titles-and-icons.adoc | 0
.../fun/{pages => partials}/ui/table-columns.adoc | 0
.../modules/ROOT/pages/{_todo.adoc => _todo.txt} | 2 +-
121 files changed, 154 insertions(+), 235 deletions(-)
diff --git a/antora/components/comguide/modules/ROOT/pages/about.adoc b/antora/components/comguide/modules/ROOT/pages/about.adoc
index cf26467f95..bc9152ed9c 100644
--- a/antora/components/comguide/modules/ROOT/pages/about.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/about.adoc
@@ -6,5 +6,3 @@
This committers' guide is for committers of Apache Causeway itself who want guidance on release process, publishing documents and other related procedures.
-// https://manytools.org/hacker-tools/ascii-banner/
-// "Big" font
diff --git a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
index a87b6b7572..391afc39c7 100644
--- a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
@@ -40,7 +40,7 @@ Before releasing the framework, ensure there is consensus on the xref:docs:suppo
The discussion should include confirming the version number to be used, and to confirm content.
These discussions should also confirm the version number of the module being released.
-This should be in line with our xref:comguide:ROOT:policies/versioning-policy.adoc#semantic-versioning[semantic versioning policy].
+This should be in line with our xref:policies.adoc#semantic-versioning[semantic versioning policy].
Make sure you have a JIRA ticket open against which to perform all commits.
In most cases a JIRA ticket will have been created at the beginning of the previous release cycle.
diff --git a/antora/components/comguide/modules/ROOT/pages/policies.adoc b/antora/components/comguide/modules/ROOT/pages/policies.adoc
index 8c459a2442..1ab392f3ae 100644
--- a/antora/components/comguide/modules/ROOT/pages/policies.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/policies.adoc
@@ -11,5 +11,5 @@
This chapter pulls together various policy documents relating to the development of Apache Causeway'.
-include::policies/versioning-policy.adoc[leveloffset=+1]
-include::policies/git-policy.adoc[leveloffset=+1]
+include::partial$policies/versioning-policy.adoc[leveloffset=+1]
+include::partial$policies/git-policy.adoc[leveloffset=+1]
diff --git a/antora/components/comguide/modules/ROOT/pages/policies/git-policy.adoc b/antora/components/comguide/modules/ROOT/partials/policies/git-policy.adoc
similarity index 100%
rename from antora/components/comguide/modules/ROOT/pages/policies/git-policy.adoc
rename to antora/components/comguide/modules/ROOT/partials/policies/git-policy.adoc
diff --git a/antora/components/comguide/modules/ROOT/pages/policies/versioning-policy.adoc b/antora/components/comguide/modules/ROOT/partials/policies/versioning-policy.adoc
similarity index 100%
rename from antora/components/comguide/modules/ROOT/pages/policies/versioning-policy.adoc
rename to antora/components/comguide/modules/ROOT/partials/policies/versioning-policy.adoc
diff --git a/antora/components/conguide/modules/git/pages/about.adoc b/antora/components/conguide/modules/git/pages/about.adoc
index 2b6f49878e..aeff15d751 100644
--- a/antora/components/conguide/modules/git/pages/about.adoc
+++ b/antora/components/conguide/modules/git/pages/about.adoc
@@ -9,7 +9,7 @@ In addition to these basic commands, please make sure you have read:
* xref:conguide:ROOT:building-apache-causeway.adoc[building Apache Causeway]
* xref:conguide:ROOT:contributing.adoc[Contributing]
-* xref:comguide:ROOT:policies/git-policy.adoc[Git policy]
+* xref:comguide:ROOT:policies.adoc#git-policy[Git policy]
== Modifying existing files
@@ -70,7 +70,7 @@ git commit -m "CAUSEWAY-nnn: yada yada"
== Common Workflows
The xref:conguide:ROOT:contributing.adoc[contributing] page describes the workflow for non-committers.
-The xref:comguide:ROOT:policies/git-policy.adoc[Git policy] page describes a workflow for Apache Causeway **committers**.
+The xref:comguide:ROOT:policies.adoc#git-policy[Git policy] describes a workflow for Apache Causeway **committers**.
== Backing up a local branch
diff --git a/antora/components/docs/modules/ROOT/pages/about.adoc b/antora/components/docs/modules/ROOT/pages/about.adoc
index ef9bf6759a..52c167a17f 100644
--- a/antora/components/docs/modules/ROOT/pages/about.adoc
+++ b/antora/components/docs/modules/ROOT/pages/about.adoc
@@ -16,7 +16,7 @@
* xref:what-is-apache-causeway/common-use-cases.adoc[Common Use Cases]
// LATER: update screencasts.
-// * xref:what-is-apache-causeway/screencasts.adoc[Screencasts]
+// * xref:what-is-apache-causeway/screencasts.txt[Screencasts]
|
[discrete]
diff --git a/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts-older.adoc b/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts-older.txt
similarity index 98%
rename from antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts-older.adoc
rename to antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts-older.txt
index f6653887ee..10158e6b4b 100644
--- a/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts-older.adoc
+++ b/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts-older.txt
@@ -4,6 +4,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+// LATER: update these further screencasts at some point
These screencasts refer to older versions of the framework, but you may still find them of use.
diff --git a/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts.adoc b/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts.txt
similarity index 92%
rename from antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts.adoc
rename to antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts.txt
index 000ec77a29..ab7aeec3b7 100644
--- a/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts.adoc
+++ b/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts.txt
@@ -4,7 +4,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-// LATER: v2: update these screenshots for v2
+// LATER: update these screenshots at some point
We've prepared a number of screencasts to help you see what Apache Causeway has to offer.
@@ -41,7 +41,7 @@ Finally, you can also find some screencasts for earlier versions of the framewor
12+| *IDE, layouts*
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
//|https://www.youtube.com/watch?v=RQ_FFYd7npU[000^] +
@@ -80,7 +80,7 @@ Using the optional `Xxx.layout.xml` file to provide xref:userguide:fun:ui.adoc#o
12+| *Fixture scripts, rules, tests*
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=pH02g0l2GKY[005^] +
@@ -110,7 +110,7 @@ Writing end-to-end xref:testing:integtestsupport:about.adoc[integration tests] f
12+| *Swagger UI*
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=lkZxRSS0Zwg[009^] +
Using the Swagger UI to access the xref:vro:ROOT:about.adoc[REST API] automatically exposed for domain services, entities, and/or view models
@@ -134,7 +134,7 @@ Using the Swagger UI to access the xref:vro:ROOT:about.adoc[REST API] automatica
12+| *Actions*
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=dfRZeYqzMtI[012^] +
@@ -149,7 +149,7 @@ Implementing business logic using a (no-arg) action, and associating with a prop
12+| *Titles and icons, UI event subscribers*
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=CwM430UH5WE[014^] +
@@ -204,7 +204,7 @@ Using xref:userguide:fun:ui.adoc#object-layout[dynamic (XML) layouts] to specify
12+| *Hints and end-user features*
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=0d713-V4vrg[019^] +
Demonstrates how Apache Causeway' xref:vw:ROOT:about.adoc[Web UI (Wicket viewer)] remembers the state of rendered domain objects, and how the end-user of the
@@ -231,7 +231,7 @@ Demonstrates how the end-user can use bookmarks and breadcrumbs within Apache Ca
12+| *Decoupling (mixins & subscribers)*
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=Wn5215K7_Jg[022^] +
@@ -290,7 +290,7 @@ How to write an xref:testing:integtestsupport:about.adoc[integration test] for a
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=SLJPBruFMKY[028^] +
@@ -309,7 +309,7 @@ Using link:https://projectlombok.org/[Project Lombok] to remove boilerplate from
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=ORoEYlg6XFM[030^] +
@@ -342,7 +342,7 @@ How to instantiate/initialize objects using xref:refguide:applib:index/services/
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=cQ06PoMNDPw[033^] +
@@ -374,7 +374,7 @@ How to use an enum for choices (drop down list) for both a property or an action
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=1SCyBlMM2Bo[037^] +
@@ -393,7 +393,7 @@ How to hide properties as columns in tables, using CSS.
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=NKaR7ZedI8E[039^] +
@@ -412,7 +412,7 @@ Using the (non-ASF) link:https://platform.incode.org[Incode Platform^]'s fakedat
12+| *BigDecimals*
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=esujf_DFeWA[041^] +
@@ -433,7 +433,7 @@ How to use the xref:refguide:applib-ant:Digits.adoc[@Digits] annotation for acti
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=Rt4JoV4ssVY[043^] +
@@ -462,7 +462,7 @@ How to use the xref:refguide:applib-methods:prefixes.adoc#autoComplete[autoCompl
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=SoREp-8MQz0[047^] +
@@ -501,7 +501,7 @@ otherwise be part of the Apache Causeway metamodel (and thus show up in the UI).
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=puG-pzxRSd0[052^] +
@@ -530,7 +530,7 @@ Adding an action to a xref:userguide:fun:view-models.adoc#jaxb[(JAXB) view model
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=BYmSlgJP5KY[056^] +
@@ -567,7 +567,7 @@ Updating the logo for the application as it appears in the header.
12+| *Decoupling*
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=vntv_5Z8Ros[061^] +
@@ -587,7 +587,7 @@ Separating out the responsibilities of the persistent domain entities from those
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=9PgOSqf7rYE[063^] +
How to implement a bidirectional 1-to-many association between two domain entities.
@@ -614,7 +614,7 @@ How deleting one persistent entity can, if required, automatically delete anothe
12+| *Metadata fieldset*
-include::screencasts/playlists.adoc[]
+include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=kdhwMc0f7_k[067^] +
@@ -624,7 +624,7 @@ Improving the layout of domain entities by adding a metadata fieldset.
//12+| *for Contributors and Committers*
//
-//include::screencasts/playlists.adoc[]
+//include::partial$what-is-apache-causeway/screencasts/playlists.adoc[]
//
//
//|https://www.youtube.com/watch?v=RQ_FFYd7npU[068^] +
diff --git a/antora/components/docs/modules/ROOT/partials/module-nav/what-is-apache-causeway.adoc b/antora/components/docs/modules/ROOT/partials/module-nav/what-is-apache-causeway.adoc
index b24a987510..6d4798b023 100644
--- a/antora/components/docs/modules/ROOT/partials/module-nav/what-is-apache-causeway.adoc
+++ b/antora/components/docs/modules/ROOT/partials/module-nav/what-is-apache-causeway.adoc
@@ -4,4 +4,5 @@
* What is Apache Causeway?
** xref:what-is-apache-causeway/causeway-in-pictures.adoc[Apache Causeway in pictures]
** xref:what-is-apache-causeway/common-use-cases.adoc[Common Use Cases]
-** xref:what-is-apache-causeway/screencasts.adoc[Screencasts]
+// LATER
+//** xref:what-is-apache-causeway/screencasts.txt[Screencasts]
diff --git a/antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts/playlists.adoc b/antora/components/docs/modules/ROOT/partials/what-is-apache-causeway/screencasts/playlists.adoc
similarity index 100%
rename from antora/components/docs/modules/ROOT/pages/what-is-apache-causeway/screencasts/playlists.adoc
rename to antora/components/docs/modules/ROOT/partials/what-is-apache-causeway/screencasts/playlists.adoc
diff --git a/antora/components/refguide/modules/applib-ant/pages/XmlRootElement.adoc b/antora/components/refguide/modules/applib-ant/pages/XmlRootElement.adoc
index 9b916eef3d..354817fe33 100644
--- a/antora/components/refguide/modules/applib-ant/pages/XmlRootElement.adoc
+++ b/antora/components/refguide/modules/applib-ant/pages/XmlRootElement.adoc
@@ -31,7 +31,8 @@ This adapter converts any references to such domain entities using the `oidDto`
[TIP]
====
The memento string for view models is converted into a form compatible with use within a URL.
-This is performed by the xref:refguide:applib:index/services/urlencoding/UrlEncodingService.adoc[UrlEncodingService], the default implementation of which simply encodes to base 64. If the view model XML graph is too large to be serialized to a string, then an alternative implementation (eg which maps XML strings to a GUID, say) can be configured using the technique described in xref:userguide:btb:hints-and-tips/replacing-default-service-implementations.adoc[here] in the user guide.
+This is performed by the xref:refguide:applib:index/services/urlencoding/UrlEncodingService.adoc[UrlEncodingService], the default implementation of which simply encodes to base 64.
+If the view model XML graph is too large to be serialized to a string, then an alternative implementation (eg which maps XML strings to a GUID, say) can be configured using the technique described in xref:userguide:btb:hints-and-tips.adoc#replacing-default-service-implementations[here] in the user guide.
====
== Example
diff --git a/antora/components/refguide/modules/applib-ant/pages/about.adoc b/antora/components/refguide/modules/applib-ant/pages/about.adoc
index eff4d574de..a75a4dfd94 100644
--- a/antora/components/refguide/modules/applib-ant/pages/about.adoc
+++ b/antora/components/refguide/modules/applib-ant/pages/about.adoc
@@ -11,12 +11,12 @@ It also identifies a number of annotations that are now deprecated, and indicate
The annotations supported by Apache Causeway break out into several categories.
-include::about/main.adoc[leveloffset=+1]
-include::about/other.adoc[leveloffset=+1]
-include::about/jee.adoc[leveloffset=+1]
-include::about/jaxb.adoc[leveloffset=+1]
-include::about/jpa.adoc[leveloffset=+1]
-include::about/jdo.adoc[leveloffset=+1]
+include::partial$about/main.adoc[leveloffset=+1]
+include::partial$about/other.adoc[leveloffset=+1]
+include::partial$about/jee.adoc[leveloffset=+1]
+include::partial$about/jaxb.adoc[leveloffset=+1]
+include::partial$about/jpa.adoc[leveloffset=+1]
+include::partial$about/jdo.adoc[leveloffset=+1]
== Examples
diff --git a/antora/components/refguide/modules/applib-ant/pages/about/hooks/examples.adoc b/antora/components/refguide/modules/applib-ant/pages/about/hooks/examples.adoc
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/antora/components/refguide/modules/applib-ant/pages/about/jaxb.adoc b/antora/components/refguide/modules/applib-ant/partials/about/jaxb.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-ant/pages/about/jaxb.adoc
rename to antora/components/refguide/modules/applib-ant/partials/about/jaxb.adoc
diff --git a/antora/components/refguide/modules/applib-ant/pages/about/jdo.adoc b/antora/components/refguide/modules/applib-ant/partials/about/jdo.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-ant/pages/about/jdo.adoc
rename to antora/components/refguide/modules/applib-ant/partials/about/jdo.adoc
diff --git a/antora/components/refguide/modules/applib-ant/pages/about/jee.adoc b/antora/components/refguide/modules/applib-ant/partials/about/jee.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-ant/pages/about/jee.adoc
rename to antora/components/refguide/modules/applib-ant/partials/about/jee.adoc
diff --git a/antora/components/refguide/modules/applib-ant/pages/about/jpa.adoc b/antora/components/refguide/modules/applib-ant/partials/about/jpa.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-ant/pages/about/jpa.adoc
rename to antora/components/refguide/modules/applib-ant/partials/about/jpa.adoc
diff --git a/antora/components/refguide/modules/applib-ant/pages/about/main.adoc b/antora/components/refguide/modules/applib-ant/partials/about/main.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-ant/pages/about/main.adoc
rename to antora/components/refguide/modules/applib-ant/partials/about/main.adoc
diff --git a/antora/components/refguide/modules/applib-ant/pages/about/other.adoc b/antora/components/refguide/modules/applib-ant/partials/about/other.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-ant/pages/about/other.adoc
rename to antora/components/refguide/modules/applib-ant/partials/about/other.adoc
diff --git a/antora/components/refguide/modules/applib-ant/pages/about/partial.adoc b/antora/components/refguide/modules/applib-ant/partials/about/partial.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-ant/pages/about/partial.adoc
rename to antora/components/refguide/modules/applib-ant/partials/about/partial.adoc
diff --git a/antora/components/refguide/modules/applib-classes/pages/events.adoc b/antora/components/refguide/modules/applib-classes/pages/events.adoc
index 386fc42eb6..0d2f4f23bc 100644
--- a/antora/components/refguide/modules/applib-classes/pages/events.adoc
+++ b/antora/components/refguide/modules/applib-classes/pages/events.adoc
@@ -3,6 +3,6 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-include::events/domainevent.adoc[leveloffset=+1]
-include::events/uievent.adoc[leveloffset=+1]
-include::events/lifecycleevent.adoc[leveloffset=+1]
+include::partial$events/domainevent.adoc[leveloffset=+1]
+include::partial$events/uievent.adoc[leveloffset=+1]
+include::partial$events/lifecycleevent.adoc[leveloffset=+1]
diff --git a/antora/components/refguide/modules/applib-classes/pages/layout.adoc b/antora/components/refguide/modules/applib-classes/pages/layout.adoc
index 53deec6481..72f26650c0 100644
--- a/antora/components/refguide/modules/applib-classes/pages/layout.adoc
+++ b/antora/components/refguide/modules/applib-classes/pages/layout.adoc
@@ -3,5 +3,5 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-include::layout/object-layout.adoc[leveloffset=+1]
-include::layout/menubars.adoc[leveloffset=+1]
+include::partial$layout/object-layout.adoc[leveloffset=+1]
+include::partial$layout/menubars.adoc[leveloffset=+1]
diff --git a/antora/components/refguide/modules/applib-classes/pages/roles-mixins-contributees/contributee.adoc b/antora/components/refguide/modules/applib-classes/pages/roles-mixins-contributees/contributee.adoc
deleted file mode 100644
index e4577554ea..0000000000
--- a/antora/components/refguide/modules/applib-classes/pages/roles-mixins-contributees/contributee.adoc
+++ /dev/null
@@ -1,42 +0,0 @@
-= Contributee
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-:page-partial:
-
-
-The interfaces listed in this chapter act as contributees; they allow domain services to contribute actions/properties/collections to any domain objects that implement these interfaces.
-
-
-
-== Usage Notes
-
-If the interaction is an action that in turn calls other actions by way of xref:refguide:applib:index/services/wrapper/WrapperFactory.adoc[WrapperFactory]), then there may be several member executions, each with a unique sequence number, within the same transaction Id.
-
-The purpose of this interface is to allow mixins to be defined, though the framework itself defines none.
-
-Currently the only implementation of this interface is that for `PublishedObjects` applib interface as defined by the xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber].
-
-
-[[HasUserName]]
-== `HasUsername`
-
-The `HasUsername` interface is a mix-in for domain objects to be associated with a username.
-Other services and modules can then contribute actions/collections to render such additional information relating to the activities of the user.
-
-The interface is defined is:
-
-[source,java]
-----
-public interface HasUsername {
- public String getUsername();
-}
-----
-
-Some of the extension modules that have domain entity/ies that implement this interface are:
-
-* xref:security:ROOT:about.adoc[SecMan extension]: `ApplicationUser` entity
-* xref:security:audittrail:about.adoc[AuditTrail] module: `AuditEntry` entity
-* xref:userguide:commandlog:about.adoc[Command Log] module: `CommandLogEntry` entity
-* xref:userguide:executionlog:about.adoc[Extension Log] module: `ExecutionLogEntry` entity
-* xref:security:sessionlog:about.adoc[Session Log] module: `SessionLogEntry` entity
-
diff --git a/antora/components/refguide/modules/applib-classes/pages/roles-mixins-contributees/mixins.adoc b/antora/components/refguide/modules/applib-classes/pages/roles-mixins-contributees/mixins.adoc
deleted file mode 100644
index 97438cf7f9..0000000000
--- a/antora/components/refguide/modules/applib-classes/pages/roles-mixins-contributees/mixins.adoc
+++ /dev/null
@@ -1,61 +0,0 @@
-= Mixins (and Mixees)
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-:page-partial:
-
-
-This section defines a number of interfaces that define a contract for some framework-defined mixins.
-
-[TIP]
-====
-See the xref:userguide:fun:overview.adoc#mixins[fundamentals user guide] for a discussion of mixins.
-====
-
-
-[#java-lang-object]
-== java.lang.Object
-
-The framework provides a number of mixins that contributes to `java.lang.Object` (in other words, to every domain object):
-
-* core
-** xref:refguide:applib:index/mixins/layout/Object_downloadLayout.adoc[Object_downloadLayout]
-
-* Wicket viewer:
-** xref:refguide:viewer:index/wicket/applib/mixins/Object_clearHints.adoc[Object_clearHints]
-
-
-
-[[Dto]]
-== Dto
-
-JAXB view models can optionally implement the `Dto` interface.
-Two mixins contribute to this interface:
-
-* xref:refguide:applib:index/mixins/dto/Dto_downloadXml.adoc[Dto_downloadXml]
-* xref:refguide:applib:index/mixins/dto/Dto_downloadXsd.adoc[Dto_downloadXsd]
-
-These allow the view model/DTO to be seriailized, respectively, as XML and as the XSD schema for said XML.
-
-
-[[Persistable]]
-== Persistable
-
-
-All JDO domain entities implement the DataNucleus `Persistable` role interface as a result of the enhancer process (the fully qualified class name is `org.datanucleus.enhancement.Persistable`).
-
-Using this, the following mixins (actions and properties) are available for all JDO entities:
-
-* xref:refguide:persistence:index/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.adoc[Persistable_datanucleusVersionLong] (property)
-+
-only visible if the entity is annotated with `javax.jdo.annotations.Version` and the `version` field introduced by enhancing can be cast to `Long`.
-
-* xref:refguide:persistence:index/jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.adoc[Persistable_datanucleusVersionLong] (property)
-+
-only visible if the entity is annotated with `javax.jdo.annotations.Version` and the `version` field introduced by enhancing can be cast to `java.sql.Timestamp`.
-
-As a developer you do not need to write any code to obtain the mixins that contribute to this interface.
-
-These mixin properties/actions are all associated with the "Metadata" fieldset.
-
-
-
diff --git a/antora/components/refguide/modules/applib-classes/pages/spec.adoc b/antora/components/refguide/modules/applib-classes/pages/spec.adoc
index e361d86666..4669288aef 100644
--- a/antora/components/refguide/modules/applib-classes/pages/spec.adoc
+++ b/antora/components/refguide/modules/applib-classes/pages/spec.adoc
@@ -17,7 +17,7 @@ The heart of the support for this pattern is the `Specification` interface:
[source,java]
----
public interface Specification {
- public String satisfies(Object obj); // <1>
+ String satisfies(Object obj); // <1>
}
----
<1> if returns `null`, then the constraint is satisfies; otherwise returns the reason why the constraint has not been satisfied.
diff --git a/antora/components/refguide/modules/applib-classes/pages/value-types.adoc b/antora/components/refguide/modules/applib-classes/pages/value-types.adoc
index 6baa60ebb5..274fce3ac6 100644
--- a/antora/components/refguide/modules/applib-classes/pages/value-types.adoc
+++ b/antora/components/refguide/modules/applib-classes/pages/value-types.adoc
@@ -54,3 +54,12 @@ The framework also defines a number of custom value types:
In addition, there are a number of non-core value types that can be brought in individually.
These can be found in the catalog of xref:valuetypes:ROOT:about.adoc[Value Types].
+
+
+
+// TODO: x-ref to section on how to write own value types.
+//
+//== Custom value types
+//
+//It is also possible to write your own value types, either scalar or composite.
+
diff --git a/antora/components/refguide/modules/applib-classes/pages/events/domainevent.adoc b/antora/components/refguide/modules/applib-classes/partials/events/domainevent.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-classes/pages/events/domainevent.adoc
rename to antora/components/refguide/modules/applib-classes/partials/events/domainevent.adoc
diff --git a/antora/components/refguide/modules/applib-classes/pages/events/lifecycleevent.adoc b/antora/components/refguide/modules/applib-classes/partials/events/lifecycleevent.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-classes/pages/events/lifecycleevent.adoc
rename to antora/components/refguide/modules/applib-classes/partials/events/lifecycleevent.adoc
diff --git a/antora/components/refguide/modules/applib-classes/pages/events/uievent.adoc b/antora/components/refguide/modules/applib-classes/partials/events/uievent.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-classes/pages/events/uievent.adoc
rename to antora/components/refguide/modules/applib-classes/partials/events/uievent.adoc
diff --git a/antora/components/refguide/modules/applib-classes/pages/layout/column-order.adoc b/antora/components/refguide/modules/applib-classes/partials/layout/column-order.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-classes/pages/layout/column-order.adoc
rename to antora/components/refguide/modules/applib-classes/partials/layout/column-order.adoc
diff --git a/antora/components/refguide/modules/applib-classes/pages/layout/menubars.adoc b/antora/components/refguide/modules/applib-classes/partials/layout/menubars.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-classes/pages/layout/menubars.adoc
rename to antora/components/refguide/modules/applib-classes/partials/layout/menubars.adoc
diff --git a/antora/components/refguide/modules/applib-classes/pages/layout/object-layout.adoc b/antora/components/refguide/modules/applib-classes/partials/layout/object-layout.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-classes/pages/layout/object-layout.adoc
rename to antora/components/refguide/modules/applib-classes/partials/layout/object-layout.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/lifecycle.adoc b/antora/components/refguide/modules/applib-methods/pages/lifecycle.adoc
index 088786c11b..6829912f92 100644
--- a/antora/components/refguide/modules/applib-methods/pages/lifecycle.adoc
+++ b/antora/components/refguide/modules/applib-methods/pages/lifecycle.adoc
@@ -50,10 +50,10 @@ equivalent
Further discussion on using events and a subscriber (which will result in a more flexible/decoupled design) can be found xref:applib-classes:events.adoc#lifecycle-events[here].
-include::lifecycle/created.adoc[leveloffset=+1]
-include::lifecycle/loaded.adoc[leveloffset=+1]
-include::lifecycle/persisting.adoc[leveloffset=+1]
-include::lifecycle/persisted.adoc[leveloffset=+1]
-include::lifecycle/updating.adoc[leveloffset=+1]
-include::lifecycle/updated.adoc[leveloffset=+1]
-include::lifecycle/removing.adoc[leveloffset=+1]
+include::partial$lifecycle/created.adoc[leveloffset=+1]
+include::partial$lifecycle/loaded.adoc[leveloffset=+1]
+include::partial$lifecycle/persisting.adoc[leveloffset=+1]
+include::partial$lifecycle/persisted.adoc[leveloffset=+1]
+include::partial$lifecycle/updating.adoc[leveloffset=+1]
+include::partial$lifecycle/updated.adoc[leveloffset=+1]
+include::partial$lifecycle/removing.adoc[leveloffset=+1]
diff --git a/antora/components/refguide/modules/applib-methods/pages/prefixes.adoc b/antora/components/refguide/modules/applib-methods/pages/prefixes.adoc
index a29a690e98..a416d2c9e2 100644
--- a/antora/components/refguide/modules/applib-methods/pages/prefixes.adoc
+++ b/antora/components/refguide/modules/applib-methods/pages/prefixes.adoc
@@ -116,11 +116,11 @@ A suitable error message is logged so that the issue can be easily diagnosed.
====
-include::prefixes/autoComplete.adoc[leveloffset=+1]
-include::prefixes/choices.adoc[leveloffset=+1]
-include::prefixes/default.adoc[leveloffset=+1]
-include::prefixes/disable.adoc[leveloffset=+1]
-include::prefixes/get.adoc[leveloffset=+1]
-include::prefixes/hide.adoc[leveloffset=+1]
-include::prefixes/set.adoc[leveloffset=+1]
-include::prefixes/validate.adoc[leveloffset=+1]
+include::partial$prefixes/autoComplete.adoc[leveloffset=+1]
+include::partial$prefixes/choices.adoc[leveloffset=+1]
+include::partial$prefixes/default.adoc[leveloffset=+1]
+include::partial$prefixes/disable.adoc[leveloffset=+1]
+include::partial$prefixes/get.adoc[leveloffset=+1]
+include::partial$prefixes/hide.adoc[leveloffset=+1]
+include::partial$prefixes/set.adoc[leveloffset=+1]
+include::partial$prefixes/validate.adoc[leveloffset=+1]
diff --git a/antora/components/refguide/modules/applib-methods/pages/ui-hints.adoc b/antora/components/refguide/modules/applib-methods/pages/ui-hints.adoc
index 9cf38024e0..b2346b0b6c 100644
--- a/antora/components/refguide/modules/applib-methods/pages/ui-hints.adoc
+++ b/antora/components/refguide/modules/applib-methods/pages/ui-hints.adoc
@@ -33,7 +33,7 @@ If null or no such layout, then uses to the default layout.
-include::ui-hints/cssClass.adoc[leveloffset=+1]
-include::ui-hints/iconName.adoc[leveloffset=+1]
-include::ui-hints/layout.adoc[leveloffset=+1]
-include::ui-hints/title.adoc[leveloffset=+1]
+include::partial$ui-hints/cssClass.adoc[leveloffset=+1]
+include::partial$ui-hints/iconName.adoc[leveloffset=+1]
+include::partial$ui-hints/layout.adoc[leveloffset=+1]
+include::partial$ui-hints/title.adoc[leveloffset=+1]
diff --git a/antora/components/refguide/modules/applib-methods/pages/lifecycle/created.adoc b/antora/components/refguide/modules/applib-methods/partials/lifecycle/created.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/lifecycle/created.adoc
rename to antora/components/refguide/modules/applib-methods/partials/lifecycle/created.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/lifecycle/loaded.adoc b/antora/components/refguide/modules/applib-methods/partials/lifecycle/loaded.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/lifecycle/loaded.adoc
rename to antora/components/refguide/modules/applib-methods/partials/lifecycle/loaded.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/lifecycle/persisted.adoc b/antora/components/refguide/modules/applib-methods/partials/lifecycle/persisted.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/lifecycle/persisted.adoc
rename to antora/components/refguide/modules/applib-methods/partials/lifecycle/persisted.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/lifecycle/persisting.adoc b/antora/components/refguide/modules/applib-methods/partials/lifecycle/persisting.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/lifecycle/persisting.adoc
rename to antora/components/refguide/modules/applib-methods/partials/lifecycle/persisting.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/lifecycle/removing.adoc b/antora/components/refguide/modules/applib-methods/partials/lifecycle/removing.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/lifecycle/removing.adoc
rename to antora/components/refguide/modules/applib-methods/partials/lifecycle/removing.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/lifecycle/updated.adoc b/antora/components/refguide/modules/applib-methods/partials/lifecycle/updated.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/lifecycle/updated.adoc
rename to antora/components/refguide/modules/applib-methods/partials/lifecycle/updated.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/lifecycle/updating.adoc b/antora/components/refguide/modules/applib-methods/partials/lifecycle/updating.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/lifecycle/updating.adoc
rename to antora/components/refguide/modules/applib-methods/partials/lifecycle/updating.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/prefixes/autoComplete.adoc b/antora/components/refguide/modules/applib-methods/partials/prefixes/autoComplete.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/prefixes/autoComplete.adoc
rename to antora/components/refguide/modules/applib-methods/partials/prefixes/autoComplete.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/prefixes/choices.adoc b/antora/components/refguide/modules/applib-methods/partials/prefixes/choices.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/prefixes/choices.adoc
rename to antora/components/refguide/modules/applib-methods/partials/prefixes/choices.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/prefixes/default.adoc b/antora/components/refguide/modules/applib-methods/partials/prefixes/default.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/prefixes/default.adoc
rename to antora/components/refguide/modules/applib-methods/partials/prefixes/default.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/prefixes/disable.adoc b/antora/components/refguide/modules/applib-methods/partials/prefixes/disable.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/prefixes/disable.adoc
rename to antora/components/refguide/modules/applib-methods/partials/prefixes/disable.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/prefixes/get.adoc b/antora/components/refguide/modules/applib-methods/partials/prefixes/get.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/prefixes/get.adoc
rename to antora/components/refguide/modules/applib-methods/partials/prefixes/get.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/prefixes/hide.adoc b/antora/components/refguide/modules/applib-methods/partials/prefixes/hide.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/prefixes/hide.adoc
rename to antora/components/refguide/modules/applib-methods/partials/prefixes/hide.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/prefixes/set.adoc b/antora/components/refguide/modules/applib-methods/partials/prefixes/set.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/prefixes/set.adoc
rename to antora/components/refguide/modules/applib-methods/partials/prefixes/set.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/prefixes/validate.adoc b/antora/components/refguide/modules/applib-methods/partials/prefixes/validate.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/prefixes/validate.adoc
rename to antora/components/refguide/modules/applib-methods/partials/prefixes/validate.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/ui-hints/cssClass.adoc b/antora/components/refguide/modules/applib-methods/partials/ui-hints/cssClass.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/ui-hints/cssClass.adoc
rename to antora/components/refguide/modules/applib-methods/partials/ui-hints/cssClass.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/ui-hints/iconName.adoc b/antora/components/refguide/modules/applib-methods/partials/ui-hints/iconName.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/ui-hints/iconName.adoc
rename to antora/components/refguide/modules/applib-methods/partials/ui-hints/iconName.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/ui-hints/layout.adoc b/antora/components/refguide/modules/applib-methods/partials/ui-hints/layout.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/ui-hints/layout.adoc
rename to antora/components/refguide/modules/applib-methods/partials/ui-hints/layout.adoc
diff --git a/antora/components/refguide/modules/applib-methods/pages/ui-hints/title.adoc b/antora/components/refguide/modules/applib-methods/partials/ui-hints/title.adoc
similarity index 100%
rename from antora/components/refguide/modules/applib-methods/pages/ui-hints/title.adoc
rename to antora/components/refguide/modules/applib-methods/partials/ui-hints/title.adoc
diff --git a/antora/components/refguide/modules/applib-svc/pages/about.adoc b/antora/components/refguide/modules/applib-svc/pages/about.adoc
index 26356d46e7..d09c7546af 100644
--- a/antora/components/refguide/modules/applib-svc/pages/about.adoc
+++ b/antora/components/refguide/modules/applib-svc/pages/about.adoc
@@ -155,7 +155,7 @@ In the majority of cases there is likely to be just a single top-level node of t
* the xref:refguide:applib:index/services/iactn/Interaction.adoc[Interaction] also holds a reference to the xref:refguide:applib:index/services/command/Command.adoc[Command], which represents the top-level intention to invoke the action / edit the property.
-* before and after each action invocation/property edit, a xref:applib-classes:events/domainevent.adoc[domain event] is may be broadcast to all subscribers.
+* before and after each action invocation/property edit, a xref:applib-classes:events.adoc#domain-event-classes[domain event] is may be broadcast to all subscribers.
Whether this occurs depends on whether the action/property has been annotated (using xref:refguide:applib:index/annotation/Action.adoc#domainEvent[@Action#domainEvent()] or xref:refguide:applib:index/annotation/Property.adoc#domainEvent[@Property#domainEvent()]).
+
(Note that subscribers will also receive events for vetoing the action/property; this is not shown on the diagram).
diff --git a/antora/components/relnotes/modules/ROOT/nav.adoc b/antora/components/relnotes/modules/ROOT/nav.adoc
index 990162e7cc..0577bc05f9 100644
--- a/antora/components/relnotes/modules/ROOT/nav.adoc
+++ b/antora/components/relnotes/modules/ROOT/nav.adoc
@@ -3,7 +3,8 @@
* 2023
-** xref:relnotes:ROOT:2022/2.0.0-RC1/relnotes.adoc[2.0.0-RC1]
+** xref:relnotes:ROOT:2023/2.0.0-RC2/relnotes.adoc[2.0.0-RC2]
+** xref:relnotes:ROOT:2023/2.0.0-RC1/relnotes.adoc[2.0.0-RC1]
* 2022
** xref:relnotes:ROOT:2022/2.0.0-M9/relnotes.adoc[2.0.0-M9]
** xref:relnotes:ROOT:2022/2.0.0-M8/relnotes.adoc[2.0.0-M8]
diff --git a/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes.adoc
index 57f5944524..0d58ec2dc3 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes.adoc
@@ -4,12 +4,12 @@
:page-partial:
-include::mignotes/meta-annotations.adoc[leveloffset=+1]
-include::mignotes/updated-annotations.adoc[leveloffset=+1]
-include::mignotes/removed-annotations.adoc[leveloffset=+1]
-include::mignotes/moved-types.adoc[leveloffset=+1]
-include::mignotes/removed-configuration-properties.adoc[leveloffset=+1]
-include::mignotes/updated-classes.adoc[leveloffset=+1]
-include::mignotes/removed-types.adoc[leveloffset=+1]
-include::mignotes/other-changes.adoc[leveloffset=+1]
+include::partial$2018/2.0.0-M1/mignotes/meta-annotations.adoc[leveloffset=+1]
+include::partial$2018/2.0.0-M1/mignotes/updated-annotations.adoc[leveloffset=+1]
+include::partial$2018/2.0.0-M1/mignotes/removed-annotations.adoc[leveloffset=+1]
+include::partial$2018/2.0.0-M1/mignotes/moved-types.adoc[leveloffset=+1]
+include::partial$2018/2.0.0-M1/mignotes/removed-configuration-properties.adoc[leveloffset=+1]
+include::partial$2018/2.0.0-M1/mignotes/updated-classes.adoc[leveloffset=+1]
+include::partial$2018/2.0.0-M1/mignotes/removed-types.adoc[leveloffset=+1]
+include::partial$2018/2.0.0-M1/mignotes/other-changes.adoc[leveloffset=+1]
diff --git a/antora/components/relnotes/modules/ROOT/pages/about.adoc b/antora/components/relnotes/modules/ROOT/pages/about.adoc
index 412109e60c..cf9de57d0d 100644
--- a/antora/components/relnotes/modules/ROOT/pages/about.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/about.adoc
@@ -17,6 +17,16 @@ This table summarises all releases of Apache Causeway v2.0 to date.
| Bugs
| Detail
+| 2.0.0-RC2
+| not yet released
+| Second release candidate for Apache Causeway 2.0.0.
+| ?
+| ?
+| ?
+|
+* xref:relnotes:ROOT:2023/2.0.0-RC2/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2023/2.0.0-RC2/mignotes.adoc[Migration Notes]
+
| 2.0.0-RC1
| 25-Mar-2023
| First release candidate for Apache Causeway 2.0.0. Project renamed.
diff --git a/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/meta-annotations.adoc b/antora/components/relnotes/modules/ROOT/partials/2018/2.0.0-M1/mignotes/meta-annotations.adoc
similarity index 100%
rename from antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/meta-annotations.adoc
rename to antora/components/relnotes/modules/ROOT/partials/2018/2.0.0-M1/mignotes/meta-annotations.adoc
diff --git a/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/moved-types.adoc b/antora/components/relnotes/modules/ROOT/partials/2018/2.0.0-M1/mignotes/moved-types.adoc
similarity index 100%
rename from antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/moved-types.adoc
rename to antora/components/relnotes/modules/ROOT/partials/2018/2.0.0-M1/mignotes/moved-types.adoc
diff --git a/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/other-changes.adoc b/antora/components/relnotes/modules/ROOT/partials/2018/2.0.0-M1/mignotes/other-changes.adoc
similarity index 100%
rename from antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/other-changes.adoc
rename to antora/components/relnotes/modules/ROOT/partials/2018/2.0.0-M1/mignotes/other-changes.adoc
diff --git a/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/removed-annotations.adoc b/antora/components/relnotes/modules/ROOT/partials/2018/2.0.0-M1/mignotes/removed-annotations.adoc
similarity index 100%
rename from antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/removed-annotations.adoc
rename to antora/components/relnotes/modules/ROOT/partials/2018/2.0.0-M1/mignotes/removed-annotations.adoc
diff --git a/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/removed-configuration-properties.adoc b/antora/components/relnotes/modules/ROOT/partials/2018/2.0.0-M1/mignotes/removed-configuration-properties.adoc
similarity index 100%
rename from antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/removed-configuration-properties.adoc
rename to antora/components/relnotes/modules/ROOT/partials/2018/2.0.0-M1/mignotes/removed-configuration-properties.adoc
diff --git a/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/removed-types.adoc b/antora/components/relnotes/modules/ROOT/partials/2018/2.0.0-M1/mignotes/removed-types.adoc
similarity index 100%
rename from antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/removed-types.adoc
rename to antora/components/relnotes/modules/ROOT/partials/2018/2.0.0-M1/mignotes/removed-types.adoc
diff --git a/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/updated-annotations.adoc b/antora/components/relnotes/modules/ROOT/partials/2018/2.0.0-M1/mignotes/updated-annotations.adoc
similarity index 100%
rename from antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/updated-annotations.adoc
rename to antora/components/relnotes/modules/ROOT/partials/2018/2.0.0-M1/mignotes/updated-annotations.adoc
diff --git a/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/updated-classes.adoc b/antora/components/relnotes/modules/ROOT/partials/2018/2.0.0-M1/mignotes/updated-classes.adoc
similarity index 100%
rename from antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/updated-classes.adoc
rename to antora/components/relnotes/modules/ROOT/partials/2018/2.0.0-M1/mignotes/updated-classes.adoc
diff --git a/antora/components/setupguide/modules/intellij/nav.adoc b/antora/components/setupguide/modules/intellij/nav.adoc
index f676c8fcac..9071724a4a 100644
--- a/antora/components/setupguide/modules/intellij/nav.adoc
+++ b/antora/components/setupguide/modules/intellij/nav.adoc
@@ -2,3 +2,4 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
* xref:setupguide:intellij:about.adoc[Using IntelliJ]
+** xref:setupguide:intellij:hints-and-tips.adoc[]
diff --git a/antora/components/setupguide/modules/intellij/pages/hints-and-tips.adoc b/antora/components/setupguide/modules/intellij/pages/hints-and-tips.adoc
index 0206d77326..b1db23d94d 100644
--- a/antora/components/setupguide/modules/intellij/pages/hints-and-tips.adoc
+++ b/antora/components/setupguide/modules/intellij/pages/hints-and-tips.adoc
@@ -6,6 +6,7 @@
== Keyboard Cheat Sheets
You can download 1-page PDFs cheat sheets for IntelliJ's keyboard shortcuts:
+
* for link:https://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard.pdf[Windows]
* for link:https://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard_Mac.pdf[MacOS]
@@ -60,7 +61,7 @@ Viewing the structure (ie outline) of a class
** if you have some text selected (or even some lines), it'll actually duplicate the entire selection
* to delete a line, it's `ctrl-X`
* to move a line up or down: `shift-alt-up` and `shift-alt-down`
-** if you have selected several lines, it'll move them all togethe
+** if you have selected several lines, it'll move them all together
* `ctrl-shift-J` can be handy for joining lines together
** just hit enter to split them apart (even in string quotes; IntelliJ will "do the right thing")
@@ -92,17 +93,15 @@ If you can't remember all those shortcuts, just use `ctrl-shift-alt-T` (might wa
== Troubleshooting
-When a Maven module is imported, IntelliJ generates its own project files (suffix `.ipr`), and the application is actually built from that.
+When a Maven module is imported, IntelliJ generates its own project files, and the application is actually built from that.
Occasionally these don't keep in sync (even if auto-import of Maven modules has been enabled).
To fix the issue, try:
-* reimport module
-* rebuild selected modules/entire project
-* remove and then re-add the project
+* go into PowerSafe mode, rebuild all from mvn command line, back into regular mode
+* reimport all modules
* restart, invalidating caches
-* hit StackOverflow (!)
One thing worth knowing; IntelliJ actively scans the filesystem all the time.
It's therefore (almost always) fine to build the app from the Maven command line; IntelliJ will detect the changes and keep in sync.
diff --git a/antora/components/setupguide/modules/intellij/partials/UNUSED/coding-standards.adoc b/antora/components/setupguide/modules/intellij/partials/coding-standards.txt
similarity index 99%
rename from antora/components/setupguide/modules/intellij/partials/UNUSED/coding-standards.adoc
rename to antora/components/setupguide/modules/intellij/partials/coding-standards.txt
index f347a65ae0..30f870016a 100644
--- a/antora/components/setupguide/modules/intellij/partials/UNUSED/coding-standards.adoc
+++ b/antora/components/setupguide/modules/intellij/partials/coding-standards.txt
@@ -2,6 +2,8 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+// LATER
+
CAUTION: seem to have mislaid this file... would need verifying/updating anyway, I think.
Next, we suggest you import settings for standard ASF/Apache Causeway coding conventions.
diff --git a/antora/components/setupguide/modules/intellij/partials/UNUSED/faster-turnaround-times.adoc b/antora/components/setupguide/modules/intellij/partials/faster-turnaround-times.txt
similarity index 99%
rename from antora/components/setupguide/modules/intellij/partials/UNUSED/faster-turnaround-times.adoc
rename to antora/components/setupguide/modules/intellij/partials/faster-turnaround-times.txt
index 62fb43d8b2..f618465643 100644
--- a/antora/components/setupguide/modules/intellij/partials/UNUSED/faster-turnaround-times.adoc
+++ b/antora/components/setupguide/modules/intellij/partials/faster-turnaround-times.txt
@@ -1,6 +1,9 @@
= Faster Turnaround Times
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+
+// LATER
+
This section describes how to install and setup JetBrains' IntelliJ IDEA, then how to import an application into IntelliJ and run it.
diff --git a/antora/components/setupguide/modules/intellij/partials/UNUSED/file-templates.adoc b/antora/components/setupguide/modules/intellij/partials/file-templates.txt
similarity index 99%
rename from antora/components/setupguide/modules/intellij/partials/UNUSED/file-templates.adoc
rename to antora/components/setupguide/modules/intellij/partials/file-templates.txt
index 8ffcf775b7..f4b68d23d2 100644
--- a/antora/components/setupguide/modules/intellij/partials/UNUSED/file-templates.adoc
+++ b/antora/components/setupguide/modules/intellij/partials/file-templates.txt
@@ -4,6 +4,8 @@
:page-partial:
+// LATER
+
Next we recommend you import a set of standard file templates.
These are used to create new classes or supporting files:
diff --git a/antora/components/setupguide/modules/intellij/partials/UNUSED/live-templates.adoc b/antora/components/setupguide/modules/intellij/partials/live-templates.txt
similarity index 99%
rename from antora/components/setupguide/modules/intellij/partials/UNUSED/live-templates.adoc
rename to antora/components/setupguide/modules/intellij/partials/live-templates.txt
index 2060709022..2bd91d151f 100644
--- a/antora/components/setupguide/modules/intellij/partials/UNUSED/live-templates.adoc
+++ b/antora/components/setupguide/modules/intellij/partials/live-templates.txt
@@ -3,6 +3,8 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+// LATER
+
We also recommend you import a set of live templates.
These are used to add new methods to existing classes:
diff --git a/antora/components/tutorials/modules/petclinic/pages/040-pet-entity.adoc b/antora/components/tutorials/modules/petclinic/pages/040-pet-entity.adoc
index 603d57d211..00bebb3cb8 100644
--- a/antora/components/tutorials/modules/petclinic/pages/040-pet-entity.adoc
+++ b/antora/components/tutorials/modules/petclinic/pages/040-pet-entity.adoc
@@ -465,7 +465,7 @@ Let's now add some validation to ensure that two pets with the same name cannot
Optional<Pet> findByPetOwnerAndName(PetOwner petOwner, String name);
----
-* Now use a supporting xref:userguide:fun:business-rules/validity.adoc[validate] method to prevent two pets with the same name from being added:
+* Now use a supporting xref:userguide:fun:business-rules.adoc#validity[validate] method to prevent two pets with the same name from being added:
+
[source,java]
.PetOwner_addPet.java
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips.adoc
index 0862f95d58..e9f3a8f331 100644
--- a/antora/components/userguide/modules/btb/pages/hints-and-tips.adoc
+++ b/antora/components/userguide/modules/btb/pages/hints-and-tips.adoc
@@ -10,15 +10,15 @@ This chapter provides some solutions for problems we've encountered ourselves or
-include::hints-and-tips/are-you-sure.adoc[leveloffset=+1]
-include::hints-and-tips/custom-css.adoc[leveloffset=+1]
-include::hints-and-tips/replacing-default-service-implementations.adoc[leveloffset=+1]
+include::partial$hints-and-tips/are-you-sure.adoc[leveloffset=+1]
+include::partial$hints-and-tips/custom-css.adoc[leveloffset=+1]
+include::partial$hints-and-tips/replacing-default-service-implementations.adoc[leveloffset=+1]
-include::hints-and-tips/vetoing-visibility.adoc[leveloffset=+1]
+include::partial$hints-and-tips/vetoing-visibility.adoc[leveloffset=+1]
-include::hints-and-tips/transactions-and-errors.adoc[leveloffset=+1]
-include::hints-and-tips/persisted-title.adoc[leveloffset=+1]
+include::partial$hints-and-tips/transactions-and-errors.adoc[leveloffset=+1]
+include::partial$hints-and-tips/persisted-title.adoc[leveloffset=+1]
-include::hints-and-tips/how-to-handle-void-and-null-results.adoc[leveloffset=+1]
-include::hints-and-tips/subclass-properties-in-tables.adoc[leveloffset=+1]
-include::hints-and-tips/how-to-implement-a-spellchecker.adoc[leveloffset=+1]
+include::partial$hints-and-tips/how-to-handle-void-and-null-results.adoc[leveloffset=+1]
+include::partial$hints-and-tips/subclass-properties-in-tables.adoc[leveloffset=+1]
+include::partial$hints-and-tips/how-to-implement-a-spellchecker.adoc[leveloffset=+1]
diff --git a/antora/components/userguide/modules/btb/pages/programming-model.adoc b/antora/components/userguide/modules/btb/pages/programming-model.adoc
index 17b5f4f0c6..67c8184f95 100644
--- a/antora/components/userguide/modules/btb/pages/programming-model.adoc
+++ b/antora/components/userguide/modules/btb/pages/programming-model.adoc
@@ -9,5 +9,5 @@ This chapter explains the main APIs to extend or alter the programming conventio
build up its metamodel.
-include::programming-model/custom-validator.adoc[leveloffset=+1]
-include::programming-model/finetuning.adoc[leveloffset=+1]
+include::partial$programming-model/custom-validator.adoc[leveloffset=+1]
+include::partial$programming-model/finetuning.adoc[leveloffset=+1]
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/are-you-sure.adoc b/antora/components/userguide/modules/btb/partials/hints-and-tips/are-you-sure.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/are-you-sure.adoc
rename to antora/components/userguide/modules/btb/partials/hints-and-tips/are-you-sure.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/custom-css.adoc b/antora/components/userguide/modules/btb/partials/hints-and-tips/custom-css.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/custom-css.adoc
rename to antora/components/userguide/modules/btb/partials/hints-and-tips/custom-css.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc b/antora/components/userguide/modules/btb/partials/hints-and-tips/how-to-handle-void-and-null-results.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
rename to antora/components/userguide/modules/btb/partials/hints-and-tips/how-to-handle-void-and-null-results.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc b/antora/components/userguide/modules/btb/partials/hints-and-tips/how-to-implement-a-spellchecker.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
rename to antora/components/userguide/modules/btb/partials/hints-and-tips/how-to-implement-a-spellchecker.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/persisted-title.adoc b/antora/components/userguide/modules/btb/partials/hints-and-tips/persisted-title.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/persisted-title.adoc
rename to antora/components/userguide/modules/btb/partials/hints-and-tips/persisted-title.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc b/antora/components/userguide/modules/btb/partials/hints-and-tips/replacing-default-service-implementations.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
rename to antora/components/userguide/modules/btb/partials/hints-and-tips/replacing-default-service-implementations.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc b/antora/components/userguide/modules/btb/partials/hints-and-tips/subclass-properties-in-tables.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc
rename to antora/components/userguide/modules/btb/partials/hints-and-tips/subclass-properties-in-tables.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc b/antora/components/userguide/modules/btb/partials/hints-and-tips/transactions-and-errors.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
rename to antora/components/userguide/modules/btb/partials/hints-and-tips/transactions-and-errors.adoc
diff --git a/antora/components/userguide/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc b/antora/components/userguide/modules/btb/partials/hints-and-tips/vetoing-visibility.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
rename to antora/components/userguide/modules/btb/partials/hints-and-tips/vetoing-visibility.adoc
diff --git a/antora/components/userguide/modules/btb/pages/programming-model/custom-validator.adoc b/antora/components/userguide/modules/btb/partials/programming-model/custom-validator.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/programming-model/custom-validator.adoc
rename to antora/components/userguide/modules/btb/partials/programming-model/custom-validator.adoc
diff --git a/antora/components/userguide/modules/btb/pages/programming-model/finetuning.adoc b/antora/components/userguide/modules/btb/partials/programming-model/finetuning.adoc
similarity index 100%
rename from antora/components/userguide/modules/btb/pages/programming-model/finetuning.adoc
rename to antora/components/userguide/modules/btb/partials/programming-model/finetuning.adoc
diff --git a/antora/components/userguide/modules/fun/pages/concepts-patterns.adoc b/antora/components/userguide/modules/fun/pages/concepts-patterns.adoc
index 3fc08c18ad..8812cfb275 100644
--- a/antora/components/userguide/modules/fun/pages/concepts-patterns.adoc
+++ b/antora/components/userguide/modules/fun/pages/concepts-patterns.adoc
@@ -6,10 +6,10 @@
This introductory chapter should give you a good about what Apache Causeway actually *is*: the ideas and principles that it builds upon, what its core values are, its architecture, how it compares to other architectural approaches other frameworks, and how it can be deployed.
-include::concepts-patterns/domain-driven-design.adoc[leveloffset=+1]
-include::concepts-patterns/naked-objects-pattern.adoc[leveloffset=+1]
-include::concepts-patterns/core-values.adoc[leveloffset=+1]
-include::concepts-patterns/architecture.adoc[leveloffset=+1]
-include::concepts-patterns/metamodel.adoc[leveloffset=+1]
-include::concepts-patterns/apache-causeway-vs-cqrs-and-event-sourcing.adoc[leveloffset=+1]
-include::concepts-patterns/deployment-options.adoc[leveloffset=+1]
+include::partial$concepts-patterns/domain-driven-design.adoc[leveloffset=+1]
+include::partial$concepts-patterns/naked-objects-pattern.adoc[leveloffset=+1]
+include::partial$concepts-patterns/core-values.adoc[leveloffset=+1]
+include::partial$concepts-patterns/architecture.adoc[leveloffset=+1]
+include::partial$concepts-patterns/metamodel.adoc[leveloffset=+1]
+include::partial$concepts-patterns/apache-causeway-vs-cqrs-and-event-sourcing.adoc[leveloffset=+1]
+include::partial$concepts-patterns/deployment-options.adoc[leveloffset=+1]
diff --git a/antora/components/userguide/modules/fun/pages/domain-entities-and-services.adoc b/antora/components/userguide/modules/fun/pages/domain-entities-and-services.adoc
index ada104f022..2af0b9bed2 100644
--- a/antora/components/userguide/modules/fun/pages/domain-entities-and-services.adoc
+++ b/antora/components/userguide/modules/fun/pages/domain-entities-and-services.adoc
@@ -9,8 +9,8 @@ This section describes entities using JDO annotations, but (the more widely used
See the xref:pjdo:ROOT:about.adoc[JDO/DataNucleus] and xref:pjpa:ROOT:about.adoc[JPA/Eclipselink] documentation for more details on how to configure one or the other.
====
-include::domain-entities-and-services/domain-entities.adoc[leveloffset=+1]
-include::domain-entities-and-services/domain-services.adoc[leveloffset=+1]
-include::domain-entities-and-services/inject-services.adoc[leveloffset=+1]
-include::domain-entities-and-services/crud.adoc[leveloffset=+1]
+include::partial$domain-entities-and-services/domain-entities.adoc[leveloffset=+1]
+include::partial$domain-entities-and-services/domain-services.adoc[leveloffset=+1]
+include::partial$domain-entities-and-services/inject-services.adoc[leveloffset=+1]
+include::partial$domain-entities-and-services/crud.adoc[leveloffset=+1]
diff --git a/antora/components/userguide/modules/fun/pages/object-members.adoc b/antora/components/userguide/modules/fun/pages/object-members.adoc
index 9c1177a154..97324aaf83 100644
--- a/antora/components/userguide/modules/fun/pages/object-members.adoc
+++ b/antora/components/userguide/modules/fun/pages/object-members.adoc
@@ -3,6 +3,6 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-include::object-members/properties.adoc[leveloffset=+1]
-include::object-members/collections.adoc[leveloffset=+1]
-include::object-members/actions.adoc[leveloffset=+1]
+include::partial$object-members/properties.adoc[leveloffset=+1]
+include::partial$object-members/collections.adoc[leveloffset=+1]
+include::partial$object-members/actions.adoc[leveloffset=+1]
diff --git a/antora/components/userguide/modules/fun/pages/overview.adoc b/antora/components/userguide/modules/fun/pages/overview.adoc
index 710e6b857f..9fd83ad515 100644
--- a/antora/components/userguide/modules/fun/pages/overview.adoc
+++ b/antora/components/userguide/modules/fun/pages/overview.adoc
@@ -5,12 +5,12 @@
In this section we run through the main building blocks that make up an Apache Causeway application.
-include::overview/types-of-domain-objects.adoc[leveloffset=+1]
-include::overview/identifiers.adoc[leveloffset=+1]
-include::overview/object-members.adoc[leveloffset=+1]
-include::overview/business-rules.adoc[leveloffset=+1]
-include::overview/events.adoc[leveloffset=+1]
-include::overview/modules.adoc[leveloffset=+1]
-include::overview/programming-model.adoc[leveloffset=+1]
+include::partial$overview/types-of-domain-objects.adoc[leveloffset=+1]
+include::partial$overview/identifiers.adoc[leveloffset=+1]
+include::partial$overview/object-members.adoc[leveloffset=+1]
+include::partial$overview/business-rules.adoc[leveloffset=+1]
+include::partial$overview/events.adoc[leveloffset=+1]
+include::partial$overview/modules.adoc[leveloffset=+1]
+include::partial$overview/programming-model.adoc[leveloffset=+1]
diff --git a/antora/components/userguide/modules/fun/pages/programming-model.adoc b/antora/components/userguide/modules/fun/pages/programming-model.adoc
deleted file mode 100644
index dc0b9102a8..0000000000
--- a/antora/components/userguide/modules/fun/pages/programming-model.adoc
+++ /dev/null
@@ -1,8 +0,0 @@
-= Programming Model
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-
-
-
diff --git a/antora/components/userguide/modules/fun/pages/ui.adoc b/antora/components/userguide/modules/fun/pages/ui.adoc
index e5eae40a08..a161ba3f6c 100644
--- a/antora/components/userguide/modules/fun/pages/ui.adoc
+++ b/antora/components/userguide/modules/fun/pages/ui.adoc
@@ -26,11 +26,11 @@ The Apache Causeway programming model includes several mechanisms to influence t
This chapter discusses these topics.
-include::ui/names-and-descriptions.adoc[leveloffset=+1]
-include::ui/object-titles-and-icons.adoc[leveloffset=+1]
-include::ui/action-icons-and-css.adoc[leveloffset=+1]
+include::partial$ui/names-and-descriptions.adoc[leveloffset=+1]
+include::partial$ui/object-titles-and-icons.adoc[leveloffset=+1]
+include::partial$ui/action-icons-and-css.adoc[leveloffset=+1]
-include::ui/menubars-layout.adoc[leveloffset=+1]
-include::ui/object-layout.adoc[leveloffset=+1]
+include::partial$ui/menubars-layout.adoc[leveloffset=+1]
+include::partial$ui/object-layout.adoc[leveloffset=+1]
-include::ui/table-columns.adoc[leveloffset=+1]
+include::partial$ui/table-columns.adoc[leveloffset=+1]
diff --git a/antora/components/userguide/modules/fun/pages/concepts-patterns/apache-causeway-vs-cqrs-and-event-sourcing.adoc b/antora/components/userguide/modules/fun/partials/concepts-patterns/apache-causeway-vs-cqrs-and-event-sourcing.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/concepts-patterns/apache-causeway-vs-cqrs-and-event-sourcing.adoc
rename to antora/components/userguide/modules/fun/partials/concepts-patterns/apache-causeway-vs-cqrs-and-event-sourcing.adoc
diff --git a/antora/components/userguide/modules/fun/pages/concepts-patterns/architecture.adoc b/antora/components/userguide/modules/fun/partials/concepts-patterns/architecture.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/concepts-patterns/architecture.adoc
rename to antora/components/userguide/modules/fun/partials/concepts-patterns/architecture.adoc
diff --git a/antora/components/userguide/modules/fun/pages/concepts-patterns/core-values.adoc b/antora/components/userguide/modules/fun/partials/concepts-patterns/core-values.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/concepts-patterns/core-values.adoc
rename to antora/components/userguide/modules/fun/partials/concepts-patterns/core-values.adoc
diff --git a/antora/components/userguide/modules/fun/pages/concepts-patterns/deployment-options.adoc b/antora/components/userguide/modules/fun/partials/concepts-patterns/deployment-options.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/concepts-patterns/deployment-options.adoc
rename to antora/components/userguide/modules/fun/partials/concepts-patterns/deployment-options.adoc
diff --git a/antora/components/userguide/modules/fun/pages/concepts-patterns/domain-driven-design.adoc b/antora/components/userguide/modules/fun/partials/concepts-patterns/domain-driven-design.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/concepts-patterns/domain-driven-design.adoc
rename to antora/components/userguide/modules/fun/partials/concepts-patterns/domain-driven-design.adoc
diff --git a/antora/components/userguide/modules/fun/pages/concepts-patterns/metamodel.adoc b/antora/components/userguide/modules/fun/partials/concepts-patterns/metamodel.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/concepts-patterns/metamodel.adoc
rename to antora/components/userguide/modules/fun/partials/concepts-patterns/metamodel.adoc
diff --git a/antora/components/userguide/modules/fun/pages/concepts-patterns/naked-objects-pattern.adoc b/antora/components/userguide/modules/fun/partials/concepts-patterns/naked-objects-pattern.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/concepts-patterns/naked-objects-pattern.adoc
rename to antora/components/userguide/modules/fun/partials/concepts-patterns/naked-objects-pattern.adoc
diff --git a/antora/components/userguide/modules/fun/pages/domain-entities-and-services/crud.adoc b/antora/components/userguide/modules/fun/partials/domain-entities-and-services/crud.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/domain-entities-and-services/crud.adoc
rename to antora/components/userguide/modules/fun/partials/domain-entities-and-services/crud.adoc
diff --git a/antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-entities.adoc b/antora/components/userguide/modules/fun/partials/domain-entities-and-services/domain-entities.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-entities.adoc
rename to antora/components/userguide/modules/fun/partials/domain-entities-and-services/domain-entities.adoc
diff --git a/antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc b/antora/components/userguide/modules/fun/partials/domain-entities-and-services/domain-services.adoc
similarity index 99%
rename from antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc
rename to antora/components/userguide/modules/fun/partials/domain-entities-and-services/domain-services.adoc
index 10ea62efe5..5244bf9113 100644
--- a/antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc
+++ b/antora/components/userguide/modules/fun/partials/domain-entities-and-services/domain-services.adoc
@@ -97,7 +97,7 @@ These can be executed through the xref:refguide:persistence:index/jdo/applib/ser
Menu services provide actions to be rendered on the menu.
For the xref:vw:ROOT:about.adoc[Web UI (Wicket viewer)], each service's actions appear as a collection of menu items of a named menu, and this menu is on one of the three menu bars provided by the Wicket viewer.
-Although these can be organised using annotations, it's usually easier to use a xref:userguide:fun:ui/menubars-layout.adoc#file-based-menus[file-based layout file] (`menubars.layout.xml`).
+Although these can be organised using annotations, it's usually easier to use a xref:userguide:fun:ui.adoc#file-based-menus[file-based layout file] (`menubars.layout.xml`).
For the xref:vro:ROOT:about.adoc[REST API (Restful Objects viewer)], all menu services are shown in the services representation.
diff --git a/antora/components/userguide/modules/fun/pages/domain-entities-and-services/inject-services.adoc b/antora/components/userguide/modules/fun/partials/domain-entities-and-services/inject-services.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/domain-entities-and-services/inject-services.adoc
rename to antora/components/userguide/modules/fun/partials/domain-entities-and-services/inject-services.adoc
diff --git a/antora/components/userguide/modules/fun/pages/object-members/actions.adoc b/antora/components/userguide/modules/fun/partials/object-members/actions.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/object-members/actions.adoc
rename to antora/components/userguide/modules/fun/partials/object-members/actions.adoc
diff --git a/antora/components/userguide/modules/fun/pages/object-members/collections.adoc b/antora/components/userguide/modules/fun/partials/object-members/collections.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/object-members/collections.adoc
rename to antora/components/userguide/modules/fun/partials/object-members/collections.adoc
diff --git a/antora/components/userguide/modules/fun/pages/object-members/properties.adoc b/antora/components/userguide/modules/fun/partials/object-members/properties.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/object-members/properties.adoc
rename to antora/components/userguide/modules/fun/partials/object-members/properties.adoc
diff --git a/antora/components/userguide/modules/fun/pages/overview/business-rules.adoc b/antora/components/userguide/modules/fun/partials/overview/business-rules.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/overview/business-rules.adoc
rename to antora/components/userguide/modules/fun/partials/overview/business-rules.adoc
diff --git a/antora/components/userguide/modules/fun/pages/overview/events.adoc b/antora/components/userguide/modules/fun/partials/overview/events.adoc
similarity index 98%
rename from antora/components/userguide/modules/fun/pages/overview/events.adoc
rename to antora/components/userguide/modules/fun/partials/overview/events.adoc
index 7d6d8e8a00..dce006f9a1 100644
--- a/antora/components/userguide/modules/fun/pages/overview/events.adoc
+++ b/antora/components/userguide/modules/fun/partials/overview/events.adoc
@@ -55,7 +55,7 @@ UI events have higher precedence than the other mechanisms of supplying a title.
If annotated with xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#titleUiEvent[@DomainObjectLayout#titleUiEvent()], the appropriate (subclass of) `TitleUiEvent` will be emitted.
Similarly for xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#iconUiEvent[#iconUiEvent()].
-In addition, it is possible to use events to obtain a CSS class to render with the domain object, using xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#cssClassUiEvent[#cssClassUiEvent()], and to select an alternate xref:userguide:fun:ui/object-layout.adoc[layout file] using xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#layoutUiEvent[#layoutUiEvent()].
+In addition, it is possible to use events to obtain a CSS class to render with the domain object, using xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#cssClassUiEvent[#cssClassUiEvent()], and to select an alternate xref:userguide:fun:ui.adoc#object-layout[layout file] using xref:refguide:applib:index/annotation/DomainObjectLayout.adoc#layoutUiEvent[#layoutUiEvent()].
There are two use cases where this feature is useful:
diff --git a/antora/components/userguide/modules/fun/pages/overview/identifiers.adoc b/antora/components/userguide/modules/fun/partials/overview/identifiers.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/overview/identifiers.adoc
rename to antora/components/userguide/modules/fun/partials/overview/identifiers.adoc
diff --git a/antora/components/userguide/modules/fun/pages/overview/modules.adoc b/antora/components/userguide/modules/fun/partials/overview/modules.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/overview/modules.adoc
rename to antora/components/userguide/modules/fun/partials/overview/modules.adoc
diff --git a/antora/components/userguide/modules/fun/pages/overview/object-members.adoc b/antora/components/userguide/modules/fun/partials/overview/object-members.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/overview/object-members.adoc
rename to antora/components/userguide/modules/fun/partials/overview/object-members.adoc
diff --git a/antora/components/userguide/modules/fun/pages/overview/programming-model.adoc b/antora/components/userguide/modules/fun/partials/overview/programming-model.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/overview/programming-model.adoc
rename to antora/components/userguide/modules/fun/partials/overview/programming-model.adoc
diff --git a/antora/components/userguide/modules/fun/pages/overview/types-of-domain-objects.adoc b/antora/components/userguide/modules/fun/partials/overview/types-of-domain-objects.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/overview/types-of-domain-objects.adoc
rename to antora/components/userguide/modules/fun/partials/overview/types-of-domain-objects.adoc
diff --git a/antora/components/userguide/modules/fun/pages/ui/action-icons-and-css.adoc b/antora/components/userguide/modules/fun/partials/ui/action-icons-and-css.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/ui/action-icons-and-css.adoc
rename to antora/components/userguide/modules/fun/partials/ui/action-icons-and-css.adoc
diff --git a/antora/components/userguide/modules/fun/pages/ui/menubars-layout.adoc b/antora/components/userguide/modules/fun/partials/ui/menubars-layout.adoc
similarity index 99%
rename from antora/components/userguide/modules/fun/pages/ui/menubars-layout.adoc
rename to antora/components/userguide/modules/fun/partials/ui/menubars-layout.adoc
index 337a9fee51..c268f877c1 100644
--- a/antora/components/userguide/modules/fun/pages/ui/menubars-layout.adoc
+++ b/antora/components/userguide/modules/fun/partials/ui/menubars-layout.adoc
@@ -97,7 +97,7 @@ There are some disadvantages to using file-based layouts:
* they also suffer from syntactic fragility: an invalid XML document could result in no metadata for the entire class.
-The `menubars.layout.xml` file is just the serialized form of a xref:refguide:applib-classes:layout/menubars.adoc[MenuBars] layout class defined within Apache Causeway' applib.
+The `menubars.layout.xml` file is just the serialized form of a xref:refguide:applib-classes:layout.adoc#menubars[MenuBars] layout class defined within Apache Causeway' applib.
These are JAXB-annotated classes with corresponding XSD schemas; the upshot of that
is that IDEs such as IntelliJ and Eclipse can provide "intellisense", making it easy to author such layout files.
diff --git a/antora/components/userguide/modules/fun/pages/ui/names-and-descriptions.adoc b/antora/components/userguide/modules/fun/partials/ui/names-and-descriptions.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/ui/names-and-descriptions.adoc
rename to antora/components/userguide/modules/fun/partials/ui/names-and-descriptions.adoc
diff --git a/antora/components/userguide/modules/fun/pages/ui/object-layout.adoc b/antora/components/userguide/modules/fun/partials/ui/object-layout.adoc
similarity index 99%
rename from antora/components/userguide/modules/fun/pages/ui/object-layout.adoc
rename to antora/components/userguide/modules/fun/partials/ui/object-layout.adoc
index 70dee4af65..49e230bf3a 100644
--- a/antora/components/userguide/modules/fun/pages/ui/object-layout.adoc
+++ b/antora/components/userguide/modules/fun/partials/ui/object-layout.adoc
@@ -24,7 +24,7 @@ There are some downsides, though:
* there is no notion of inheritance, so a `.layout.xml` is required for all concrete classes and also for any abstract classes (if used as a collection type).
-The `Xxx.layout.xml` file is just the serialized form of a xref:refguide:applib-classes:layout/object-layout.adoc[Grid] layout class defined within Apache Causeway' applib.
+The `Xxx.layout.xml` file is just the serialized form of a xref:refguide:applib-classes:layout.adoc#object-layout[Grid] layout class defined within Apache Causeway' applib.
These are JAXB-annotated classes with corresponding XSD schemas; the upshot of that is that IDEs such as IntelliJ and Eclipse can provide "intellisense", making iteasy to author such layout files.
== Grids vs Components
@@ -37,7 +37,7 @@ The rows and columns are closely modelled on link:http://getbootstrap.com[Bootst
* those that define common components, of: fieldsets (previously called member groups or property groups), properties, collections, actions and also the title/icon of the domain object itself.
-More information about these classes can be found in xref:refguide:applib-classes:layout/object-layout.adoc[the reference guide].
+More information about these classes can be found in xref:refguide:applib-classes:layout.adoc#object-layout[the reference guide].
More information on Bootstrap 3's grid system can be found link:http://getbootstrap.com/css/#grid[here].
== By Example
diff --git a/antora/components/userguide/modules/fun/pages/ui/object-titles-and-icons.adoc b/antora/components/userguide/modules/fun/partials/ui/object-titles-and-icons.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/ui/object-titles-and-icons.adoc
rename to antora/components/userguide/modules/fun/partials/ui/object-titles-and-icons.adoc
diff --git a/antora/components/userguide/modules/fun/pages/ui/table-columns.adoc b/antora/components/userguide/modules/fun/partials/ui/table-columns.adoc
similarity index 100%
rename from antora/components/userguide/modules/fun/pages/ui/table-columns.adoc
rename to antora/components/userguide/modules/fun/partials/ui/table-columns.adoc
diff --git a/core/adoc/modules/ROOT/pages/_todo.adoc b/core/adoc/modules/ROOT/pages/_todo.txt
similarity index 95%
rename from core/adoc/modules/ROOT/pages/_todo.adoc
rename to core/adoc/modules/ROOT/pages/_todo.txt
index 5067c5c34b..ab6fcfecba 100644
--- a/core/adoc/modules/ROOT/pages/_todo.adoc
+++ b/core/adoc/modules/ROOT/pages/_todo.txt
@@ -3,7 +3,7 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-TODO: discuss some of these topics:
+// TODO : discuss some of these topics:
* webmodule architecture (programmatic web.xml)
* use of Spring Boot & our modules for classpath scanning