You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/02/24 06:37:18 UTC
[isis] 02/08: ISIS-2444: moves api/adoc/{ref|user}guide to
antora/components/{ref|user}guide
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 047222e19e77305df5cddaf98676f6b336b00ada
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Feb 23 06:43:17 2021 +0000
ISIS-2444: moves api/adoc/{ref|user}guide to antora/components/{ref|user}guide
---
.../adoc => antora/components}/refguide/antora.yml | 0
.../components}/refguide/modules/ROOT/nav.adoc | 0
.../refguide/modules/ROOT/pages/about.adoc | 0
.../modules/ROOT/partials/component-nav.adoc | 0
.../refguide/modules/ROOT/partials/module-nav.adoc | 0
.../components}/userguide/antora.yml | 0
.../components}/userguide/modules/ROOT/nav.adoc | 0
.../userguide/modules/ROOT/pages/about.adoc | 0
.../modules/ROOT/partials/component-nav.adoc | 0
.../modules/ROOT/partials/module-nav.adoc | 0
.../modules/_to-repurpose/attachments}/.gitkeep | 0
...alysis-of-commands-vs-eventmetadata-vs-etc.xlsx | Bin
...mand-dto-vs-interaction-dto-vs-interaction.xlsx | Bin
.../pptx/commands-vs-actioninvocationevent.pptx | Bin
.../_to-repurpose/attachments/theme/isis-logo.png | Bin
.../modules/_to-repurpose/examples/.gitkeep | 0
.../modules/_to-repurpose/images}/.gitkeep | 0
.../modules/_to-repurpose/images/PDF-50.png | Bin
.../images/index-screenshots/010-sign-in.pdn | Bin
.../images/index-screenshots/010-sign-in.png | Bin
.../images/index-screenshots/020-object-layout.pdn | Bin
.../images/index-screenshots/020-object-layout.png | Bin
.../030-declarative-business-rules.pdn | Bin
.../030-declarative-business-rules.png | Bin
.../040-imperative-business-rules.pdn | Bin
.../040-imperative-business-rules.png | Bin
.../index-screenshots/050-action-with-args.pdn | Bin
.../index-screenshots/050-action-with-args.png | Bin
.../060-action-with-args-autocomplete.pdn | Bin
.../060-action-with-args-autocomplete.png | Bin
.../images/index-screenshots/070-jdo.pdn | Bin
.../images/index-screenshots/070-jdo.png | Bin
.../images/index-screenshots/080-rest-api.pdn | Bin
.../images/index-screenshots/080-rest-api.png | Bin
.../images/index-screenshots/090-integtesting.pdn | Bin
.../images/index-screenshots/090-integtesting.png | Bin
.../modules/_to-repurpose/images/isis-favicon.png | Bin
.../_to-repurpose/images/isis-logo-48x48.pdn | Bin
.../_to-repurpose/images/isis-logo-48x48.png | Bin
.../_to-repurpose/images/isis-logo-568x286.pdn | Bin
.../_to-repurpose/images/isis-logo-568x286.png | Bin
.../_to-repurpose/images/todoapp/dashboard.png | Bin
.../_to-repurpose/images/todoapp/swagger-ui.png | Bin
.../_to-repurpose/images/todoapp/todoitem.png | Bin
.../userguide/modules/_to-repurpose/nav.adoc | 0
.../modules/_to-repurpose/pages/about.adoc | 0
.../headless-access/BackgroundCommandExecution.png | Bin
...andExecutionFromBackgroundCommandServiceJdo.png | Bin
.../action-semantics-are-you-sure.png | Bin
.../hints-and-tips/are-you-sure-happy-case.png | Bin
.../hints-and-tips/are-you-sure-sad-case.png | Bin
.../btb/images/hints-and-tips/are-you-sure.png | Bin
.../btb/images/hints-and-tips/view-model-fail.png | Bin
.../images/hints-and-tips/view-model-success.png | Bin
.../modules/btb/images/runtime/web-xml/key.png | Bin
.../modules/btb/images/runtime/web-xml/parts.pptx | Bin
.../modules/btb/images/runtime/web-xml/ro-only.png | Bin
.../btb/images/runtime/web-xml/wicket-and-ro.png | Bin
.../btb/images/runtime/web-xml/wicket-only.png | Bin
.../components/userguide/modules/btb}/nav.adoc | 0
.../userguide/modules/btb/pages/about.adoc | 0
.../modules/btb/pages/headless-access.adoc | 0
.../modules/btb/pages/hints-and-tips.adoc | 0
.../btb/pages/hints-and-tips/are-you-sure.adoc | 0
.../btb/pages/hints-and-tips/custom-css.adoc | 0
.../how-to-handle-void-and-null-results.adoc | 0
.../how-to-implement-a-spellchecker.adoc | 0
.../btb/pages/hints-and-tips/persisted-title.adoc | 0
.../replacing-default-service-implementations.adoc | 0
.../simulating-collections-of-values.adoc | 0
.../subclass-properties-in-tables.adoc | 0
.../hints-and-tips/transactions-and-errors.adoc | 0
.../pages/hints-and-tips/vetoing-visibility.adoc | 0
.../hints-and-tips/view-model-instantiation.adoc | 0
.../userguide/modules/btb/pages/i18n.adoc | 0
.../modules/btb/pages/other-techniques.adoc | 0
.../modules/btb/pages/programming-model.adoc | 0
.../pages/programming-model/custom-validator.adoc | 0
.../btb/pages/programming-model/finetuning.adoc | 0
.../userguide/modules/btb/partials/module-nav.adoc | 0
.../userguide/modules/fun/.asciidoctorconfig | 0
.../core-concepts/Pawson-Naked-Objects-thesis.pdf | Bin
.../fun/attachments/object-type-taxonomy.pptx | Bin
.../fun/images/application-menu/dividers.png | Bin
.../fun/images/application-menu/layout-menus.pdn | Bin
.../fun/images/application-menu/layout-menus.png | Bin
.../fun/images/application-menu/tertiary.png | Bin
.../core-concepts/philosophy/build-vs-buy.png | Bin
.../core-concepts/philosophy/build-vs-buy.pptx | Bin
.../philosophy/decoupled-applications.png | Bin
.../philosophy/decoupled-applications.pptx | Bin
.../philosophy/hexagonal-architecture-addons.png | Bin
.../philosophy/hexagonal-architecture.png | Bin
.../philosophy/hexagonal-architecture.pptx | Bin
.../images/layout-dynamic-xml/ToDoAppDashboard.png | Bin
.../fun/images/layout-dynamic-xml/ToDoItem.png | Bin
.../modules/fun/images/layouts/customer-order.png | Bin
.../modules/fun/images/layouts/estatio-Invoice.png | Bin
.../modules/fun/images/layouts/estatio-Lease.png | Bin
.../fun/images/layouts/estatio-LeaseItem.png | Bin
.../fun/images/layouts/todoapp-ToDoItem.png | Bin
.../modules/fun/images/menubars/010-download.png | Bin
.../modules/fun/images/menubars/020-download.png | Bin
.../modules/fun/images/ui/todoapp-Dashboard.png | Bin
.../components/userguide/modules/fun}/nav.adoc | 0
.../userguide/modules/fun/pages/about.adoc | 0
.../modules/fun/pages/business-rules.adoc | 0
.../fun/pages/business-rules/usability.adoc | 0
.../modules/fun/pages/business-rules/validity.adoc | 0
.../fun/pages/business-rules/visibility.adoc | 0
.../modules/fun/pages/concepts-patterns.adoc | 0
.../apache-isis-vs-cqrs-and-event-sourcing.adoc | 0
.../fun/pages/concepts-patterns/architecture.adoc | 0
.../fun/pages/concepts-patterns/core-values.adoc | 0
.../concepts-patterns/deployment-options.adoc | 0
.../concepts-patterns/domain-driven-design.adoc | 0
.../fun/pages/concepts-patterns/metamodel.adoc | 0
.../concepts-patterns/naked-objects-pattern.adoc | 0
.../fun/pages/domain-entities-and-services.adoc | 0
.../pages/domain-entities-and-services/crud.adoc | 0
.../domain-entities.adoc | 0
.../domain-services.adoc | 0
.../inject-services.adoc | 0
.../modules/fun/pages/drop-downs-and-defaults.adoc | 0
.../modules/fun/pages/meta-annotations.adoc | 0
.../userguide/modules/fun/pages/mixins.adoc | 0
.../userguide/modules/fun/pages/modules.adoc | 0
.../modules/fun/pages/object-members.adoc | 0
.../modules/fun/pages/object-members/actions.adoc | 0
.../fun/pages/object-members/collections.adoc | 0
.../fun/pages/object-members/properties.adoc | 0
.../userguide/modules/fun/pages/overview.adoc | 0
.../modules/fun/pages/overview/business-rules.adoc | 0
.../modules/fun/pages/overview/events.adoc | 0
.../modules/fun/pages/overview/identifiers.adoc | 0
.../modules/fun/pages/overview/modules.adoc | 0
.../modules/fun/pages/overview/object-members.adoc | 0
.../fun/pages/overview/programming-model.adoc | 0
.../pages/overview/types-of-domain-objects.adoc | 0
.../modules/fun/pages/programming-model.adoc | 0
.../userguide/modules/fun/pages/ui.adoc | 0
.../modules/fun/pages/ui/action-icons-and-css.adoc | 0
.../modules/fun/pages/ui/menubars-layout.adoc | 0
.../fun/pages/ui/names-and-descriptions.adoc | 0
.../modules/fun/pages/ui/object-layout.adoc | 0
.../fun/pages/ui/object-titles-and-icons.adoc | 0
.../modules/fun/pages/ui/table-columns.adoc | 0
.../userguide/modules/fun/pages/view-models.adoc | 0
.../modules/fun/pages/view-models/UNUSED-dto.adoc | 0
.../modules/fun/partials/_deployment-options.adoc | 0
.../userguide/modules/fun/partials/module-nav.adoc | 0
antora/playbooks/site-refguide.yml | 8 +++--
antora/playbooks/site-userguide.yml | 3 +-
antora/playbooks/site.yml | 10 +++---
api/adoc/pom.xml | 40 ---------------------
155 files changed, 12 insertions(+), 49 deletions(-)
diff --git a/api/adoc/refguide/antora.yml b/antora/components/refguide/antora.yml
similarity index 100%
rename from api/adoc/refguide/antora.yml
rename to antora/components/refguide/antora.yml
diff --git a/api/adoc/refguide/modules/ROOT/nav.adoc b/antora/components/refguide/modules/ROOT/nav.adoc
similarity index 100%
rename from api/adoc/refguide/modules/ROOT/nav.adoc
rename to antora/components/refguide/modules/ROOT/nav.adoc
diff --git a/api/adoc/refguide/modules/ROOT/pages/about.adoc b/antora/components/refguide/modules/ROOT/pages/about.adoc
similarity index 100%
rename from api/adoc/refguide/modules/ROOT/pages/about.adoc
rename to antora/components/refguide/modules/ROOT/pages/about.adoc
diff --git a/api/adoc/refguide/modules/ROOT/partials/component-nav.adoc b/antora/components/refguide/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from api/adoc/refguide/modules/ROOT/partials/component-nav.adoc
rename to antora/components/refguide/modules/ROOT/partials/component-nav.adoc
diff --git a/api/adoc/refguide/modules/ROOT/partials/module-nav.adoc b/antora/components/refguide/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from api/adoc/refguide/modules/ROOT/partials/module-nav.adoc
rename to antora/components/refguide/modules/ROOT/partials/module-nav.adoc
diff --git a/api/adoc/userguide/antora.yml b/antora/components/userguide/antora.yml
similarity index 100%
rename from api/adoc/userguide/antora.yml
rename to antora/components/userguide/antora.yml
diff --git a/api/adoc/userguide/modules/ROOT/nav.adoc b/antora/components/userguide/modules/ROOT/nav.adoc
similarity index 100%
rename from api/adoc/userguide/modules/ROOT/nav.adoc
rename to antora/components/userguide/modules/ROOT/nav.adoc
diff --git a/api/adoc/userguide/modules/ROOT/pages/about.adoc b/antora/components/userguide/modules/ROOT/pages/about.adoc
similarity index 100%
rename from api/adoc/userguide/modules/ROOT/pages/about.adoc
rename to antora/components/userguide/modules/ROOT/pages/about.adoc
diff --git a/api/adoc/userguide/modules/ROOT/partials/component-nav.adoc b/antora/components/userguide/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from api/adoc/userguide/modules/ROOT/partials/component-nav.adoc
rename to antora/components/userguide/modules/ROOT/partials/component-nav.adoc
diff --git a/api/adoc/userguide/modules/ROOT/partials/module-nav.adoc b/antora/components/userguide/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from api/adoc/userguide/modules/ROOT/partials/module-nav.adoc
rename to antora/components/userguide/modules/ROOT/partials/module-nav.adoc
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/.gitkeep b/antora/components/userguide/modules/_to-repurpose/attachments/.gitkeep
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/.gitkeep
rename to antora/components/userguide/modules/_to-repurpose/attachments/.gitkeep
diff --git a/api/adoc/userguide/modules/_to-repurpose/attachments/excel/analysis-of-commands-vs-eventmetadata-vs-etc.xlsx b/antora/components/userguide/modules/_to-repurpose/attachments/excel/analysis-of-commands-vs-eventmetadata-vs-etc.xlsx
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/attachments/excel/analysis-of-commands-vs-eventmetadata-vs-etc.xlsx
rename to antora/components/userguide/modules/_to-repurpose/attachments/excel/analysis-of-commands-vs-eventmetadata-vs-etc.xlsx
diff --git a/api/adoc/userguide/modules/_to-repurpose/attachments/excel/command-dto-vs-interaction-dto-vs-interaction.xlsx b/antora/components/userguide/modules/_to-repurpose/attachments/excel/command-dto-vs-interaction-dto-vs-interaction.xlsx
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/attachments/excel/command-dto-vs-interaction-dto-vs-interaction.xlsx
rename to antora/components/userguide/modules/_to-repurpose/attachments/excel/command-dto-vs-interaction-dto-vs-interaction.xlsx
diff --git a/api/adoc/userguide/modules/_to-repurpose/attachments/pptx/commands-vs-actioninvocationevent.pptx b/antora/components/userguide/modules/_to-repurpose/attachments/pptx/commands-vs-actioninvocationevent.pptx
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/attachments/pptx/commands-vs-actioninvocationevent.pptx
rename to antora/components/userguide/modules/_to-repurpose/attachments/pptx/commands-vs-actioninvocationevent.pptx
diff --git a/api/adoc/userguide/modules/_to-repurpose/attachments/theme/isis-logo.png b/antora/components/userguide/modules/_to-repurpose/attachments/theme/isis-logo.png
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/attachments/theme/isis-logo.png
rename to antora/components/userguide/modules/_to-repurpose/attachments/theme/isis-logo.png
diff --git a/api/adoc/userguide/modules/_to-repurpose/examples/.gitkeep b/antora/components/userguide/modules/_to-repurpose/examples/.gitkeep
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/examples/.gitkeep
rename to antora/components/userguide/modules/_to-repurpose/examples/.gitkeep
diff --git a/api/adoc/userguide/modules/_to-repurpose/attachments/.gitkeep b/antora/components/userguide/modules/_to-repurpose/images/.gitkeep
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/attachments/.gitkeep
rename to antora/components/userguide/modules/_to-repurpose/images/.gitkeep
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/PDF-50.png b/antora/components/userguide/modules/_to-repurpose/images/PDF-50.png
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/PDF-50.png
rename to antora/components/userguide/modules/_to-repurpose/images/PDF-50.png
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/010-sign-in.pdn b/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/010-sign-in.pdn
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/010-sign-in.pdn
rename to antora/components/userguide/modules/_to-repurpose/images/index-screenshots/010-sign-in.pdn
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/010-sign-in.png b/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/010-sign-in.png
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/010-sign-in.png
rename to antora/components/userguide/modules/_to-repurpose/images/index-screenshots/010-sign-in.png
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/020-object-layout.pdn b/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/020-object-layout.pdn
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/020-object-layout.pdn
rename to antora/components/userguide/modules/_to-repurpose/images/index-screenshots/020-object-layout.pdn
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/020-object-layout.png b/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/020-object-layout.png
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/020-object-layout.png
rename to antora/components/userguide/modules/_to-repurpose/images/index-screenshots/020-object-layout.png
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/030-declarative-business-rules.pdn b/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/030-declarative-business-rules.pdn
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/030-declarative-business-rules.pdn
rename to antora/components/userguide/modules/_to-repurpose/images/index-screenshots/030-declarative-business-rules.pdn
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/030-declarative-business-rules.png b/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/030-declarative-business-rules.png
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/030-declarative-business-rules.png
rename to antora/components/userguide/modules/_to-repurpose/images/index-screenshots/030-declarative-business-rules.png
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/040-imperative-business-rules.pdn b/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/040-imperative-business-rules.pdn
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/040-imperative-business-rules.pdn
rename to antora/components/userguide/modules/_to-repurpose/images/index-screenshots/040-imperative-business-rules.pdn
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/040-imperative-business-rules.png b/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/040-imperative-business-rules.png
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/040-imperative-business-rules.png
rename to antora/components/userguide/modules/_to-repurpose/images/index-screenshots/040-imperative-business-rules.png
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/050-action-with-args.pdn b/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/050-action-with-args.pdn
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/050-action-with-args.pdn
rename to antora/components/userguide/modules/_to-repurpose/images/index-screenshots/050-action-with-args.pdn
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/050-action-with-args.png b/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/050-action-with-args.png
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/050-action-with-args.png
rename to antora/components/userguide/modules/_to-repurpose/images/index-screenshots/050-action-with-args.png
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/060-action-with-args-autocomplete.pdn b/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/060-action-with-args-autocomplete.pdn
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/060-action-with-args-autocomplete.pdn
rename to antora/components/userguide/modules/_to-repurpose/images/index-screenshots/060-action-with-args-autocomplete.pdn
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/060-action-with-args-autocomplete.png b/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/060-action-with-args-autocomplete.png
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/060-action-with-args-autocomplete.png
rename to antora/components/userguide/modules/_to-repurpose/images/index-screenshots/060-action-with-args-autocomplete.png
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/070-jdo.pdn b/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/070-jdo.pdn
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/070-jdo.pdn
rename to antora/components/userguide/modules/_to-repurpose/images/index-screenshots/070-jdo.pdn
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/070-jdo.png b/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/070-jdo.png
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/070-jdo.png
rename to antora/components/userguide/modules/_to-repurpose/images/index-screenshots/070-jdo.png
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/080-rest-api.pdn b/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/080-rest-api.pdn
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/080-rest-api.pdn
rename to antora/components/userguide/modules/_to-repurpose/images/index-screenshots/080-rest-api.pdn
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/080-rest-api.png b/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/080-rest-api.png
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/080-rest-api.png
rename to antora/components/userguide/modules/_to-repurpose/images/index-screenshots/080-rest-api.png
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/090-integtesting.pdn b/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/090-integtesting.pdn
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/090-integtesting.pdn
rename to antora/components/userguide/modules/_to-repurpose/images/index-screenshots/090-integtesting.pdn
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/090-integtesting.png b/antora/components/userguide/modules/_to-repurpose/images/index-screenshots/090-integtesting.png
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/index-screenshots/090-integtesting.png
rename to antora/components/userguide/modules/_to-repurpose/images/index-screenshots/090-integtesting.png
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/isis-favicon.png b/antora/components/userguide/modules/_to-repurpose/images/isis-favicon.png
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/isis-favicon.png
rename to antora/components/userguide/modules/_to-repurpose/images/isis-favicon.png
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/isis-logo-48x48.pdn b/antora/components/userguide/modules/_to-repurpose/images/isis-logo-48x48.pdn
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/isis-logo-48x48.pdn
rename to antora/components/userguide/modules/_to-repurpose/images/isis-logo-48x48.pdn
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/isis-logo-48x48.png b/antora/components/userguide/modules/_to-repurpose/images/isis-logo-48x48.png
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/isis-logo-48x48.png
rename to antora/components/userguide/modules/_to-repurpose/images/isis-logo-48x48.png
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/isis-logo-568x286.pdn b/antora/components/userguide/modules/_to-repurpose/images/isis-logo-568x286.pdn
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/isis-logo-568x286.pdn
rename to antora/components/userguide/modules/_to-repurpose/images/isis-logo-568x286.pdn
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/isis-logo-568x286.png b/antora/components/userguide/modules/_to-repurpose/images/isis-logo-568x286.png
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/isis-logo-568x286.png
rename to antora/components/userguide/modules/_to-repurpose/images/isis-logo-568x286.png
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/todoapp/dashboard.png b/antora/components/userguide/modules/_to-repurpose/images/todoapp/dashboard.png
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/todoapp/dashboard.png
rename to antora/components/userguide/modules/_to-repurpose/images/todoapp/dashboard.png
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/todoapp/swagger-ui.png b/antora/components/userguide/modules/_to-repurpose/images/todoapp/swagger-ui.png
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/todoapp/swagger-ui.png
rename to antora/components/userguide/modules/_to-repurpose/images/todoapp/swagger-ui.png
diff --git a/api/adoc/userguide/modules/_to-repurpose/images/todoapp/todoitem.png b/antora/components/userguide/modules/_to-repurpose/images/todoapp/todoitem.png
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/images/todoapp/todoitem.png
rename to antora/components/userguide/modules/_to-repurpose/images/todoapp/todoitem.png
diff --git a/api/adoc/userguide/modules/_to-repurpose/nav.adoc b/antora/components/userguide/modules/_to-repurpose/nav.adoc
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/nav.adoc
rename to antora/components/userguide/modules/_to-repurpose/nav.adoc
diff --git a/api/adoc/userguide/modules/_to-repurpose/pages/about.adoc b/antora/components/userguide/modules/_to-repurpose/pages/about.adoc
similarity index 100%
rename from api/adoc/userguide/modules/_to-repurpose/pages/about.adoc
rename to antora/components/userguide/modules/_to-repurpose/pages/about.adoc
diff --git a/api/adoc/userguide/modules/btb/images/headless-access/BackgroundCommandExecution.png b/antora/components/userguide/modules/btb/images/headless-access/BackgroundCommandExecution.png
similarity index 100%
rename from api/adoc/userguide/modules/btb/images/headless-access/BackgroundCommandExecution.png
rename to antora/components/userguide/modules/btb/images/headless-access/BackgroundCommandExecution.png
diff --git a/api/adoc/userguide/modules/btb/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png b/antora/components/userguide/modules/btb/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
similarity index 100%
rename from api/adoc/userguide/modules/btb/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
rename to antora/components/userguide/modules/btb/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
diff --git a/api/adoc/userguide/modules/btb/images/hints-and-tips/action-semantics-are-you-sure.png b/antora/components/userguide/modules/btb/images/hints-and-tips/action-semantics-are-you-sure.png
similarity index 100%
rename from api/adoc/userguide/modules/btb/images/hints-and-tips/action-semantics-are-you-sure.png
rename to antora/components/userguide/modules/btb/images/hints-and-tips/action-semantics-are-you-sure.png
diff --git a/api/adoc/userguide/modules/btb/images/hints-and-tips/are-you-sure-happy-case.png b/antora/components/userguide/modules/btb/images/hints-and-tips/are-you-sure-happy-case.png
similarity index 100%
rename from api/adoc/userguide/modules/btb/images/hints-and-tips/are-you-sure-happy-case.png
rename to antora/components/userguide/modules/btb/images/hints-and-tips/are-you-sure-happy-case.png
diff --git a/api/adoc/userguide/modules/btb/images/hints-and-tips/are-you-sure-sad-case.png b/antora/components/userguide/modules/btb/images/hints-and-tips/are-you-sure-sad-case.png
similarity index 100%
rename from api/adoc/userguide/modules/btb/images/hints-and-tips/are-you-sure-sad-case.png
rename to antora/components/userguide/modules/btb/images/hints-and-tips/are-you-sure-sad-case.png
diff --git a/api/adoc/userguide/modules/btb/images/hints-and-tips/are-you-sure.png b/antora/components/userguide/modules/btb/images/hints-and-tips/are-you-sure.png
similarity index 100%
rename from api/adoc/userguide/modules/btb/images/hints-and-tips/are-you-sure.png
rename to antora/components/userguide/modules/btb/images/hints-and-tips/are-you-sure.png
diff --git a/api/adoc/userguide/modules/btb/images/hints-and-tips/view-model-fail.png b/antora/components/userguide/modules/btb/images/hints-and-tips/view-model-fail.png
similarity index 100%
rename from api/adoc/userguide/modules/btb/images/hints-and-tips/view-model-fail.png
rename to antora/components/userguide/modules/btb/images/hints-and-tips/view-model-fail.png
diff --git a/api/adoc/userguide/modules/btb/images/hints-and-tips/view-model-success.png b/antora/components/userguide/modules/btb/images/hints-and-tips/view-model-success.png
similarity index 100%
rename from api/adoc/userguide/modules/btb/images/hints-and-tips/view-model-success.png
rename to antora/components/userguide/modules/btb/images/hints-and-tips/view-model-success.png
diff --git a/api/adoc/userguide/modules/btb/images/runtime/web-xml/key.png b/antora/components/userguide/modules/btb/images/runtime/web-xml/key.png
similarity index 100%
rename from api/adoc/userguide/modules/btb/images/runtime/web-xml/key.png
rename to antora/components/userguide/modules/btb/images/runtime/web-xml/key.png
diff --git a/api/adoc/userguide/modules/btb/images/runtime/web-xml/parts.pptx b/antora/components/userguide/modules/btb/images/runtime/web-xml/parts.pptx
similarity index 100%
rename from api/adoc/userguide/modules/btb/images/runtime/web-xml/parts.pptx
rename to antora/components/userguide/modules/btb/images/runtime/web-xml/parts.pptx
diff --git a/api/adoc/userguide/modules/btb/images/runtime/web-xml/ro-only.png b/antora/components/userguide/modules/btb/images/runtime/web-xml/ro-only.png
similarity index 100%
rename from api/adoc/userguide/modules/btb/images/runtime/web-xml/ro-only.png
rename to antora/components/userguide/modules/btb/images/runtime/web-xml/ro-only.png
diff --git a/api/adoc/userguide/modules/btb/images/runtime/web-xml/wicket-and-ro.png b/antora/components/userguide/modules/btb/images/runtime/web-xml/wicket-and-ro.png
similarity index 100%
rename from api/adoc/userguide/modules/btb/images/runtime/web-xml/wicket-and-ro.png
rename to antora/components/userguide/modules/btb/images/runtime/web-xml/wicket-and-ro.png
diff --git a/api/adoc/userguide/modules/btb/images/runtime/web-xml/wicket-only.png b/antora/components/userguide/modules/btb/images/runtime/web-xml/wicket-only.png
similarity index 100%
rename from api/adoc/userguide/modules/btb/images/runtime/web-xml/wicket-only.png
rename to antora/components/userguide/modules/btb/images/runtime/web-xml/wicket-only.png
diff --git a/api/adoc/userguide/modules/fun/nav.adoc b/antora/components/userguide/modules/btb/nav.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/nav.adoc
rename to antora/components/userguide/modules/btb/nav.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/about.adoc b/antora/components/userguide/modules/btb/pages/about.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/about.adoc
rename to antora/components/userguide/modules/btb/pages/about.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/headless-access.adoc b/antora/components/userguide/modules/btb/pages/headless-access.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/headless-access.adoc
rename to antora/components/userguide/modules/btb/pages/headless-access.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/hints-and-tips.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/are-you-sure.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/are-you-sure.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/hints-and-tips/are-you-sure.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/are-you-sure.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/custom-css.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/custom-css.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/hints-and-tips/custom-css.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/custom-css.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/how-to-handle-void-and-null-results.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/how-to-implement-a-spellchecker.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/persisted-title.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/persisted-title.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/hints-and-tips/persisted-title.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/persisted-title.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/replacing-default-service-implementations.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/simulating-collections-of-values.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/subclass-properties-in-tables.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/transactions-and-errors.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/vetoing-visibility.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc b/antora/components/userguide/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
rename to antora/components/userguide/modules/btb/pages/hints-and-tips/view-model-instantiation.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/i18n.adoc b/antora/components/userguide/modules/btb/pages/i18n.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/i18n.adoc
rename to antora/components/userguide/modules/btb/pages/i18n.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/other-techniques.adoc b/antora/components/userguide/modules/btb/pages/other-techniques.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/other-techniques.adoc
rename to antora/components/userguide/modules/btb/pages/other-techniques.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/programming-model.adoc b/antora/components/userguide/modules/btb/pages/programming-model.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/programming-model.adoc
rename to antora/components/userguide/modules/btb/pages/programming-model.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/programming-model/custom-validator.adoc b/antora/components/userguide/modules/btb/pages/programming-model/custom-validator.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/programming-model/custom-validator.adoc
rename to antora/components/userguide/modules/btb/pages/programming-model/custom-validator.adoc
diff --git a/api/adoc/userguide/modules/btb/pages/programming-model/finetuning.adoc b/antora/components/userguide/modules/btb/pages/programming-model/finetuning.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/pages/programming-model/finetuning.adoc
rename to antora/components/userguide/modules/btb/pages/programming-model/finetuning.adoc
diff --git a/api/adoc/userguide/modules/btb/partials/module-nav.adoc b/antora/components/userguide/modules/btb/partials/module-nav.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/partials/module-nav.adoc
rename to antora/components/userguide/modules/btb/partials/module-nav.adoc
diff --git a/api/adoc/userguide/modules/fun/.asciidoctorconfig b/antora/components/userguide/modules/fun/.asciidoctorconfig
similarity index 100%
rename from api/adoc/userguide/modules/fun/.asciidoctorconfig
rename to antora/components/userguide/modules/fun/.asciidoctorconfig
diff --git a/api/adoc/userguide/modules/fun/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf b/antora/components/userguide/modules/fun/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
similarity index 100%
rename from api/adoc/userguide/modules/fun/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
rename to antora/components/userguide/modules/fun/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf
diff --git a/api/adoc/userguide/modules/fun/attachments/object-type-taxonomy.pptx b/antora/components/userguide/modules/fun/attachments/object-type-taxonomy.pptx
similarity index 100%
rename from api/adoc/userguide/modules/fun/attachments/object-type-taxonomy.pptx
rename to antora/components/userguide/modules/fun/attachments/object-type-taxonomy.pptx
diff --git a/api/adoc/userguide/modules/fun/images/application-menu/dividers.png b/antora/components/userguide/modules/fun/images/application-menu/dividers.png
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/application-menu/dividers.png
rename to antora/components/userguide/modules/fun/images/application-menu/dividers.png
diff --git a/api/adoc/userguide/modules/fun/images/application-menu/layout-menus.pdn b/antora/components/userguide/modules/fun/images/application-menu/layout-menus.pdn
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/application-menu/layout-menus.pdn
rename to antora/components/userguide/modules/fun/images/application-menu/layout-menus.pdn
diff --git a/api/adoc/userguide/modules/fun/images/application-menu/layout-menus.png b/antora/components/userguide/modules/fun/images/application-menu/layout-menus.png
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/application-menu/layout-menus.png
rename to antora/components/userguide/modules/fun/images/application-menu/layout-menus.png
diff --git a/api/adoc/userguide/modules/fun/images/application-menu/tertiary.png b/antora/components/userguide/modules/fun/images/application-menu/tertiary.png
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/application-menu/tertiary.png
rename to antora/components/userguide/modules/fun/images/application-menu/tertiary.png
diff --git a/api/adoc/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.png b/antora/components/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.png
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.png
rename to antora/components/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.png
diff --git a/api/adoc/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.pptx b/antora/components/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.pptx
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.pptx
rename to antora/components/userguide/modules/fun/images/core-concepts/philosophy/build-vs-buy.pptx
diff --git a/api/adoc/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.png b/antora/components/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.png
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.png
rename to antora/components/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.png
diff --git a/api/adoc/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.pptx b/antora/components/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.pptx
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.pptx
rename to antora/components/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.pptx
diff --git a/api/adoc/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture-addons.png b/antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture-addons.png
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture-addons.png
rename to antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture-addons.png
diff --git a/api/adoc/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.png b/antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.png
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.png
rename to antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.png
diff --git a/api/adoc/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.pptx b/antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.pptx
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.pptx
rename to antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.pptx
diff --git a/api/adoc/userguide/modules/fun/images/layout-dynamic-xml/ToDoAppDashboard.png b/antora/components/userguide/modules/fun/images/layout-dynamic-xml/ToDoAppDashboard.png
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/layout-dynamic-xml/ToDoAppDashboard.png
rename to antora/components/userguide/modules/fun/images/layout-dynamic-xml/ToDoAppDashboard.png
diff --git a/api/adoc/userguide/modules/fun/images/layout-dynamic-xml/ToDoItem.png b/antora/components/userguide/modules/fun/images/layout-dynamic-xml/ToDoItem.png
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/layout-dynamic-xml/ToDoItem.png
rename to antora/components/userguide/modules/fun/images/layout-dynamic-xml/ToDoItem.png
diff --git a/api/adoc/userguide/modules/fun/images/layouts/customer-order.png b/antora/components/userguide/modules/fun/images/layouts/customer-order.png
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/layouts/customer-order.png
rename to antora/components/userguide/modules/fun/images/layouts/customer-order.png
diff --git a/api/adoc/userguide/modules/fun/images/layouts/estatio-Invoice.png b/antora/components/userguide/modules/fun/images/layouts/estatio-Invoice.png
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/layouts/estatio-Invoice.png
rename to antora/components/userguide/modules/fun/images/layouts/estatio-Invoice.png
diff --git a/api/adoc/userguide/modules/fun/images/layouts/estatio-Lease.png b/antora/components/userguide/modules/fun/images/layouts/estatio-Lease.png
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/layouts/estatio-Lease.png
rename to antora/components/userguide/modules/fun/images/layouts/estatio-Lease.png
diff --git a/api/adoc/userguide/modules/fun/images/layouts/estatio-LeaseItem.png b/antora/components/userguide/modules/fun/images/layouts/estatio-LeaseItem.png
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/layouts/estatio-LeaseItem.png
rename to antora/components/userguide/modules/fun/images/layouts/estatio-LeaseItem.png
diff --git a/api/adoc/userguide/modules/fun/images/layouts/todoapp-ToDoItem.png b/antora/components/userguide/modules/fun/images/layouts/todoapp-ToDoItem.png
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/layouts/todoapp-ToDoItem.png
rename to antora/components/userguide/modules/fun/images/layouts/todoapp-ToDoItem.png
diff --git a/api/adoc/userguide/modules/fun/images/menubars/010-download.png b/antora/components/userguide/modules/fun/images/menubars/010-download.png
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/menubars/010-download.png
rename to antora/components/userguide/modules/fun/images/menubars/010-download.png
diff --git a/api/adoc/userguide/modules/fun/images/menubars/020-download.png b/antora/components/userguide/modules/fun/images/menubars/020-download.png
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/menubars/020-download.png
rename to antora/components/userguide/modules/fun/images/menubars/020-download.png
diff --git a/api/adoc/userguide/modules/fun/images/ui/todoapp-Dashboard.png b/antora/components/userguide/modules/fun/images/ui/todoapp-Dashboard.png
similarity index 100%
rename from api/adoc/userguide/modules/fun/images/ui/todoapp-Dashboard.png
rename to antora/components/userguide/modules/fun/images/ui/todoapp-Dashboard.png
diff --git a/api/adoc/userguide/modules/btb/nav.adoc b/antora/components/userguide/modules/fun/nav.adoc
similarity index 100%
rename from api/adoc/userguide/modules/btb/nav.adoc
rename to antora/components/userguide/modules/fun/nav.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/about.adoc b/antora/components/userguide/modules/fun/pages/about.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/about.adoc
rename to antora/components/userguide/modules/fun/pages/about.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/business-rules.adoc b/antora/components/userguide/modules/fun/pages/business-rules.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/business-rules.adoc
rename to antora/components/userguide/modules/fun/pages/business-rules.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/business-rules/usability.adoc b/antora/components/userguide/modules/fun/pages/business-rules/usability.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/business-rules/usability.adoc
rename to antora/components/userguide/modules/fun/pages/business-rules/usability.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/business-rules/validity.adoc b/antora/components/userguide/modules/fun/pages/business-rules/validity.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/business-rules/validity.adoc
rename to antora/components/userguide/modules/fun/pages/business-rules/validity.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/business-rules/visibility.adoc b/antora/components/userguide/modules/fun/pages/business-rules/visibility.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/business-rules/visibility.adoc
rename to antora/components/userguide/modules/fun/pages/business-rules/visibility.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/concepts-patterns.adoc b/antora/components/userguide/modules/fun/pages/concepts-patterns.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/concepts-patterns.adoc
rename to antora/components/userguide/modules/fun/pages/concepts-patterns.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/concepts-patterns/apache-isis-vs-cqrs-and-event-sourcing.adoc b/antora/components/userguide/modules/fun/pages/concepts-patterns/apache-isis-vs-cqrs-and-event-sourcing.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/concepts-patterns/apache-isis-vs-cqrs-and-event-sourcing.adoc
rename to antora/components/userguide/modules/fun/pages/concepts-patterns/apache-isis-vs-cqrs-and-event-sourcing.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/concepts-patterns/architecture.adoc b/antora/components/userguide/modules/fun/pages/concepts-patterns/architecture.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/concepts-patterns/architecture.adoc
rename to antora/components/userguide/modules/fun/pages/concepts-patterns/architecture.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/concepts-patterns/core-values.adoc b/antora/components/userguide/modules/fun/pages/concepts-patterns/core-values.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/concepts-patterns/core-values.adoc
rename to antora/components/userguide/modules/fun/pages/concepts-patterns/core-values.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/concepts-patterns/deployment-options.adoc b/antora/components/userguide/modules/fun/pages/concepts-patterns/deployment-options.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/concepts-patterns/deployment-options.adoc
rename to antora/components/userguide/modules/fun/pages/concepts-patterns/deployment-options.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/concepts-patterns/domain-driven-design.adoc b/antora/components/userguide/modules/fun/pages/concepts-patterns/domain-driven-design.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/concepts-patterns/domain-driven-design.adoc
rename to antora/components/userguide/modules/fun/pages/concepts-patterns/domain-driven-design.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/concepts-patterns/metamodel.adoc b/antora/components/userguide/modules/fun/pages/concepts-patterns/metamodel.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/concepts-patterns/metamodel.adoc
rename to antora/components/userguide/modules/fun/pages/concepts-patterns/metamodel.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/concepts-patterns/naked-objects-pattern.adoc b/antora/components/userguide/modules/fun/pages/concepts-patterns/naked-objects-pattern.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/concepts-patterns/naked-objects-pattern.adoc
rename to antora/components/userguide/modules/fun/pages/concepts-patterns/naked-objects-pattern.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/domain-entities-and-services.adoc b/antora/components/userguide/modules/fun/pages/domain-entities-and-services.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/domain-entities-and-services.adoc
rename to antora/components/userguide/modules/fun/pages/domain-entities-and-services.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/crud.adoc b/antora/components/userguide/modules/fun/pages/domain-entities-and-services/crud.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/domain-entities-and-services/crud.adoc
rename to antora/components/userguide/modules/fun/pages/domain-entities-and-services/crud.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/domain-entities.adoc b/antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-entities.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/domain-entities-and-services/domain-entities.adoc
rename to antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-entities.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc b/antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc
rename to antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-services.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/domain-entities-and-services/inject-services.adoc b/antora/components/userguide/modules/fun/pages/domain-entities-and-services/inject-services.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/domain-entities-and-services/inject-services.adoc
rename to antora/components/userguide/modules/fun/pages/domain-entities-and-services/inject-services.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/drop-downs-and-defaults.adoc b/antora/components/userguide/modules/fun/pages/drop-downs-and-defaults.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/drop-downs-and-defaults.adoc
rename to antora/components/userguide/modules/fun/pages/drop-downs-and-defaults.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/meta-annotations.adoc b/antora/components/userguide/modules/fun/pages/meta-annotations.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/meta-annotations.adoc
rename to antora/components/userguide/modules/fun/pages/meta-annotations.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/mixins.adoc b/antora/components/userguide/modules/fun/pages/mixins.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/mixins.adoc
rename to antora/components/userguide/modules/fun/pages/mixins.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/modules.adoc b/antora/components/userguide/modules/fun/pages/modules.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/modules.adoc
rename to antora/components/userguide/modules/fun/pages/modules.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/object-members.adoc b/antora/components/userguide/modules/fun/pages/object-members.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/object-members.adoc
rename to antora/components/userguide/modules/fun/pages/object-members.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/object-members/actions.adoc b/antora/components/userguide/modules/fun/pages/object-members/actions.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/object-members/actions.adoc
rename to antora/components/userguide/modules/fun/pages/object-members/actions.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/object-members/collections.adoc b/antora/components/userguide/modules/fun/pages/object-members/collections.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/object-members/collections.adoc
rename to antora/components/userguide/modules/fun/pages/object-members/collections.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/object-members/properties.adoc b/antora/components/userguide/modules/fun/pages/object-members/properties.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/object-members/properties.adoc
rename to antora/components/userguide/modules/fun/pages/object-members/properties.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/overview.adoc b/antora/components/userguide/modules/fun/pages/overview.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/overview.adoc
rename to antora/components/userguide/modules/fun/pages/overview.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/overview/business-rules.adoc b/antora/components/userguide/modules/fun/pages/overview/business-rules.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/overview/business-rules.adoc
rename to antora/components/userguide/modules/fun/pages/overview/business-rules.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/overview/events.adoc b/antora/components/userguide/modules/fun/pages/overview/events.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/overview/events.adoc
rename to antora/components/userguide/modules/fun/pages/overview/events.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/overview/identifiers.adoc b/antora/components/userguide/modules/fun/pages/overview/identifiers.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/overview/identifiers.adoc
rename to antora/components/userguide/modules/fun/pages/overview/identifiers.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/overview/modules.adoc b/antora/components/userguide/modules/fun/pages/overview/modules.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/overview/modules.adoc
rename to antora/components/userguide/modules/fun/pages/overview/modules.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/overview/object-members.adoc b/antora/components/userguide/modules/fun/pages/overview/object-members.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/overview/object-members.adoc
rename to antora/components/userguide/modules/fun/pages/overview/object-members.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/overview/programming-model.adoc b/antora/components/userguide/modules/fun/pages/overview/programming-model.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/overview/programming-model.adoc
rename to antora/components/userguide/modules/fun/pages/overview/programming-model.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/overview/types-of-domain-objects.adoc b/antora/components/userguide/modules/fun/pages/overview/types-of-domain-objects.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/overview/types-of-domain-objects.adoc
rename to antora/components/userguide/modules/fun/pages/overview/types-of-domain-objects.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/programming-model.adoc b/antora/components/userguide/modules/fun/pages/programming-model.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/programming-model.adoc
rename to antora/components/userguide/modules/fun/pages/programming-model.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/ui.adoc b/antora/components/userguide/modules/fun/pages/ui.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/ui.adoc
rename to antora/components/userguide/modules/fun/pages/ui.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/ui/action-icons-and-css.adoc b/antora/components/userguide/modules/fun/pages/ui/action-icons-and-css.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/ui/action-icons-and-css.adoc
rename to antora/components/userguide/modules/fun/pages/ui/action-icons-and-css.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/ui/menubars-layout.adoc b/antora/components/userguide/modules/fun/pages/ui/menubars-layout.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/ui/menubars-layout.adoc
rename to antora/components/userguide/modules/fun/pages/ui/menubars-layout.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/ui/names-and-descriptions.adoc b/antora/components/userguide/modules/fun/pages/ui/names-and-descriptions.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/ui/names-and-descriptions.adoc
rename to antora/components/userguide/modules/fun/pages/ui/names-and-descriptions.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/ui/object-layout.adoc b/antora/components/userguide/modules/fun/pages/ui/object-layout.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/ui/object-layout.adoc
rename to antora/components/userguide/modules/fun/pages/ui/object-layout.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/ui/object-titles-and-icons.adoc b/antora/components/userguide/modules/fun/pages/ui/object-titles-and-icons.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/ui/object-titles-and-icons.adoc
rename to antora/components/userguide/modules/fun/pages/ui/object-titles-and-icons.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/ui/table-columns.adoc b/antora/components/userguide/modules/fun/pages/ui/table-columns.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/ui/table-columns.adoc
rename to antora/components/userguide/modules/fun/pages/ui/table-columns.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/view-models.adoc b/antora/components/userguide/modules/fun/pages/view-models.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/view-models.adoc
rename to antora/components/userguide/modules/fun/pages/view-models.adoc
diff --git a/api/adoc/userguide/modules/fun/pages/view-models/UNUSED-dto.adoc b/antora/components/userguide/modules/fun/pages/view-models/UNUSED-dto.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/pages/view-models/UNUSED-dto.adoc
rename to antora/components/userguide/modules/fun/pages/view-models/UNUSED-dto.adoc
diff --git a/api/adoc/userguide/modules/fun/partials/_deployment-options.adoc b/antora/components/userguide/modules/fun/partials/_deployment-options.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/partials/_deployment-options.adoc
rename to antora/components/userguide/modules/fun/partials/_deployment-options.adoc
diff --git a/api/adoc/userguide/modules/fun/partials/module-nav.adoc b/antora/components/userguide/modules/fun/partials/module-nav.adoc
similarity index 100%
rename from api/adoc/userguide/modules/fun/partials/module-nav.adoc
rename to antora/components/userguide/modules/fun/partials/module-nav.adoc
diff --git a/antora/playbooks/site-refguide.yml b/antora/playbooks/site-refguide.yml
index 1a0a923..f6ec4c5 100644
--- a/antora/playbooks/site-refguide.yml
+++ b/antora/playbooks/site-refguide.yml
@@ -27,10 +27,14 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
-# api
- url: .
- start_path: api/adoc/refguide # refguide
+ start_path: antora/components/refguide # refguide
+ branches: HEAD
+ - url: .
+ start_path: antora/components/refguide-index # refguide
branches: HEAD
+
+# api
- url: .
start_path: api/applib/src/main/adoc # refguide
branches: HEAD
diff --git a/antora/playbooks/site-userguide.yml b/antora/playbooks/site-userguide.yml
index 89af206..d8bfb08 100644
--- a/antora/playbooks/site-userguide.yml
+++ b/antora/playbooks/site-userguide.yml
@@ -27,9 +27,8 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
-# api
- url: .
- start_path: api/adoc/userguide # userguide
+ start_path: antora/components/userguide # userguide
branches: HEAD
# examples
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index d480889..dc046ee 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -40,16 +40,16 @@ content:
start_path: antora/components/setupguide # setupguide
branches: HEAD
- url: .
- start_path: antora/components/refguide-index # refguide
+ start_path: antora/components/refguide # refguide
branches: HEAD
-
-# api
- url: .
- start_path: api/adoc/refguide # refguide
+ start_path: antora/components/refguide-index # refguide
branches: HEAD
- url: .
- start_path: api/adoc/userguide # userguide
+ start_path: antora/components/userguide # userguide
branches: HEAD
+
+# api
- url: .
start_path: api/applib/src/main/adoc # refguide
branches: HEAD
diff --git a/api/adoc/pom.xml b/api/adoc/pom.xml
deleted file mode 100644
index 3749db1..0000000
--- a/api/adoc/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../../core/pom.xml</relativePath>
- </parent>
-
- <artifactId>isis-api-adoc</artifactId>
-
- <name>Apache Isis Core - API Documentation</name>
- <description>
- User guide and reference guide.
- This pom.xml is just for convenience to allow the documentation to be
- opened independently of the entire project. It is not part of the
- main hierarchy.
- </description>
-
-</project>