You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/10/08 06:52:34 UTC
[isis] branch ISIS-2062 updated (2cbf8c2 -> 1311c32)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 2cbf8c2 ISIS-2062: renames fis to runtime-services
add 1b4ad4d ISIS-2158: makes the ServiceInjectorDefault thread-safe
new f9d2318 ISIS-2062: reorgs _partials dir
new c5b44e4 ISIS-2062: uses simplified antora 2.x directory structure (remove 'assets' dir)
new e6e4f22 ISIS-2062: fixes includes for simplified-representations
new 1311c32 ISIS-2062: refactors testing docs to use distributed component pattern
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../archdesign/modules/ROOT/_attributes.adoc | 6 +--
.../modules/ROOT/assets/attachments/.gitkeep | 0
.../archdesign/modules/ROOT/assets/images/.gitkeep | 0
.../archdesign/modules/ROOT/attachments}/.gitkeep | 0
.../archdesign/modules/ROOT/images}/.gitkeep | 0
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../modules/ROOT/partials}/_attributes.adoc | 0
.../mignotes/modules/ROOT/_attributes.adoc | 6 +--
.../modules/ROOT/assets/attachments/.gitkeep | 0
.../mignotes/modules/ROOT/assets/images/.gitkeep | 0
.../mignotes/modules/ROOT/attachments}/.gitkeep | 0
.../mignotes/modules/ROOT/images}/.gitkeep | 0
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../modules/ROOT/partials}/_attributes.adoc | 0
.../refguide/modules/ROOT/_attributes.adoc | 7 ++-
.../refguide/modules/ROOT/pages/about.adoc | 2 +-
.../modules/ROOT/partials/_attributes.adoc | 2 +-
.../relnotes/modules/ROOT/_attributes.adoc | 6 +--
.../modules/ROOT/assets/attachments/.gitkeep | 0
.../relnotes/modules/ROOT/assets/images/.gitkeep | 0
.../relnotes/modules/ROOT/attachments}/.gitkeep | 0
.../relnotes/modules/ROOT/images}/.gitkeep | 0
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../modules/ROOT/partials/_attributes.adoc | 0
.../_adoc => antora/components/testing}/antora.yml | 2 +-
.../components/testing}/examples.csv | 0
.../testing/modules/ROOT/_attributes.adoc | 6 +++
.../testing/modules/ROOT/attachments}/.gitkeep | 0
.../testing/modules/ROOT/examples}/.gitkeep | 0
.../testing/modules/ROOT/images}/.gitkeep | 0
antora/components/testing/modules/ROOT/nav.adoc | 2 +
.../testing}/modules/ROOT/pages/_attributes.adoc | 0
.../testing}/modules/ROOT/pages/about.adoc | 0
.../testing}/modules/ROOT/pages/overview.adoc | 0
.../modules/ROOT/partials}/_attributes.adoc | 0
.../modules/ROOT/partials/component-nav.adoc | 9 ++++
.../testing/modules/ROOT/partials/module-nav.adoc | 3 ++
.../components/testing}/sync_examples.sh | 0
.../components/toc/modules/ROOT/_attributes.adoc | 5 +--
.../toc/modules/ROOT/assets/attachments/.gitkeep | 0
.../toc/modules/ROOT/attachments}/.gitkeep | 0
.../images/going-deeper/books/dhnako.jpg | Bin
.../going-deeper/books/nakedobjects-book.jpg | Bin
.../ROOT/{assets => }/images/more-thanks/ecp.png | Bin
.../images/more-thanks/ecp_logo_white.png | Bin
.../images/more-thanks/ej-technologies.png | Bin
.../images/more-thanks/icons8-logo.png | Bin
.../{assets => }/images/more-thanks/s101_170.png | Bin
.../ROOT/{assets => }/images/tv_show-25.png | Bin
.../isis-in-pictures/010-login.png | Bin
.../isis-in-pictures/020-install-fixtures.png | Bin
.../isis-in-pictures/030-dashboard-view-model.png | Bin
.../isis-in-pictures/040-domain-entity.png | Bin
.../isis-in-pictures/050-edit-property.png | Bin
.../isis-in-pictures/060-invoke-action.png | Bin
.../isis-in-pictures/065-contributions.png | Bin
.../isis-in-pictures/067-contributed-action.png | Bin
.../isis-in-pictures/070-pluggable-views.png | Bin
.../isis-in-pictures/080-gmap3-view.png | Bin
.../isis-in-pictures/090-fullcalendar2-view.png | Bin
.../isis-in-pictures/100-excel-view-and-docx.png | Bin
.../isis-in-pictures/110-docx.png | Bin
.../isis-in-pictures/120-auditing.png | Bin
.../isis-in-pictures/130-security.png | Bin
.../isis-in-pictures/140-i18n.png | Bin
.../isis-in-pictures/150-appsettings.png | Bin
.../isis-in-pictures/160-switch-tenancy.png | Bin
.../isis-in-pictures/170-me.png | Bin
.../isis-in-pictures/180-app-user-entity.png | Bin
.../isis-in-pictures/190-switch-theme.png | Bin
.../isis-in-pictures/200-rest-api.png | Bin
.../isis-in-pictures/205-swagger-ui.png | Bin
.../isis-in-pictures/210-fixture-scripts.png | Bin
.../isis-in-pictures/220-testing-happy-case.png | Bin
.../230-testing-wrapper-factory.png | Bin
.../isis-in-pictures/240-domain-events.png | Bin
.../250-domain-event-subscriber.png | Bin
.../isis-in-pictures/260-domain-event-test.png | Bin
.../powered-by/commapp/screenshot-1.png | Bin
.../powered-by/commapp/screenshot-2.png | Bin
.../powered-by/cqnz/cqnz-advert.png | Bin
.../powered-by/estatio/est-home-page.png | Bin
.../powered-by/estatio/est-invoice.png | Bin
.../estatio/est-payment-batch-manager.png | Bin
.../powered-by/estatio/estatio-1.png | Bin
.../gesconsultor-grc/fig-1-custom-viewer.png | Bin
.../fig-2-custom-drag-n-drop-interface.png | Bin
.../fig-3-custom-ui-analyzing-risk-scenarios.png | Bin
.../gesconsultor-grc/fig-4-managing-projects.png | Bin
.../transportplanner/TransportDemand.png | Bin
.../pages/what-is-apache-isis/screencasts.adoc | 6 +--
.../toc/modules/ROOT/partials/_attributes.adoc | 2 +-
.../ROOT/partials/_powered-by_contactapp.adoc | 3 +-
.../partials/_powered-by_gesconsultor-grc.adoc | 2 +-
.../toc/modules/comguide/_attributes.adoc | 6 +--
.../modules/comguide/assets/attachments/.gitkeep | 0
.../toc/modules/comguide}/attachments/.gitkeep | 0
.../images/committers/github-pr-history.png | Bin
.../images/docker/020-docker-nat-public.png | Bin
.../images/docker/022-local-security-policy.png | Bin
.../images/docker/024-unidentified-are-private.png | Bin
.../images/docker/026-docker-nat-private.png | Bin
.../{assets => }/images/docker/docker-daemon.png | Bin
.../release-process/jira-create-release-notes.png | Bin
.../images/release-process/nexus-release-1.png | Bin
.../images/release-process/nexus-staging-0.png | Bin
.../images/release-process/nexus-staging-1.png | Bin
.../images/release-process/nexus-staging-2.png | Bin
.../images/release-process/nexus-staging-2a.png | Bin
.../images/release-process/nexus-staging-3.png | Bin
.../images/release-process/nexus-staging-4.png | Bin
.../comguide/pages/_partials/_attributes.adoc | 4 --
.../modules/comguide}/partials/_attributes.adoc | 0
.../toc/modules/devguide/_attributes.adoc | 6 +--
.../asciidoc-syntax-quick-reference.pdf | Bin
.../attachments/asciidoc-writers-guide.pdf | Bin
.../eclipse/Apache-Isis-code-style-cleanup.xml | 0
.../eclipse/Apache-code-style-formatting.xml | 0
.../eclipse/Apache-code-style-template.xml | 0
.../attachments/eclipse/isis-templates.xml | 0
.../attachments/eclipse/isis.importorder | 0
.../attachments/eclipse/jmock2-templates.xml | 0
.../attachments/eclipse/junit4-templates.xml | 0
.../{assets => }/attachments/intellij/.gitignore | 0
.../intellij/isis-settings-file-templates.jar | Bin
.../attachments/intellij/other/.gitignore | 0
.../intellij/other/dan-settings-keymaps.jar | Bin
.../attachments/resources/IsisCheatSheet.docx | Bin
.../attachments/resources/IsisCheatSheet.pdf | Bin
.../{assets => }/images/asciidoctor/ditaa-demo.png | Bin
.../images/asciidoctor/graphviz-demo.png | Bin
.../images/asciidoctor/plantuml-demo.png | Bin
.../images/building-apache-isis/setting-up-git.png | Bin
.../images/contributing/git-workflow.png | Bin
.../images/contributing/git-workflow.pptx | Bin
.../images/contributing/github-cloning.png | Bin
.../images/contributing/github-forking.png | Bin
.../eclipse/2017-oxygen/010-lombok-locate-jar.png | Bin
.../020-lombok-install-into-eclipse.png | Bin
.../030-datanucleus-install-new-software.png | Bin
.../040-datanucleus-specify-repository.png | Bin
.../2017-oxygen/050-datanucleus-select-plugin.png | Bin
.../060-enable-annotation-processor.png | Bin
.../eclipse/eclipse-010-windows-preferences.png | Bin
.../eclipse/eclipse-025-project-properties.png | Bin
.../images/eclipse/eclipse-100-project-support.png | Bin
.../images/eclipse/eclipse-110-project-support.png | Bin
.../images/eclipse/eclipse-120-console.png | Bin
.../eclipse-200-enhancer-fails-duplicates.png | Bin
.../eclipse-210-enhancer-fails-duplicates.png | Bin
.../eclipse-220-enhancer-fails-duplicates.png | Bin
.../010-installing/010-welcome-page.png | Bin
.../010-installing/020-choose-location.png | Bin
.../010-installing/030-installation-options.png | Bin
.../010-installing/040-start-menu-folder.png | Bin
.../010-installing/050-completing.png | Bin
.../010-installing/060-import-settings-or-not.png | Bin
.../010-installing/070-set-ui-theme.png | Bin
.../010-new-project-create.png | Bin
.../020-java-project-setup-jdk.png | Bin
.../030-java-project-select-jdk.png | Bin
.../020-create-new-project/040-sdk-selected.png | Bin
.../050-name-and-location.png | Bin
.../020-create-new-project/060-create-dir.png | Bin
.../010-settings-import-jar.png | Bin
.../030-import-settings/020-select-all.png | Bin
.../030-import-settings/030-restart.png | Bin
.../030-import-settings/040-file-templates.png | Bin
.../030-import-settings/050-live-templates.png | Bin
.../010-build-automatically.png | Bin
.../020-annotation-processor.png | Bin
.../010-maven-installation.png | Bin
.../020-maven-configuration.png | Bin
.../044-other-settings-misc/010-auto-import.png | Bin
.../050-some-plugins/010-some-plugins.png | Bin
.../020-some-plugins-confirmation.png | Bin
.../maven-helper/010-dependency-tab.png | Bin
.../maven-helper/020-dependency-as-tree.png | Bin
.../maven-helper/030-maven-run-goal.png | Bin
.../maven-helper/040-maven-quick-run.png | Bin
.../060-troubleshooting/010-duplicate-classes.png | Bin
.../070-advanced/002-compiler-exclude.png | Bin
.../070-advanced/004-gradle-output.png | Bin
.../070-advanced/005-gradle-output.png | Bin
.../070-advanced/006-livereload-js.png | Bin
.../010-dcevm-list-of-found-jdk-installations.png | Bin
.../070-advanced/020-dcevm-once-installed.png | Bin
.../030-dcevm-intellij-project-structure.png | Bin
.../070-advanced/040-dcevm-run-configuration.png | Bin
.../010-maven-modules-view.png | Bin
.../020-adding-another-module.png | Bin
.../030-other-module-added.png | Bin
.../100-maven-module-mgmt/040-ignoring-modules.png | Bin
.../050-ignoring-modules-2.png | Bin
.../100-maven-module-mgmt/060-ignored-modules.png | Bin
.../110-running-the-app/010-run-configuration.png | Bin
.../020-datanucleus-enhancer-goal.png | Bin
.../110-running-the-app/030-running-unit-tests.png | Bin
.../040-running-unit-tests-run-configuration.png | Bin
...running-integration-tests-run-configuration.png | Bin
.../200-project-sdk/010-file-project-structure.png | Bin
.../200-project-sdk/020-select-jdk.png | Bin
.../200-project-sdk/030-select-jdk-directory.png | Bin
.../200-project-sdk/040-set-project-level.png | Bin
.../200-project-sdk/050-isis-language-level-7.png | Bin
.../200-project-sdk/060-app-language-level-8.png | Bin
.../250-new-project/010-new-project.png | Bin
.../250-new-project/020-new-project-name.png | Bin
.../250-new-project/030-new-project-new-window.png | Bin
.../040-new-module-from-existing-sources.png | Bin
.../250-new-project/050-specify-source-folder.png | Bin
.../250-new-project/060-import-using-maven.png | Bin
.../250-new-project/070-import-module-settings.png | Bin
.../250-new-project/080-maven-profiles.png | Bin
.../250-new-project/090-maven-coordinates.png | Bin
.../250-new-project/100-annotation-processing.png | Bin
.../250-new-project/110-parameter8.png | Bin
.../250-new-project/120-clean-generate-sources.png | Bin
.../010-configuring-the-compiler.png | Bin
.../run-debug-configuration-single-module.png | Bin
.../devguide}/images/layouts/estatio-Lease.png | Bin
.../images/resources/IsisCheatSheet.png | Bin
.../devguide/pages/_partials/_attributes.adoc | 4 --
.../modules/devguide/partials}/_attributes.adoc | 0
.../devguide/{pages/_partials => partials}/x.sh | 0
.../toc/modules/module-template/_attributes.adoc | 6 +--
.../module-template/assets/attachments/.gitkeep | 0
.../modules/module-template/assets/images/.gitkeep | 0
.../modules/module-template/attachments}/.gitkeep | 0
.../toc/modules/module-template/images}/.gitkeep | 0
.../pages/_partials/_attributes.adoc | 4 --
.../module-template/partials}/_attributes.adoc | 0
.../userguide/modules/ROOT/_attributes.adoc | 6 +--
.../userguide/modules/btb/_attributes.adoc | 6 +--
.../modules/btb/assets/attachments/.gitkeep | 0
.../userguide/modules/btb/attachments}/.gitkeep | 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
.../images/hints-and-tips/are-you-sure.png | Bin
.../images/hints-and-tips/view-model-fail.png | Bin
.../images/hints-and-tips/view-model-success.png | Bin
.../{assets => }/images/runtime/web-xml/key.png | Bin
.../{assets => }/images/runtime/web-xml/parts.pptx | Bin
.../images/runtime/web-xml/ro-only.png | Bin
.../images/runtime/web-xml/wicket-and-ro.png | Bin
.../images/runtime/web-xml/wicket-only.png | Bin
.../modules/btb/pages/_partials/_attributes.adoc | 4 --
.../userguide/modules/btb/pages/i18n.adoc | 2 +-
.../modules/btb}/partials/_attributes.adoc | 0
.../userguide/modules/fun/_attributes.adoc | 6 +--
.../core-concepts/Pawson-Naked-Objects-thesis.pdf | 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/programming-model/todoapp-Dashboard.png | Bin
.../modules/fun/pages/_partials/_attributes.adoc | 4 --
.../apache-isis-vs/mvc-server-side.adoc | 2 +-
.../userguide/modules/fun/pages/crud.adoc | 2 +-
.../modules/fun/partials}/_attributes.adoc | 0
core/applib/_adoc/modules/ROOT/_attributes.adoc | 7 ++-
.../_adoc/modules/ROOT/partials/_attributes.adoc | 2 +-
core/applib/_adoc/modules/ant/_attributes.adoc | 6 +--
.../_adoc/modules/ant/assets/attachments/.gitkeep | 0
.../_adoc/modules/ant/assets/images/.gitkeep | 0
.../applib/_adoc/modules/ant}/attachments/.gitkeep | 0
.../applib/_adoc/modules/ant}/images/.gitkeep | 0
.../ActionLayout}/bookmarking.png | Bin
.../ActionLayout/position-BELOW.png | Bin
.../ActionLayout/position-PANEL.png | Bin
.../ActionLayout/position-PANEL_DROPDOWN.png | Bin
.../ActionLayout/position-RIGHT.png | Bin
.../CollectionLayout/sortedby-dependencies.png | Bin
.../DomainObjectLayout/bookmarking-nested.png | Bin
.../DomainObjectLayout}/bookmarking.png | Bin
.../DomainServiceLayout/menuBar-primary.png | Bin
.../DomainServiceLayout/menuBar-secondary.png | Bin
.../DomainServiceLayout/menuBar-tertiary.png | Bin
.../DomainServiceLayout/menuOrder.png | Bin
.../reference-annotations/HomePage/HomePage.png | Bin
.../PropertyLayout/labelPosition-LEFT.png | Bin
.../PropertyLayout/labelPosition-NONE.png | Bin
.../PropertyLayout/labelPosition-TOP.png | Bin
.../PropertyLayout/labelPosition-boolean-LEFT.png | Bin
.../PropertyLayout/labelPosition-boolean-RIGHT.png | Bin
core/applib/_adoc/modules/ant/pages/Inject.adoc | 2 +-
.../_adoc/modules/ant/partials/_attributes.adoc | 2 +-
core/applib/_adoc/modules/cms/_attributes.adoc | 6 +--
.../_adoc/modules/cms/assets/attachments/.gitkeep | 0
.../applib/_adoc/modules/cms}/attachments/.gitkeep | 0
.../reference-classes/issue-in-more-detail.png | Bin
.../prefixes/choices/dependent.png | Bin
.../reserved/cssClass/strikethrough.png | Bin
.../reserved/iconName/differing.pdn | Bin
.../reserved/iconName/differing.png | Bin
.../reserved/iconName/png-files.png | Bin
.../modules/cms}/images/value-types/markup.png | Bin
.../pages/classes/AppManifest-bootstrapping.adoc | 2 +-
.../pages/classes/AppManifest2-bootstrapping.adoc | 2 +-
.../_adoc/modules/cms/partials/_attributes.adoc | 2 +-
core/applib/_adoc/modules/svc/_attributes.adoc | 6 +--
.../_adoc/modules/svc/assets/attachments/.gitkeep | 0
.../applib/_adoc/modules/svc/attachments}/.gitkeep | 0
.../reference-services-api/acceptheaderservice.png | Bin
.../acceptheaderservice.pptx | Bin
.../ErrorReportingService/kitchensink-example.png | Bin
.../action-invocation-published-to-stderr.png | Bin
.../changed-object-published-to-stderr.png | Bin
.../PublishingService/yuml.me-23db58a4.png | Bin
.../UserProfileService/todoapp.png | Bin
.../images/reference-services/categories.png | Bin
.../images/reference-services/categories.pptx | Bin
.../reference-services/commands-and-events.png | Bin
.../reference-services/commands-and-events.pptx | Bin
.../application-layer-api/WrapperFactory.adoc | 4 +-
.../svc/pages/metadata-api/SwaggerService.adoc | 3 +-
.../persistence-layer-api/IsisJdoSupport.adoc | 2 +-
.../modules/svc/pages/testing/SudoService.adoc | 2 +-
core/config/_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../config/_adoc/modules/ROOT}/images/.gitkeep | 0
.../_adoc/modules/ROOT/partials/_attributes.adoc | 2 +-
.../ServiceInjectorTestUsingCodegenPlugin.java | 2 +-
.../metamodel/services/ServiceInjectorDefault.java | 4 +-
.../jdo/_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../jdo/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../images/hints-n-tips/diagnosing-n-plus-1.png | Bin
.../party-agreementrole-agreement.png | Bin
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
core/pom.xml | 9 +++-
.../_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../ContentNegotiationService/accept-json.png | Bin
.../ContentNegotiationService/accept-xml.png | Bin
.../ContentNegotiationService/facade-choices.png | Bin
.../ContentNegotiationService/facade-choices.pptx | Bin
.../service-collaborations.png | Bin
.../service-collaborations.pptx | Bin
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials}/_attributes.adoc | 0
core/schema/_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../reference-classes/issue-in-more-detail.png | Bin
.../prefixes/choices/dependent.png | Bin
.../reserved/cssClass/strikethrough.png | Bin
.../reserved/iconName/differing.pdn | Bin
.../reserved/iconName/differing.png | Bin
.../reserved/iconName/png-files.png | Bin
.../modules/ROOT}/images/value-types/markup.png | Bin
.../_adoc/modules/ROOT/partials/_attributes.adoc | 2 +-
.../api/_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../attachments/security-apis-impl.pptx | Bin
.../api/_adoc/modules/ROOT}/images/.gitkeep | 0
.../bypass/_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../configure-isis-to-use-bypass.PNG | Bin
.../shiro/_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../shiro/_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../ldap}/activeds-ldap-groups.png | Bin
.../ldap}/activeds-ldap-mojo-partition.png | Bin
.../ldap}/activeds-ldap-mojo-root-dse.png | Bin
.../ldap}/activeds-ldap-sasl-authentication.png | Bin
.../ldap}/activeds-ldap-users.png | Bin
.../configure-isis-to-use-shiro.png | Bin
.../configure-shiro-to-use-custom-jdbc-realm.png | Bin
.../configure-shiro-to-use-ini-realm.PNG | Bin
.../configure-shiro-to-use-isis-ldap-realm.PNG | Bin
.../_adoc/modules/ROOT/partials/_attributes.adoc | 2 +-
.../_adoc/modules/realm-jdbc/_attributes.adoc | 6 +--
.../_adoc/modules/realm-jdbc/attachments}/.gitkeep | 0
.../configure-shiro-to-use-custom-jdbc-realm.png | Bin
.../modules/realm-jdbc/partials/_attributes.adoc | 2 +-
.../_adoc/modules/realm-ldap/_attributes.adoc | 6 +--
.../_adoc/modules/realm-ldap}/attachments/.gitkeep | 0
.../images}/activeds-ldap-groups.png | Bin
.../images}/activeds-ldap-mojo-partition.png | Bin
.../images}/activeds-ldap-mojo-root-dse.png | Bin
.../images}/activeds-ldap-sasl-authentication.png | Bin
.../images}/activeds-ldap-users.png | Bin
.../configure-shiro-to-use-isis-ldap-realm.PNG | Bin
.../modules/realm-ldap/partials/_attributes.adoc | 2 +-
core/security/shiro/pom.xml | 2 +-
.../_adoc/modules/ROOT/_attributes.adoc | 6 ---
core/testsupport/_adoc/modules/ROOT/nav.adoc | 2 -
.../_adoc/modules/ROOT/partials/nav.adoc | 9 ----
core/testsupport/integtestsupport/_adoc/antora.yml | 7 +--
.../_adoc/modules/ROOT/_attributes.adoc | 6 ---
.../integtestsupport/_adoc/modules/ROOT/nav.adoc | 2 -
.../ROOT/pages/integ-test-support/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/nav.adoc | 9 ----
.../modules/integ-test-support/_attributes.adoc | 6 +++
.../integ-test-support/attachments}/.gitkeep | 0
.../modules/integ-test-support/examples}/.gitkeep | 0
.../images/integ-tests.png | Bin
.../images/integ-tests.pptx | Bin
.../images/wrapper-factory.png | Bin
.../_adoc/modules/integ-test-support/nav.adoc | 2 +
.../integ-test-support}/pages/_attributes.adoc | 0
.../{ROOT => integ-test-support}/pages/about.adoc | 12 +++---
.../pages/integ-test-support}/_attributes.adoc | 0
.../pages/integ-test-support/abstract-class.adoc | 6 +--
.../pages/integ-test-support/bootstrapping.adoc | 0
.../configuration-properties.adoc | 0
.../integ-test-support/maven-configuration.adoc | 0
.../pages/integ-test-support/typical-usage.adoc | 0
.../pages/integ-test-support/wrapper-factory.adoc | 0
.../integ-test-support/partials}/_attributes.adoc | 0
.../integ-test-support/partials/module-nav.adoc | 1 +
.../_adoc/modules/mvn/_attributes.adoc | 6 ---
.../modules/mvn/pages/_partials/_attributes.adoc | 4 --
core/testsupport/integtestsupport/test.data | 5 ---
core/testsupport/mavenplugin/_adoc/antora.yml | 2 +
.../testsupport/mavenplugin}/_adoc/examples.csv | 0
.../mavenplugin/_adoc/modules/mvn/_attributes.adoc | 6 +++
.../_adoc/modules/mvn/attachments}/.gitkeep | 0
.../_adoc/modules/mvn/examples}/.gitkeep | 0
.../modules/mvn}/images/maven-plugin/xsd-goal.png | Bin
.../modules/mvn}/images/maven-plugin/xsd-goal.pptx | Bin
.../mavenplugin/_adoc/modules/mvn/nav.adoc | 2 +
.../_adoc/modules/mvn}/pages/_attributes.adoc | 0
.../_adoc/modules/mvn/pages/about.adoc | 0
.../_adoc/modules/mvn/pages/intro.adoc | 0
.../_adoc/modules/mvn/pages/swagger.adoc | 0
.../_adoc/modules/mvn/pages/validate.adoc | 0
.../_adoc/modules/mvn/pages/xsd.adoc | 0
.../_adoc/modules/mvn/partials}/_attributes.adoc | 0
.../_adoc/modules/mvn/partials}/nav.adoc | 0
.../mavenplugin}/_adoc/sync_examples.sh | 0
.../{integtestsupport => mavenplugin}/pom.xml | 4 +-
.../apache/isis/mavenplugin/IsisMojoAbstract.java | 0
.../apache/isis/mavenplugin/IsisMojoSwagger.java | 0
.../apache/isis/mavenplugin/IsisMojoValidate.java | 0
.../org/apache/isis/mavenplugin/IsisMojoXsd.java | 0
.../isis/mavenplugin/MetaModelProcessor.java | 0
.../IsisMavenPlugin_SpringContextConfig.java | 0
.../IsisMavenPlugin_SpringContextLauncher.java | 0
core/testsupport/unittestsupport/_adoc/antora.yml | 6 +--
.../_adoc/modules/ROOT/_attributes.adoc | 6 ---
.../unittestsupport/_adoc/modules/ROOT/nav.adoc | 2 -
.../ROOT/pages/unit-test-support/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/nav.adoc | 9 ----
.../modules/unit-test-support/_attributes.adoc | 6 +++
.../unit-test-support/attachments}/.gitkeep | 0
.../modules/unit-test-support/examples}/.gitkeep | 0
.../modules/unit-test-support}/images/.gitkeep | 0
.../_adoc/modules/unit-test-support/nav.adoc | 2 +
.../unit-test-support}/pages/_attributes.adoc | 0
.../{ROOT => unit-test-support}/pages/about.adoc | 0
.../pages/unit-test-support}/_attributes.adoc | 0
.../pages/unit-test-support/contract-tests.adoc | 0
.../pages/unit-test-support/jmock-extensions.adoc | 0
.../unit-test-support/maven-configuration.adoc | 0
.../soap-fake-server-junit-rule.adoc | 0
.../unit-test-support/partials}/_attributes.adoc | 0
.../unit-test-support/partials/module-nav.adoc | 1 +
.../_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../ro-spec-resources-and-representations.png | Bin
.../ROOT/images/rgfis}/service-collaborations.png | Bin
.../_adoc/modules/ROOT/nav.adoc | 47 +--------------------
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/pages/hints-and-tips.adoc | 2 -
.../ROOT/pages/simplified-representations.adoc | 6 +++
.../action-invocation.adoc | 4 +-
.../_adoc/modules/ROOT/partials}/_attributes.adoc | 0
.../_adoc/modules/ROOT/partials/nav.adoc | 26 ++++++++++++
.../_adoc/modules/security/_attributes.adoc | 6 +--
.../_adoc/modules/security}/attachments/.gitkeep | 0
.../modules/security/{assets => }/images/.gitkeep | 0
.../_adoc/modules/security/nav.adoc | 4 ++
.../_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../{assets => }/images/about-page/about-page.png | Bin
.../images/application-menu/dividers.png | Bin
.../images/application-menu/layout-menus.pdn | Bin
.../images/application-menu/layout-menus.png | Bin
.../images/application-menu/tertiary.png | Bin
.../blob-attachments/010-attachment-field-940.png | Bin
.../blob-attachments/010-attachment-field.png | Bin
.../blob-attachments/020-edit-choose-file-940.png | Bin
.../blob-attachments/020-edit-choose-file.png | Bin
.../030-choose-file-using-browser-520.png | Bin
.../030-choose-file-using-browser.png | Bin
.../040-edit-chosen-file-indicated-940.png | Bin
.../040-edit-chosen-file-indicated.png | Bin
.../050-ok-if-image-then-rendered-940.png | Bin
.../050-ok-if-image-then-rendered.png | Bin
.../images/blob-attachments/060-download-940.png | Bin
.../images/blob-attachments/060-download.png | Bin
.../images/blob-attachments/070-edit-clear-940.png | Bin
.../images/blob-attachments/070-edit-clear.png | Bin
.../images/bookmarked-pages/panel-940.png | Bin
.../images/bookmarked-pages/panel-estatio-940.png | Bin
.../images/bookmarked-pages/panel-estatio.png | Bin
.../{assets => }/images/bookmarked-pages/panel.png | Bin
.../images/brand-logo/brand-logo-signin.png | Bin
.../{assets => }/images/brand-logo/brand-logo.png | Bin
.../images/copy-link/010-copy-link-button-940.png | Bin
.../images/copy-link/010-copy-link-button.png | Bin
.../images/copy-link/020-copy-link-dialog-940.png | Bin
.../images/copy-link/020-copy-link-dialog.png | Bin
.../images/copy-link/030-hints-940.png | Bin
.../{assets => }/images/copy-link/030-hints.png | Bin
.../copy-link/040-copy-link-with-hints-940.png | Bin
.../images/copy-link/040-copy-link-with-hints.png | Bin
.../images/copy-link/050-title-url-940.png | Bin
.../images/copy-link/050-title-url.png | Bin
.../ROOT/{assets => }/images/dialog-mode/modal.png | Bin
.../{assets => }/images/dialog-mode/sidebar.png | Bin
.../images/embedded-view/no-footer.png | Bin
.../images/embedded-view/no-header-no-footer.png | Bin
.../images/embedded-view/no-header.png | Bin
.../{assets => }/images/embedded-view/regular.png | Bin
.../images/features/recent-pages/recent-pages.png | Bin
.../object-titles-and-icons/cust-order-product.png | Bin
.../images/layout-dynamic-xml/ToDoAppDashboard.png | Bin
.../images/layout-dynamic-xml/ToDoItem.png | Bin
.../{assets => }/images/layouts/customer-order.png | Bin
.../images/layouts/estatio-Invoice.png | Bin
.../modules/ROOT}/images/layouts/estatio-Lease.png | Bin
.../images/layouts/estatio-LeaseItem.png | Bin
.../images/layouts/todoapp-ToDoItem.png | Bin
.../{assets => }/images/menubars/010-download.png | Bin
.../{assets => }/images/menubars/020-download.png | Bin
.../images/reference-layout/4-0-8-0.png | Bin
.../images/reference-layout/4-4-4-12.png | Bin
.../images/reference-layout/6-6-0-12.png | Bin
.../reference-layout/isis-layout-show-facets.css | 0
.../images/reference-layout/isis-layout.css | 0
.../images/reference-layout/layout-4-0-8-0.html | 0
.../images/reference-layout/layout-4-4-4-12.html | 0
.../images/reference-layout/layout-6-6-0-12.html | 0
.../login-page-default.png | Bin
.../login-page-suppress-password-reset.png | Bin
.../suppress-remember-me}/login-page-default.png | Bin
.../login-page-suppress-remember-me.png | Bin
.../suppress-sign-up}/login-page-default.png | Bin
.../login-page-suppress-sign-up.png | Bin
.../images/theme-chooser/example-1.png | Bin
.../images/theme-chooser/example-2.png | Bin
.../user-registration}/login-page-default.png | Bin
.../sign-up-after-registration.png | Bin
.../sign-up-email-with-verification-link.png | Bin
.../sign-up-login-page-after-sign-up.png | Bin
.../images/user-registration/sign-up-page.png | Bin
.../sign-up-registration-page.png | Bin
.../images/where-am-i/hello_grey_bg.png | Bin
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials}/_attributes.adoc | 0
.../_adoc/modules/security/_attributes.adoc | 6 +--
.../_adoc/modules/security}/attachments/.gitkeep | 0
.../_adoc/modules/security/images}/.gitkeep | 0
core/viewer-wicket/_adoc/modules/security/nav.adoc | 4 ++
.../apps/demo/_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials}/_attributes.adoc | 0
examples/apps/demo/pom.xml | 5 ++-
.../helloworld/_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../helloworld/_adoc/modules/ROOT/images}/.gitkeep | 0
.../images/helloworld-before-launch.png | Bin
.../ROOT/{assets => }/images/helloworld.png | Bin
.../images/using-hello-world/010-root-page.png | Bin
.../020-login-to-wicket-viewer.png | Bin
.../images/using-hello-world/030-home-page.png | Bin
.../040-create-object-from-menu.png | Bin
.../050-create-object-from-menu-prompt.png | Bin
.../using-hello-world/060-created-object.png | Bin
.../images/using-hello-world/070-update-name.png | Bin
.../images/using-hello-world/080-edit-notes.png | Bin
.../images/using-hello-world/090-delete-object.png | Bin
.../using-hello-world/100-object-deleted.png | Bin
.../200-swagger-ui-before-reload.png | Bin
.../using-hello-world/210-helloworld-resources.png | Bin
.../220-create-object-thru-rest-api.png | Bin
.../230-create-object-thru-rest-api-response.png | Bin
.../240-retrieve-object-using-rest-api.png | Bin
...250-retrieve-object-using-rest-api-response.png | Bin
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials}/_attributes.adoc | 0
examples/apps/helloworld/pom.xml | 2 +-
.../simpleapp/_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../ROOT/{assets => }/images/dockerhub-tags.png | Bin
.../images/simpleapp-webapp-before-launch.png | Bin
.../images/simpleapp-webapp-with-fixtures.png | Bin
.../ROOT/{assets => }/images/simpleapp-webapp.png | Bin
.../images/using-simple-app/030-home-page.png | Bin
.../040-run-fixture-script-menu.png | Bin
.../050-run-fixture-script-prompt.png | Bin
.../060-run-fixture-script-result.png | Bin
.../images/using-simple-app/070-home-page.png | Bin
.../using-simple-app/structure/structure.pptx | Bin
.../structure/structure/Slide1.PNG | Bin
.../structure/structure/Slide2.PNG | Bin
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials}/_attributes.adoc | 0
examples/apps/simpleapp/application/pom.xml | 2 +-
.../smoketests/_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../smoketests/_adoc/modules/ROOT/images}/.gitkeep | 0
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials}/_attributes.adoc | 0
examples/smoketests/pom.xml | 2 +-
.../asciidoc/_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../asciidoc/_adoc/modules/ROOT/images}/.gitkeep | 0
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials}/_attributes.adoc | 0
extensions/fixtures/_adoc/antora.yml | 6 +--
.../fixtures/_adoc/modules/ROOT/_attributes.adoc | 6 ---
extensions/fixtures/_adoc/modules/ROOT/nav.adoc | 2 -
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ext-fixtures/_attributes.adoc | 6 +++
.../modules/ext-fixtures/attachments}/.gitkeep | 0
.../_adoc/modules/ext-fixtures/examples}/.gitkeep | 0
.../_adoc/modules/ext-fixtures/images}/.gitkeep | 0
.../assets => ext-fixtures}/images/composite.png | Bin
.../assets => ext-fixtures}/images/flat-1.png | Bin
.../assets => ext-fixtures}/images/flat-2.png | Bin
.../images/organizing-fixture-scripts.pptx | Bin
.../images/prompt-specifying-number.png | Bin
.../assets => ext-fixtures}/images/prompt.png | Bin
.../images/prototyping-menu.png | Bin
.../assets => ext-fixtures}/images/result-list.png | Bin
.../fixtures/_adoc/modules/ext-fixtures/nav.adoc | 2 +
.../modules/ext-fixtures}/pages/_attributes.adoc | 0
.../{ROOT => ext-fixtures}/pages/about.adoc | 0
.../pages/fixture-scripts}/_attributes.adoc | 0
.../pages/fixture-scripts/api-and-usage.adoc | 2 +-
.../pages/fixture-scripts/sudo-service.adoc | 0
.../fixture-scripts/ticking-clock-fixture.adoc | 0
.../ext-fixtures/partials}/_attributes.adoc | 0
.../modules/ext-fixtures/partials/module-nav.adoc | 3 ++
.../incubator/_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../incubator/_adoc/modules/ROOT/images}/.gitkeep | 0
.../_adoc/modules/ROOT/partials}/_attributes.adoc | 0
.../markdown/_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../markdown/_adoc/modules/ROOT/images}/.gitkeep | 0
.../_adoc/modules/ROOT/partials}/_attributes.adoc | 0
.../secman/_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../secman/_adoc/modules/ROOT/images}/.gitkeep | 0
.../secman/_adoc/modules/api/_attributes.adoc | 6 +--
.../secman/_adoc/modules/api}/attachments/.gitkeep | 0
.../secman/_adoc/modules/api/images}/.gitkeep | 0
.../modules/encryption-jbcrypt/_attributes.adoc | 6 +--
.../encryption-jbcrypt/attachments}/.gitkeep | 0
.../modules/encryption-jbcrypt/images}/.gitkeep | 0
.../secman/_adoc/modules/model/_attributes.adoc | 6 +--
.../_adoc/modules/model/attachments}/.gitkeep | 0
.../secman/_adoc/modules/model/images}/.gitkeep | 0
.../_adoc/modules/persistence-jdo/_attributes.adoc | 6 +--
.../modules/persistence-jdo/attachments}/.gitkeep | 0
.../_adoc/modules/persistence-jdo/images}/.gitkeep | 0
.../_adoc/modules/realm-shiro/_attributes.adoc | 6 +--
.../modules/realm-shiro/attachments}/.gitkeep | 0
.../_adoc/modules/realm-shiro/images}/.gitkeep | 0
...s-security-module-realm-with-delegate-realm.PNG | Bin
...iro-to-use-isisaddons-security-module-realm.PNG | Bin
extensions/secman/realm-shiro/pom.xml | 2 +-
extensions/specsupport/_adoc/antora.yml | 6 +--
.../_adoc/modules/ROOT/_attributes.adoc | 6 ---
extensions/specsupport/_adoc/modules/ROOT/nav.adoc | 2 -
.../_adoc/modules/ext-specsupport/_attributes.adoc | 6 +++
.../modules/ext-specsupport/attachments}/.gitkeep | 0
.../modules/ext-specsupport}/examples/.gitkeep | 0
.../_adoc/modules/ext-specsupport/images}/.gitkeep | 0
.../_adoc/modules/ext-specsupport/nav.adoc | 2 +
.../ext-specsupport}/pages/_attributes.adoc | 0
.../{ROOT => ext-specsupport}/pages/about.adoc | 0
.../pages/bdd-spec-support}/_attributes.adoc | 0
.../pages/bdd-spec-support/how-it-works.adoc | 0
.../bdd-spec-support/maven-configuration.adoc | 0
.../pages/bdd-spec-support/writing-a-bdd-spec.adoc | 0
.../ext-specsupport/partials}/_attributes.adoc | 0
.../ext-specsupport/partials/module-nav.adoc | 3 ++
extensions/sse/_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../sse/_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../sse/_adoc/modules/ROOT/images}/.gitkeep | 0
.../_adoc/modules/ROOT/partials}/_attributes.adoc | 0
.../_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../_adoc/modules/ROOT/images}/.gitkeep | 0
.../_adoc/modules/ROOT/partials}/_attributes.adoc | 0
mavendeps/_adoc/modules/ROOT/_attributes.adoc | 6 +--
.../ROOT/{examples => attachments}/.gitkeep | 0
.../modules/ROOT/{examples => images}/.gitkeep | 0
.../ROOT/{pages => partials}/_attributes.adoc | 0
mavendeps/webapp/pom.xml | 2 +-
site.yml | 6 ++-
699 files changed, 316 insertions(+), 419 deletions(-)
delete mode 100644 antora/components/archdesign/modules/ROOT/assets/attachments/.gitkeep
delete mode 100644 antora/components/archdesign/modules/ROOT/assets/images/.gitkeep
rename {mavendeps/_adoc/modules/ROOT/assets/images => antora/components/archdesign/modules/ROOT/attachments}/.gitkeep (100%)
rename {mavendeps/_adoc/modules/ROOT/assets/attachments => antora/components/archdesign/modules/ROOT/images}/.gitkeep (100%)
delete mode 100644 antora/components/archdesign/modules/ROOT/pages/_partials/_attributes.adoc
rename {mavendeps/_adoc/modules/ROOT/pages/_partials => antora/components/archdesign/modules/ROOT/partials}/_attributes.adoc (100%)
delete mode 100644 antora/components/mignotes/modules/ROOT/assets/attachments/.gitkeep
delete mode 100644 antora/components/mignotes/modules/ROOT/assets/images/.gitkeep
rename {extensions/viewer-wicket-excel/_adoc/modules/ROOT/assets/images => antora/components/mignotes/modules/ROOT/attachments}/.gitkeep (100%)
rename {extensions/viewer-wicket-excel/_adoc/modules/ROOT/assets/attachments => antora/components/mignotes/modules/ROOT/images}/.gitkeep (100%)
delete mode 100644 antora/components/mignotes/modules/ROOT/pages/_partials/_attributes.adoc
rename {extensions/viewer-wicket-excel/_adoc/modules/ROOT/pages/_partials => antora/components/mignotes/modules/ROOT/partials}/_attributes.adoc (100%)
delete mode 100644 antora/components/relnotes/modules/ROOT/assets/attachments/.gitkeep
delete mode 100644 antora/components/relnotes/modules/ROOT/assets/images/.gitkeep
rename {extensions/sse/_adoc/modules/ROOT/assets/images => antora/components/relnotes/modules/ROOT/attachments}/.gitkeep (100%)
rename {extensions/sse/_adoc/modules/ROOT/assets/attachments => antora/components/relnotes/modules/ROOT/images}/.gitkeep (100%)
delete mode 100644 antora/components/relnotes/modules/ROOT/pages/_partials/_attributes.adoc
rename {extensions/specsupport/_adoc => antora/components/relnotes}/modules/ROOT/partials/_attributes.adoc (100%)
rename {core/testsupport/_adoc => antora/components/testing}/antora.yml (100%)
rename {core/testsupport/_adoc => antora/components/testing}/examples.csv (100%)
create mode 100644 antora/components/testing/modules/ROOT/_attributes.adoc
rename {extensions/specsupport/_adoc/modules/ROOT/examples => antora/components/testing/modules/ROOT/attachments}/.gitkeep (100%)
rename {extensions/specsupport/_adoc/modules/ROOT/assets/images => antora/components/testing/modules/ROOT/examples}/.gitkeep (100%)
rename {extensions/specsupport/_adoc/modules/ROOT/assets/attachments => antora/components/testing/modules/ROOT/images}/.gitkeep (100%)
create mode 100644 antora/components/testing/modules/ROOT/nav.adoc
rename {extensions/specsupport/_adoc => antora/components/testing}/modules/ROOT/pages/_attributes.adoc (100%)
rename {core/testsupport/_adoc => antora/components/testing}/modules/ROOT/pages/about.adoc (100%)
rename {core/testsupport/_adoc => antora/components/testing}/modules/ROOT/pages/overview.adoc (100%)
rename {extensions/fixtures/_adoc/modules/ROOT/pages => antora/components/testing/modules/ROOT/partials}/_attributes.adoc (100%)
create mode 100644 antora/components/testing/modules/ROOT/partials/component-nav.adoc
create mode 100644 antora/components/testing/modules/ROOT/partials/module-nav.adoc
rename {core/testsupport/_adoc => antora/components/testing}/sync_examples.sh (100%)
delete mode 100644 antora/components/toc/modules/ROOT/assets/attachments/.gitkeep
rename {extensions/secman/_adoc/modules/realm-shiro/assets/images => antora/components/toc/modules/ROOT/attachments}/.gitkeep (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/going-deeper/books/dhnako.jpg (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/going-deeper/books/nakedobjects-book.jpg (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/more-thanks/ecp.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/more-thanks/ecp_logo_white.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/more-thanks/ej-technologies.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/more-thanks/icons8-logo.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/more-thanks/s101_170.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/tv_show-25.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/010-login.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/020-install-fixtures.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/030-dashboard-view-model.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/040-domain-entity.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/050-edit-property.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/060-invoke-action.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/065-contributions.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/067-contributed-action.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/070-pluggable-views.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/080-gmap3-view.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/090-fullcalendar2-view.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/100-excel-view-and-docx.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/110-docx.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/120-auditing.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/130-security.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/140-i18n.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/150-appsettings.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/170-me.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/180-app-user-entity.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/190-switch-theme.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/200-rest-api.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/205-swagger-ui.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/210-fixture-scripts.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/220-testing-happy-case.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/230-testing-wrapper-factory.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/240-domain-events.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/250-domain-event-subscriber.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/isis-in-pictures/260-domain-event-test.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/powered-by/commapp/screenshot-1.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/powered-by/commapp/screenshot-2.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/powered-by/cqnz/cqnz-advert.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/powered-by/estatio/est-home-page.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/powered-by/estatio/est-invoice.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/powered-by/estatio/est-payment-batch-manager.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/powered-by/estatio/estatio-1.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-1-custom-viewer.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-4-managing-projects.png (100%)
rename antora/components/toc/modules/ROOT/{assets => }/images/what-is-apache-isis/powered-by/transportplanner/TransportDemand.png (100%)
delete mode 100644 antora/components/toc/modules/comguide/assets/attachments/.gitkeep
rename {extensions/secman/_adoc/modules/realm-shiro/assets => antora/components/toc/modules/comguide}/attachments/.gitkeep (100%)
rename antora/components/toc/modules/comguide/{assets => }/images/committers/github-pr-history.png (100%)
rename antora/components/toc/modules/comguide/{assets => }/images/docker/020-docker-nat-public.png (100%)
rename antora/components/toc/modules/comguide/{assets => }/images/docker/022-local-security-policy.png (100%)
rename antora/components/toc/modules/comguide/{assets => }/images/docker/024-unidentified-are-private.png (100%)
rename antora/components/toc/modules/comguide/{assets => }/images/docker/026-docker-nat-private.png (100%)
rename antora/components/toc/modules/comguide/{assets => }/images/docker/docker-daemon.png (100%)
rename antora/components/toc/modules/comguide/{assets => }/images/release-process/jira-create-release-notes.png (100%)
rename antora/components/toc/modules/comguide/{assets => }/images/release-process/nexus-release-1.png (100%)
rename antora/components/toc/modules/comguide/{assets => }/images/release-process/nexus-staging-0.png (100%)
rename antora/components/toc/modules/comguide/{assets => }/images/release-process/nexus-staging-1.png (100%)
rename antora/components/toc/modules/comguide/{assets => }/images/release-process/nexus-staging-2.png (100%)
rename antora/components/toc/modules/comguide/{assets => }/images/release-process/nexus-staging-2a.png (100%)
rename antora/components/toc/modules/comguide/{assets => }/images/release-process/nexus-staging-3.png (100%)
rename antora/components/toc/modules/comguide/{assets => }/images/release-process/nexus-staging-4.png (100%)
delete mode 100644 antora/components/toc/modules/comguide/pages/_partials/_attributes.adoc
rename {core/testsupport/unittestsupport/_adoc/modules/ROOT => antora/components/toc/modules/comguide}/partials/_attributes.adoc (100%)
rename antora/components/toc/modules/devguide/{assets => }/attachments/asciidoc-syntax-quick-reference.pdf (100%)
rename antora/components/toc/modules/devguide/{assets => }/attachments/asciidoc-writers-guide.pdf (100%)
rename antora/components/toc/modules/devguide/{assets => }/attachments/eclipse/Apache-Isis-code-style-cleanup.xml (100%)
rename antora/components/toc/modules/devguide/{assets => }/attachments/eclipse/Apache-code-style-formatting.xml (100%)
rename antora/components/toc/modules/devguide/{assets => }/attachments/eclipse/Apache-code-style-template.xml (100%)
rename antora/components/toc/modules/devguide/{assets => }/attachments/eclipse/isis-templates.xml (100%)
rename antora/components/toc/modules/devguide/{assets => }/attachments/eclipse/isis.importorder (100%)
rename antora/components/toc/modules/devguide/{assets => }/attachments/eclipse/jmock2-templates.xml (100%)
rename antora/components/toc/modules/devguide/{assets => }/attachments/eclipse/junit4-templates.xml (100%)
rename antora/components/toc/modules/devguide/{assets => }/attachments/intellij/.gitignore (100%)
rename antora/components/toc/modules/devguide/{assets => }/attachments/intellij/isis-settings-file-templates.jar (100%)
rename antora/components/toc/modules/devguide/{assets => }/attachments/intellij/other/.gitignore (100%)
rename antora/components/toc/modules/devguide/{assets => }/attachments/intellij/other/dan-settings-keymaps.jar (100%)
rename antora/components/toc/modules/devguide/{assets => }/attachments/resources/IsisCheatSheet.docx (100%)
rename antora/components/toc/modules/devguide/{assets => }/attachments/resources/IsisCheatSheet.pdf (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/asciidoctor/ditaa-demo.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/asciidoctor/graphviz-demo.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/asciidoctor/plantuml-demo.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/building-apache-isis/setting-up-git.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/contributing/git-workflow.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/contributing/git-workflow.pptx (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/contributing/github-cloning.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/contributing/github-forking.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/eclipse/2017-oxygen/010-lombok-locate-jar.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/eclipse/2017-oxygen/060-enable-annotation-processor.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/eclipse/eclipse-010-windows-preferences.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/eclipse/eclipse-025-project-properties.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/eclipse/eclipse-100-project-support.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/eclipse/eclipse-110-project-support.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/eclipse/eclipse-120-console.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/eclipse/eclipse-200-enhancer-fails-duplicates.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/eclipse/eclipse-210-enhancer-fails-duplicates.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/eclipse/eclipse-220-enhancer-fails-duplicates.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/010-installing/010-welcome-page.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/010-installing/020-choose-location.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/010-installing/030-installation-options.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/010-installing/040-start-menu-folder.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/010-installing/050-completing.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/010-installing/060-import-settings-or-not.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/010-installing/070-set-ui-theme.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/020-create-new-project/010-new-project-create.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/020-create-new-project/030-java-project-select-jdk.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/020-create-new-project/040-sdk-selected.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/020-create-new-project/050-name-and-location.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/020-create-new-project/060-create-dir.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/030-import-settings/010-settings-import-jar.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/030-import-settings/020-select-all.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/030-import-settings/030-restart.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/030-import-settings/040-file-templates.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/030-import-settings/050-live-templates.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/042-other-settings-maven/010-maven-installation.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/044-other-settings-misc/010-auto-import.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/050-some-plugins/010-some-plugins.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/060-troubleshooting/010-duplicate-classes.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/070-advanced/002-compiler-exclude.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/070-advanced/004-gradle-output.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/070-advanced/005-gradle-output.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/070-advanced/006-livereload-js.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/070-advanced/020-dcevm-once-installed.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/070-advanced/040-dcevm-run-configuration.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/100-maven-module-mgmt/030-other-module-added.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/110-running-the-app/010-run-configuration.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/110-running-the-app/030-running-unit-tests.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/200-project-sdk/010-file-project-structure.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/200-project-sdk/020-select-jdk.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/200-project-sdk/030-select-jdk-directory.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/200-project-sdk/040-set-project-level.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/200-project-sdk/050-isis-language-level-7.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/200-project-sdk/060-app-language-level-8.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/250-new-project/010-new-project.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/250-new-project/020-new-project-name.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/250-new-project/030-new-project-new-window.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/250-new-project/040-new-module-from-existing-sources.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/250-new-project/050-specify-source-folder.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/250-new-project/060-import-using-maven.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/250-new-project/070-import-module-settings.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/250-new-project/080-maven-profiles.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/250-new-project/090-maven-coordinates.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/250-new-project/100-annotation-processing.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/250-new-project/110-parameter8.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/250-new-project/120-clean-generate-sources.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/300-paraname8-support/010-configuring-the-compiler.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png (100%)
rename {core/viewer-wicket/_adoc/modules/ROOT/assets => antora/components/toc/modules/devguide}/images/layouts/estatio-Lease.png (100%)
rename antora/components/toc/modules/devguide/{assets => }/images/resources/IsisCheatSheet.png (100%)
delete mode 100644 antora/components/toc/modules/devguide/pages/_partials/_attributes.adoc
rename {core/testsupport/unittestsupport/_adoc/modules/ROOT/pages => antora/components/toc/modules/devguide/partials}/_attributes.adoc (100%)
rename antora/components/toc/modules/devguide/{pages/_partials => partials}/x.sh (100%)
delete mode 100644 antora/components/toc/modules/module-template/assets/attachments/.gitkeep
delete mode 100644 antora/components/toc/modules/module-template/assets/images/.gitkeep
rename {extensions/secman/_adoc/modules/persistence-jdo/assets/images => antora/components/toc/modules/module-template/attachments}/.gitkeep (100%)
rename {extensions/secman/_adoc/modules/persistence-jdo/assets/attachments => antora/components/toc/modules/module-template/images}/.gitkeep (100%)
delete mode 100644 antora/components/toc/modules/module-template/pages/_partials/_attributes.adoc
rename {core/testsupport/integtestsupport/_adoc/modules/mvn/pages => antora/components/toc/modules/module-template/partials}/_attributes.adoc (100%)
delete mode 100644 antora/components/userguide/modules/btb/assets/attachments/.gitkeep
rename {extensions/secman/_adoc/modules/model/assets/images => antora/components/userguide/modules/btb/attachments}/.gitkeep (100%)
rename antora/components/userguide/modules/btb/{assets => }/images/headless-access/BackgroundCommandExecution.png (100%)
rename antora/components/userguide/modules/btb/{assets => }/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png (100%)
rename antora/components/userguide/modules/btb/{assets => }/images/hints-and-tips/action-semantics-are-you-sure.png (100%)
rename antora/components/userguide/modules/btb/{assets => }/images/hints-and-tips/are-you-sure-happy-case.png (100%)
rename antora/components/userguide/modules/btb/{assets => }/images/hints-and-tips/are-you-sure-sad-case.png (100%)
rename antora/components/userguide/modules/btb/{assets => }/images/hints-and-tips/are-you-sure.png (100%)
rename antora/components/userguide/modules/btb/{assets => }/images/hints-and-tips/view-model-fail.png (100%)
rename antora/components/userguide/modules/btb/{assets => }/images/hints-and-tips/view-model-success.png (100%)
rename antora/components/userguide/modules/btb/{assets => }/images/runtime/web-xml/key.png (100%)
rename antora/components/userguide/modules/btb/{assets => }/images/runtime/web-xml/parts.pptx (100%)
rename antora/components/userguide/modules/btb/{assets => }/images/runtime/web-xml/ro-only.png (100%)
rename antora/components/userguide/modules/btb/{assets => }/images/runtime/web-xml/wicket-and-ro.png (100%)
rename antora/components/userguide/modules/btb/{assets => }/images/runtime/web-xml/wicket-only.png (100%)
delete mode 100644 antora/components/userguide/modules/btb/pages/_partials/_attributes.adoc
rename {core/testsupport/integtestsupport/_adoc/modules/ROOT => antora/components/userguide/modules/btb}/partials/_attributes.adoc (100%)
rename antora/components/userguide/modules/fun/{assets => }/attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf (100%)
rename antora/components/userguide/modules/fun/{assets => }/images/core-concepts/philosophy/build-vs-buy.png (100%)
rename antora/components/userguide/modules/fun/{assets => }/images/core-concepts/philosophy/build-vs-buy.pptx (100%)
rename antora/components/userguide/modules/fun/{assets => }/images/core-concepts/philosophy/decoupled-applications.png (100%)
rename antora/components/userguide/modules/fun/{assets => }/images/core-concepts/philosophy/decoupled-applications.pptx (100%)
rename antora/components/userguide/modules/fun/{assets => }/images/core-concepts/philosophy/hexagonal-architecture-addons.png (100%)
rename antora/components/userguide/modules/fun/{assets => }/images/core-concepts/philosophy/hexagonal-architecture.png (100%)
rename antora/components/userguide/modules/fun/{assets => }/images/core-concepts/philosophy/hexagonal-architecture.pptx (100%)
rename antora/components/userguide/modules/fun/{assets => }/images/programming-model/todoapp-Dashboard.png (100%)
delete mode 100644 antora/components/userguide/modules/fun/pages/_partials/_attributes.adoc
rename {core/testsupport/integtestsupport/_adoc/modules/ROOT/pages => antora/components/userguide/modules/fun/partials}/_attributes.adoc (100%)
delete mode 100644 core/applib/_adoc/modules/ant/assets/attachments/.gitkeep
delete mode 100644 core/applib/_adoc/modules/ant/assets/images/.gitkeep
rename {extensions/secman/_adoc/modules/model/assets => core/applib/_adoc/modules/ant}/attachments/.gitkeep (100%)
rename {extensions/secman/_adoc/modules/encryption-jbcrypt/assets => core/applib/_adoc/modules/ant}/images/.gitkeep (100%)
rename core/applib/_adoc/modules/ant/{assets/images/reference-annotations/DomainObjectLayout => images/reference-annotations/ActionLayout}/bookmarking.png (100%)
rename core/applib/_adoc/modules/ant/{assets => }/images/reference-annotations/ActionLayout/position-BELOW.png (100%)
rename core/applib/_adoc/modules/ant/{assets => }/images/reference-annotations/ActionLayout/position-PANEL.png (100%)
rename core/applib/_adoc/modules/ant/{assets => }/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png (100%)
rename core/applib/_adoc/modules/ant/{assets => }/images/reference-annotations/ActionLayout/position-RIGHT.png (100%)
rename core/applib/_adoc/modules/ant/{assets => }/images/reference-annotations/CollectionLayout/sortedby-dependencies.png (100%)
rename core/applib/_adoc/modules/ant/{assets => }/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png (100%)
rename core/applib/_adoc/modules/ant/{assets/images/reference-annotations/ActionLayout => images/reference-annotations/DomainObjectLayout}/bookmarking.png (100%)
rename core/applib/_adoc/modules/ant/{assets => }/images/reference-annotations/DomainServiceLayout/menuBar-primary.png (100%)
rename core/applib/_adoc/modules/ant/{assets => }/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png (100%)
rename core/applib/_adoc/modules/ant/{assets => }/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png (100%)
rename core/applib/_adoc/modules/ant/{assets => }/images/reference-annotations/DomainServiceLayout/menuOrder.png (100%)
rename core/applib/_adoc/modules/ant/{assets => }/images/reference-annotations/HomePage/HomePage.png (100%)
rename core/applib/_adoc/modules/ant/{assets => }/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png (100%)
rename core/applib/_adoc/modules/ant/{assets => }/images/reference-annotations/PropertyLayout/labelPosition-NONE.png (100%)
rename core/applib/_adoc/modules/ant/{assets => }/images/reference-annotations/PropertyLayout/labelPosition-TOP.png (100%)
rename core/applib/_adoc/modules/ant/{assets => }/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png (100%)
rename core/applib/_adoc/modules/ant/{assets => }/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png (100%)
delete mode 100644 core/applib/_adoc/modules/cms/assets/attachments/.gitkeep
rename {extensions/secman/_adoc/modules/encryption-jbcrypt/assets => core/applib/_adoc/modules/cms}/attachments/.gitkeep (100%)
rename core/{schema/_adoc/modules/ROOT/assets => applib/_adoc/modules/cms}/images/reference-classes/issue-in-more-detail.png (100%)
rename core/{schema/_adoc/modules/ROOT/assets => applib/_adoc/modules/cms}/images/reference-methods/prefixes/choices/dependent.png (100%)
rename core/{schema/_adoc/modules/ROOT/assets => applib/_adoc/modules/cms}/images/reference-methods/reserved/cssClass/strikethrough.png (100%)
rename core/{schema/_adoc/modules/ROOT/assets => applib/_adoc/modules/cms}/images/reference-methods/reserved/iconName/differing.pdn (100%)
rename core/{schema/_adoc/modules/ROOT/assets => applib/_adoc/modules/cms}/images/reference-methods/reserved/iconName/differing.png (100%)
rename core/{schema/_adoc/modules/ROOT/assets => applib/_adoc/modules/cms}/images/reference-methods/reserved/iconName/png-files.png (100%)
rename core/{schema/_adoc/modules/ROOT/assets => applib/_adoc/modules/cms}/images/value-types/markup.png (100%)
delete mode 100644 core/applib/_adoc/modules/svc/assets/attachments/.gitkeep
rename {extensions/secman/_adoc/modules/api/assets/images => core/applib/_adoc/modules/svc/attachments}/.gitkeep (100%)
rename core/applib/_adoc/modules/svc/{assets => }/images/reference-services-api/acceptheaderservice.png (100%)
rename core/applib/_adoc/modules/svc/{assets => }/images/reference-services-api/acceptheaderservice.pptx (100%)
rename core/applib/_adoc/modules/svc/{assets => }/images/reference-services-spi/ErrorReportingService/kitchensink-example.png (100%)
rename core/applib/_adoc/modules/svc/{assets => }/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png (100%)
rename core/applib/_adoc/modules/svc/{assets => }/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png (100%)
rename core/applib/_adoc/modules/svc/{assets => }/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png (100%)
rename core/applib/_adoc/modules/svc/{assets => }/images/reference-services-spi/UserProfileService/todoapp.png (100%)
rename core/applib/_adoc/modules/svc/{assets => }/images/reference-services/categories.png (100%)
rename core/applib/_adoc/modules/svc/{assets => }/images/reference-services/categories.pptx (100%)
rename core/applib/_adoc/modules/svc/{assets => }/images/reference-services/commands-and-events.png (100%)
rename core/applib/_adoc/modules/svc/{assets => }/images/reference-services/commands-and-events.pptx (100%)
rename {extensions/secman/_adoc/modules/api/assets => core/config/_adoc/modules/ROOT}/attachments/.gitkeep (100%)
rename {extensions/secman/_adoc/modules/ROOT/assets => core/config/_adoc/modules/ROOT}/images/.gitkeep (100%)
rename {extensions/secman/_adoc/modules/ROOT/assets => core/plugins/jdo/_adoc/modules/ROOT}/attachments/.gitkeep (100%)
rename core/plugins/jdo/_adoc/modules/ROOT/{assets => }/images/hints-n-tips/diagnosing-n-plus-1.png (100%)
rename core/plugins/jdo/_adoc/modules/ROOT/{assets => }/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png (100%)
delete mode 100644 core/plugins/jdo/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
rename core/{testsupport => plugins/jdo}/_adoc/modules/ROOT/partials/_attributes.adoc (100%)
rename {extensions/markdown/_adoc/modules/ROOT/assets/images => core/runtime-services/_adoc/modules/ROOT/attachments}/.gitkeep (100%)
rename core/runtime-services/_adoc/modules/ROOT/{assets => }/images/ContentNegotiationService/accept-json.png (100%)
rename core/runtime-services/_adoc/modules/ROOT/{assets => }/images/ContentNegotiationService/accept-xml.png (100%)
rename core/runtime-services/_adoc/modules/ROOT/{assets => }/images/ContentNegotiationService/facade-choices.png (100%)
rename core/runtime-services/_adoc/modules/ROOT/{assets => }/images/ContentNegotiationService/facade-choices.pptx (100%)
rename core/{viewer-restfulobjects/_adoc/modules/ROOT/assets/images/rgfis => runtime-services/_adoc/modules/ROOT/images/RepresentationService}/service-collaborations.png (100%)
rename core/runtime-services/_adoc/modules/ROOT/{assets => }/images/RepresentationService/service-collaborations.pptx (100%)
delete mode 100644 core/runtime-services/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
rename core/{testsupport/_adoc/modules/ROOT/pages => runtime-services/_adoc/modules/ROOT/partials}/_attributes.adoc (100%)
rename {extensions/markdown/_adoc/modules/ROOT/assets => core/schema/_adoc/modules/ROOT}/attachments/.gitkeep (100%)
rename core/{applib/_adoc/modules/cms/assets => schema/_adoc/modules/ROOT}/images/reference-classes/issue-in-more-detail.png (100%)
rename core/{applib/_adoc/modules/cms/assets => schema/_adoc/modules/ROOT}/images/reference-methods/prefixes/choices/dependent.png (100%)
rename core/{applib/_adoc/modules/cms/assets => schema/_adoc/modules/ROOT}/images/reference-methods/reserved/cssClass/strikethrough.png (100%)
rename core/{applib/_adoc/modules/cms/assets => schema/_adoc/modules/ROOT}/images/reference-methods/reserved/iconName/differing.pdn (100%)
rename core/{applib/_adoc/modules/cms/assets => schema/_adoc/modules/ROOT}/images/reference-methods/reserved/iconName/differing.png (100%)
rename core/{applib/_adoc/modules/cms/assets => schema/_adoc/modules/ROOT}/images/reference-methods/reserved/iconName/png-files.png (100%)
rename core/{applib/_adoc/modules/cms/assets => schema/_adoc/modules/ROOT}/images/value-types/markup.png (100%)
rename core/security/api/_adoc/modules/ROOT/{assets => }/attachments/security-apis-impl.pptx (100%)
rename {extensions/incubator/_adoc/modules/ROOT/assets => core/security/api/_adoc/modules/ROOT}/images/.gitkeep (100%)
rename {extensions/incubator/_adoc/modules/ROOT/assets => core/security/bypass/_adoc/modules/ROOT}/attachments/.gitkeep (100%)
rename core/security/bypass/_adoc/modules/ROOT/{assets => }/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG (100%)
rename {extensions/fixtures/_adoc/modules/ROOT/examples => core/security/shiro/_adoc/modules/ROOT/attachments}/.gitkeep (100%)
rename core/security/shiro/_adoc/modules/{realm-ldap/assets/images => ROOT/images/configuration/configuring-shiro/ldap}/activeds-ldap-groups.png (100%)
rename core/security/shiro/_adoc/modules/{realm-ldap/assets/images => ROOT/images/configuration/configuring-shiro/ldap}/activeds-ldap-mojo-partition.png (100%)
rename core/security/shiro/_adoc/modules/{realm-ldap/assets/images => ROOT/images/configuration/configuring-shiro/ldap}/activeds-ldap-mojo-root-dse.png (100%)
rename core/security/shiro/_adoc/modules/{realm-ldap/assets/images => ROOT/images/configuration/configuring-shiro/ldap}/activeds-ldap-sasl-authentication.png (100%)
rename core/security/shiro/_adoc/modules/{realm-ldap/assets/images => ROOT/images/configuration/configuring-shiro/ldap}/activeds-ldap-users.png (100%)
rename core/security/shiro/_adoc/modules/ROOT/{assets => }/images/security/security-apis-impl/configure-isis-to-use-shiro.png (100%)
rename core/security/shiro/_adoc/modules/{realm-jdbc/assets/images => ROOT/images/security/security-apis-impl}/configure-shiro-to-use-custom-jdbc-realm.png (100%)
rename core/security/shiro/_adoc/modules/ROOT/{assets => }/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG (100%)
rename core/security/shiro/_adoc/modules/{realm-ldap/assets/images => ROOT/images/security/security-apis-impl}/configure-shiro-to-use-isis-ldap-realm.PNG (100%)
rename {extensions/fixtures/_adoc/modules/ROOT/assets/images => core/security/shiro/_adoc/modules/realm-jdbc/attachments}/.gitkeep (100%)
rename core/security/shiro/_adoc/modules/{ROOT/assets/images/security/security-apis-impl => realm-jdbc/images}/configure-shiro-to-use-custom-jdbc-realm.png (100%)
rename {extensions/fixtures/_adoc/modules/ROOT/assets => core/security/shiro/_adoc/modules/realm-ldap}/attachments/.gitkeep (100%)
rename core/security/shiro/_adoc/modules/{ROOT/assets/images/configuration/configuring-shiro/ldap => realm-ldap/images}/activeds-ldap-groups.png (100%)
rename core/security/shiro/_adoc/modules/{ROOT/assets/images/configuration/configuring-shiro/ldap => realm-ldap/images}/activeds-ldap-mojo-partition.png (100%)
rename core/security/shiro/_adoc/modules/{ROOT/assets/images/configuration/configuring-shiro/ldap => realm-ldap/images}/activeds-ldap-mojo-root-dse.png (100%)
rename core/security/shiro/_adoc/modules/{ROOT/assets/images/configuration/configuring-shiro/ldap => realm-ldap/images}/activeds-ldap-sasl-authentication.png (100%)
rename core/security/shiro/_adoc/modules/{ROOT/assets/images/configuration/configuring-shiro/ldap => realm-ldap/images}/activeds-ldap-users.png (100%)
rename core/security/shiro/_adoc/modules/{ROOT/assets/images/security/security-apis-impl => realm-ldap/images}/configure-shiro-to-use-isis-ldap-realm.PNG (100%)
delete mode 100644 core/testsupport/_adoc/modules/ROOT/_attributes.adoc
delete mode 100644 core/testsupport/_adoc/modules/ROOT/nav.adoc
delete mode 100644 core/testsupport/_adoc/modules/ROOT/partials/nav.adoc
delete mode 100644 core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc
delete mode 100644 core/testsupport/integtestsupport/_adoc/modules/ROOT/nav.adoc
delete mode 100644 core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/integ-test-support/_attributes.adoc
delete mode 100644 core/testsupport/integtestsupport/_adoc/modules/ROOT/partials/nav.adoc
create mode 100644 core/testsupport/integtestsupport/_adoc/modules/integ-test-support/_attributes.adoc
rename {extensions/asciidoc/_adoc/modules/ROOT/assets/images => core/testsupport/integtestsupport/_adoc/modules/integ-test-support/attachments}/.gitkeep (100%)
rename {extensions/asciidoc/_adoc/modules/ROOT/assets/attachments => core/testsupport/integtestsupport/_adoc/modules/integ-test-support/examples}/.gitkeep (100%)
rename core/testsupport/integtestsupport/_adoc/modules/{ROOT/assets => integ-test-support}/images/integ-tests.png (100%)
rename core/testsupport/integtestsupport/_adoc/modules/{ROOT/assets => integ-test-support}/images/integ-tests.pptx (100%)
rename core/testsupport/integtestsupport/_adoc/modules/{ROOT/assets => integ-test-support}/images/wrapper-factory.png (100%)
create mode 100644 core/testsupport/integtestsupport/_adoc/modules/integ-test-support/nav.adoc
copy {mavendeps/_adoc/modules/ROOT => core/testsupport/integtestsupport/_adoc/modules/integ-test-support}/pages/_attributes.adoc (100%)
rename core/testsupport/integtestsupport/_adoc/modules/{ROOT => integ-test-support}/pages/about.adoc (76%)
rename {extensions/sse/_adoc/modules/ROOT/pages/_partials => core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/integ-test-support}/_attributes.adoc (100%)
rename core/testsupport/integtestsupport/_adoc/modules/{ROOT => integ-test-support}/pages/integ-test-support/abstract-class.adoc (87%)
rename core/testsupport/integtestsupport/_adoc/modules/{ROOT => integ-test-support}/pages/integ-test-support/bootstrapping.adoc (100%)
rename core/testsupport/integtestsupport/_adoc/modules/{ROOT => integ-test-support}/pages/integ-test-support/configuration-properties.adoc (100%)
rename core/testsupport/integtestsupport/_adoc/modules/{ROOT => integ-test-support}/pages/integ-test-support/maven-configuration.adoc (100%)
rename core/testsupport/integtestsupport/_adoc/modules/{ROOT => integ-test-support}/pages/integ-test-support/typical-usage.adoc (100%)
rename core/testsupport/integtestsupport/_adoc/modules/{ROOT => integ-test-support}/pages/integ-test-support/wrapper-factory.adoc (100%)
copy {mavendeps/_adoc/modules/ROOT/pages => core/testsupport/integtestsupport/_adoc/modules/integ-test-support/partials}/_attributes.adoc (100%)
create mode 100644 core/testsupport/integtestsupport/_adoc/modules/integ-test-support/partials/module-nav.adoc
delete mode 100644 core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc
delete mode 100644 core/testsupport/integtestsupport/_adoc/modules/mvn/pages/_partials/_attributes.adoc
delete mode 100644 core/testsupport/integtestsupport/test.data
create mode 100644 core/testsupport/mavenplugin/_adoc/antora.yml
copy {mavendeps => core/testsupport/mavenplugin}/_adoc/examples.csv (100%)
create mode 100644 core/testsupport/mavenplugin/_adoc/modules/mvn/_attributes.adoc
rename {examples/smoketests/_adoc/modules/ROOT/assets/images => core/testsupport/mavenplugin/_adoc/modules/mvn/attachments}/.gitkeep (100%)
rename {examples/smoketests/_adoc/modules/ROOT/assets/attachments => core/testsupport/mavenplugin/_adoc/modules/mvn/examples}/.gitkeep (100%)
rename core/testsupport/{integtestsupport/_adoc/modules/mvn/assets => mavenplugin/_adoc/modules/mvn}/images/maven-plugin/xsd-goal.png (100%)
rename core/testsupport/{integtestsupport/_adoc/modules/mvn/assets => mavenplugin/_adoc/modules/mvn}/images/maven-plugin/xsd-goal.pptx (100%)
create mode 100644 core/testsupport/mavenplugin/_adoc/modules/mvn/nav.adoc
copy {mavendeps/_adoc/modules/ROOT => core/testsupport/mavenplugin/_adoc/modules/mvn}/pages/_attributes.adoc (100%)
rename core/testsupport/{integtestsupport => mavenplugin}/_adoc/modules/mvn/pages/about.adoc (100%)
rename core/testsupport/{integtestsupport => mavenplugin}/_adoc/modules/mvn/pages/intro.adoc (100%)
rename core/testsupport/{integtestsupport => mavenplugin}/_adoc/modules/mvn/pages/swagger.adoc (100%)
rename core/testsupport/{integtestsupport => mavenplugin}/_adoc/modules/mvn/pages/validate.adoc (100%)
rename core/testsupport/{integtestsupport => mavenplugin}/_adoc/modules/mvn/pages/xsd.adoc (100%)
copy {mavendeps/_adoc/modules/ROOT/pages => core/testsupport/mavenplugin/_adoc/modules/mvn/partials}/_attributes.adoc (100%)
rename core/testsupport/{integtestsupport/_adoc/modules/mvn => mavenplugin/_adoc/modules/mvn/partials}/nav.adoc (100%)
copy {mavendeps => core/testsupport/mavenplugin}/_adoc/sync_examples.sh (100%)
copy core/testsupport/{integtestsupport => mavenplugin}/pom.xml (97%)
rename core/testsupport/{integtestsupport => mavenplugin}/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java (100%)
rename core/testsupport/{integtestsupport => mavenplugin}/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java (100%)
rename core/testsupport/{integtestsupport => mavenplugin}/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java (100%)
rename core/testsupport/{integtestsupport => mavenplugin}/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java (100%)
rename core/testsupport/{integtestsupport => mavenplugin}/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java (100%)
rename core/testsupport/{integtestsupport => mavenplugin}/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java (100%)
rename core/testsupport/{integtestsupport => mavenplugin}/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java (100%)
delete mode 100644 core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc
delete mode 100644 core/testsupport/unittestsupport/_adoc/modules/ROOT/nav.adoc
delete mode 100644 core/testsupport/unittestsupport/_adoc/modules/ROOT/pages/unit-test-support/_attributes.adoc
delete mode 100644 core/testsupport/unittestsupport/_adoc/modules/ROOT/partials/nav.adoc
create mode 100644 core/testsupport/unittestsupport/_adoc/modules/unit-test-support/_attributes.adoc
rename {examples/apps/helloworld/_adoc/modules/ROOT/assets/images => core/testsupport/unittestsupport/_adoc/modules/unit-test-support/attachments}/.gitkeep (100%)
rename {examples/apps/helloworld/_adoc/modules/ROOT/assets/attachments => core/testsupport/unittestsupport/_adoc/modules/unit-test-support/examples}/.gitkeep (100%)
rename core/{viewer-wicket/_adoc/modules/security/assets => testsupport/unittestsupport/_adoc/modules/unit-test-support}/images/.gitkeep (100%)
create mode 100644 core/testsupport/unittestsupport/_adoc/modules/unit-test-support/nav.adoc
copy {mavendeps/_adoc/modules/ROOT => core/testsupport/unittestsupport/_adoc/modules/unit-test-support}/pages/_attributes.adoc (100%)
rename core/testsupport/unittestsupport/_adoc/modules/{ROOT => unit-test-support}/pages/about.adoc (100%)
rename {extensions/specsupport/_adoc/modules/ROOT/pages/bdd-spec-support => core/testsupport/unittestsupport/_adoc/modules/unit-test-support/pages/unit-test-support}/_attributes.adoc (100%)
rename core/testsupport/unittestsupport/_adoc/modules/{ROOT => unit-test-support}/pages/unit-test-support/contract-tests.adoc (100%)
rename core/testsupport/unittestsupport/_adoc/modules/{ROOT => unit-test-support}/pages/unit-test-support/jmock-extensions.adoc (100%)
rename core/testsupport/unittestsupport/_adoc/modules/{ROOT => unit-test-support}/pages/unit-test-support/maven-configuration.adoc (100%)
rename core/testsupport/unittestsupport/_adoc/modules/{ROOT => unit-test-support}/pages/unit-test-support/soap-fake-server-junit-rule.adoc (100%)
copy {mavendeps/_adoc/modules/ROOT/pages => core/testsupport/unittestsupport/_adoc/modules/unit-test-support/partials}/_attributes.adoc (100%)
create mode 100644 core/testsupport/unittestsupport/_adoc/modules/unit-test-support/partials/module-nav.adoc
rename core/{viewer-wicket/_adoc/modules/security/assets => viewer-restfulobjects/_adoc/modules/ROOT}/attachments/.gitkeep (100%)
rename core/viewer-restfulobjects/_adoc/modules/ROOT/{assets => }/images/restfulobjects/ro-spec-resources-and-representations.png (100%)
rename core/{runtime-services/_adoc/modules/ROOT/assets/images/RepresentationService => viewer-restfulobjects/_adoc/modules/ROOT/images/rgfis}/service-collaborations.png (100%)
delete mode 100644 core/viewer-restfulobjects/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
copy {mavendeps/_adoc/modules/ROOT/pages => core/viewer-restfulobjects/_adoc/modules/ROOT/partials}/_attributes.adoc (100%)
create mode 100644 core/viewer-restfulobjects/_adoc/modules/ROOT/partials/nav.adoc
rename core/{viewer-wicket/_adoc/modules/ROOT/assets => viewer-restfulobjects/_adoc/modules/security}/attachments/.gitkeep (100%)
rename core/viewer-restfulobjects/_adoc/modules/security/{assets => }/images/.gitkeep (100%)
rename core/{viewer-restfulobjects/_adoc/modules/security/assets => viewer-wicket/_adoc/modules/ROOT}/attachments/.gitkeep (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/about-page/about-page.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/application-menu/dividers.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/application-menu/layout-menus.pdn (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/application-menu/layout-menus.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/application-menu/tertiary.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/blob-attachments/010-attachment-field-940.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/blob-attachments/010-attachment-field.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/blob-attachments/020-edit-choose-file-940.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/blob-attachments/020-edit-choose-file.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/blob-attachments/030-choose-file-using-browser-520.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/blob-attachments/030-choose-file-using-browser.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/blob-attachments/040-edit-chosen-file-indicated-940.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/blob-attachments/040-edit-chosen-file-indicated.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/blob-attachments/050-ok-if-image-then-rendered-940.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/blob-attachments/050-ok-if-image-then-rendered.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/blob-attachments/060-download-940.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/blob-attachments/060-download.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/blob-attachments/070-edit-clear-940.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/blob-attachments/070-edit-clear.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/bookmarked-pages/panel-940.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/bookmarked-pages/panel-estatio-940.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/bookmarked-pages/panel-estatio.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/bookmarked-pages/panel.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/brand-logo/brand-logo-signin.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/brand-logo/brand-logo.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/copy-link/010-copy-link-button-940.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/copy-link/010-copy-link-button.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/copy-link/020-copy-link-dialog-940.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/copy-link/020-copy-link-dialog.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/copy-link/030-hints-940.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/copy-link/030-hints.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/copy-link/040-copy-link-with-hints-940.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/copy-link/040-copy-link-with-hints.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/copy-link/050-title-url-940.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/copy-link/050-title-url.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/dialog-mode/modal.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/dialog-mode/sidebar.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/embedded-view/no-footer.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/embedded-view/no-header-no-footer.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/embedded-view/no-header.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/embedded-view/regular.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/features/recent-pages/recent-pages.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/layout-dynamic-xml/ToDoAppDashboard.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/layout-dynamic-xml/ToDoItem.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/layouts/customer-order.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/layouts/estatio-Invoice.png (100%)
rename {antora/components/toc/modules/devguide/assets => core/viewer-wicket/_adoc/modules/ROOT}/images/layouts/estatio-Lease.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/layouts/estatio-LeaseItem.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/layouts/todoapp-ToDoItem.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/menubars/010-download.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/menubars/020-download.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/reference-layout/4-0-8-0.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/reference-layout/4-4-4-12.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/reference-layout/6-6-0-12.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/reference-layout/isis-layout-show-facets.css (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/reference-layout/isis-layout.css (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/reference-layout/layout-4-0-8-0.html (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/reference-layout/layout-4-4-4-12.html (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/reference-layout/layout-6-6-0-12.html (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets/images/user-registration => images/suppress-password-reset}/login-page-default.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/suppress-password-reset/login-page-suppress-password-reset.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets/images/suppress-sign-up => images/suppress-remember-me}/login-page-default.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/suppress-remember-me/login-page-suppress-remember-me.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets/images/suppress-remember-me => images/suppress-sign-up}/login-page-default.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/suppress-sign-up/login-page-suppress-sign-up.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/theme-chooser/example-1.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/theme-chooser/example-2.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets/images/suppress-password-reset => images/user-registration}/login-page-default.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/user-registration/sign-up-after-registration.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/user-registration/sign-up-email-with-verification-link.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/user-registration/sign-up-login-page-after-sign-up.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/user-registration/sign-up-page.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/user-registration/sign-up-registration-page.png (100%)
rename core/viewer-wicket/_adoc/modules/ROOT/{assets => }/images/where-am-i/hello_grey_bg.png (100%)
delete mode 100644 core/viewer-wicket/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
copy {mavendeps/_adoc/modules/ROOT/pages => core/viewer-wicket/_adoc/modules/ROOT/partials}/_attributes.adoc (100%)
rename core/{viewer-restfulobjects/_adoc/modules/ROOT/assets => viewer-wicket/_adoc/modules/security}/attachments/.gitkeep (100%)
rename core/{testsupport/unittestsupport/_adoc/modules/ROOT/examples => viewer-wicket/_adoc/modules/security/images}/.gitkeep (100%)
delete mode 100644 examples/apps/demo/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
rename {extensions/markdown/_adoc/modules/ROOT/pages/_partials => examples/apps/demo/_adoc/modules/ROOT/partials}/_attributes.adoc (100%)
rename {core/testsupport/unittestsupport/_adoc/modules/ROOT/assets/images => examples/apps/helloworld/_adoc/modules/ROOT/attachments}/.gitkeep (100%)
rename {core/testsupport/unittestsupport/_adoc/modules/ROOT/assets/attachments => examples/apps/helloworld/_adoc/modules/ROOT/images}/.gitkeep (100%)
rename examples/apps/helloworld/_adoc/modules/ROOT/{assets => }/images/helloworld-before-launch.png (100%)
rename examples/apps/helloworld/_adoc/modules/ROOT/{assets => }/images/helloworld.png (100%)
rename examples/apps/helloworld/_adoc/modules/ROOT/{assets => }/images/using-hello-world/010-root-page.png (100%)
rename examples/apps/helloworld/_adoc/modules/ROOT/{assets => }/images/using-hello-world/020-login-to-wicket-viewer.png (100%)
rename examples/apps/helloworld/_adoc/modules/ROOT/{assets => }/images/using-hello-world/030-home-page.png (100%)
rename examples/apps/helloworld/_adoc/modules/ROOT/{assets => }/images/using-hello-world/040-create-object-from-menu.png (100%)
rename examples/apps/helloworld/_adoc/modules/ROOT/{assets => }/images/using-hello-world/050-create-object-from-menu-prompt.png (100%)
rename examples/apps/helloworld/_adoc/modules/ROOT/{assets => }/images/using-hello-world/060-created-object.png (100%)
rename examples/apps/helloworld/_adoc/modules/ROOT/{assets => }/images/using-hello-world/070-update-name.png (100%)
rename examples/apps/helloworld/_adoc/modules/ROOT/{assets => }/images/using-hello-world/080-edit-notes.png (100%)
rename examples/apps/helloworld/_adoc/modules/ROOT/{assets => }/images/using-hello-world/090-delete-object.png (100%)
rename examples/apps/helloworld/_adoc/modules/ROOT/{assets => }/images/using-hello-world/100-object-deleted.png (100%)
rename examples/apps/helloworld/_adoc/modules/ROOT/{assets => }/images/using-hello-world/200-swagger-ui-before-reload.png (100%)
rename examples/apps/helloworld/_adoc/modules/ROOT/{assets => }/images/using-hello-world/210-helloworld-resources.png (100%)
rename examples/apps/helloworld/_adoc/modules/ROOT/{assets => }/images/using-hello-world/220-create-object-thru-rest-api.png (100%)
rename examples/apps/helloworld/_adoc/modules/ROOT/{assets => }/images/using-hello-world/230-create-object-thru-rest-api-response.png (100%)
rename examples/apps/helloworld/_adoc/modules/ROOT/{assets => }/images/using-hello-world/240-retrieve-object-using-rest-api.png (100%)
rename examples/apps/helloworld/_adoc/modules/ROOT/{assets => }/images/using-hello-world/250-retrieve-object-using-rest-api-response.png (100%)
delete mode 100644 examples/apps/helloworld/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
copy {mavendeps/_adoc/modules/ROOT/pages => examples/apps/helloworld/_adoc/modules/ROOT/partials}/_attributes.adoc (100%)
rename examples/apps/simpleapp/_adoc/modules/ROOT/{assets => }/images/dockerhub-tags.png (100%)
rename examples/apps/simpleapp/_adoc/modules/ROOT/{assets => }/images/simpleapp-webapp-before-launch.png (100%)
rename examples/apps/simpleapp/_adoc/modules/ROOT/{assets => }/images/simpleapp-webapp-with-fixtures.png (100%)
rename examples/apps/simpleapp/_adoc/modules/ROOT/{assets => }/images/simpleapp-webapp.png (100%)
rename examples/apps/simpleapp/_adoc/modules/ROOT/{assets => }/images/using-simple-app/030-home-page.png (100%)
rename examples/apps/simpleapp/_adoc/modules/ROOT/{assets => }/images/using-simple-app/040-run-fixture-script-menu.png (100%)
rename examples/apps/simpleapp/_adoc/modules/ROOT/{assets => }/images/using-simple-app/050-run-fixture-script-prompt.png (100%)
rename examples/apps/simpleapp/_adoc/modules/ROOT/{assets => }/images/using-simple-app/060-run-fixture-script-result.png (100%)
rename examples/apps/simpleapp/_adoc/modules/ROOT/{assets => }/images/using-simple-app/070-home-page.png (100%)
rename examples/apps/simpleapp/_adoc/modules/ROOT/{assets => }/images/using-simple-app/structure/structure.pptx (100%)
rename examples/apps/simpleapp/_adoc/modules/ROOT/{assets => }/images/using-simple-app/structure/structure/Slide1.PNG (100%)
rename examples/apps/simpleapp/_adoc/modules/ROOT/{assets => }/images/using-simple-app/structure/structure/Slide2.PNG (100%)
delete mode 100644 examples/apps/simpleapp/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
copy {mavendeps/_adoc/modules/ROOT/pages => examples/apps/simpleapp/_adoc/modules/ROOT/partials}/_attributes.adoc (100%)
rename {core/testsupport/integtestsupport/_adoc/modules/mvn/examples => examples/smoketests/_adoc/modules/ROOT/attachments}/.gitkeep (100%)
rename {core/testsupport/integtestsupport/_adoc/modules/mvn/assets/attachments => examples/smoketests/_adoc/modules/ROOT/images}/.gitkeep (100%)
delete mode 100644 examples/smoketests/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
copy {mavendeps/_adoc/modules/ROOT/pages => examples/smoketests/_adoc/modules/ROOT/partials}/_attributes.adoc (100%)
rename {core/testsupport/integtestsupport/_adoc/modules/ROOT/examples => extensions/asciidoc/_adoc/modules/ROOT/attachments}/.gitkeep (100%)
rename {core/testsupport/integtestsupport/_adoc/modules/ROOT/assets/attachments => extensions/asciidoc/_adoc/modules/ROOT/images}/.gitkeep (100%)
delete mode 100644 extensions/asciidoc/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
copy {mavendeps/_adoc/modules/ROOT/pages => extensions/asciidoc/_adoc/modules/ROOT/partials}/_attributes.adoc (100%)
delete mode 100644 extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc
delete mode 100644 extensions/fixtures/_adoc/modules/ROOT/nav.adoc
delete mode 100644 extensions/fixtures/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
create mode 100644 extensions/fixtures/_adoc/modules/ext-fixtures/_attributes.adoc
rename {core/testsupport/_adoc/modules/ROOT/examples => extensions/fixtures/_adoc/modules/ext-fixtures/attachments}/.gitkeep (100%)
rename {core/testsupport/_adoc/modules/ROOT/assets/images => extensions/fixtures/_adoc/modules/ext-fixtures/examples}/.gitkeep (100%)
rename {core/testsupport/_adoc/modules/ROOT/assets/attachments => extensions/fixtures/_adoc/modules/ext-fixtures/images}/.gitkeep (100%)
rename extensions/fixtures/_adoc/modules/{ROOT/assets => ext-fixtures}/images/composite.png (100%)
rename extensions/fixtures/_adoc/modules/{ROOT/assets => ext-fixtures}/images/flat-1.png (100%)
rename extensions/fixtures/_adoc/modules/{ROOT/assets => ext-fixtures}/images/flat-2.png (100%)
rename extensions/fixtures/_adoc/modules/{ROOT/assets => ext-fixtures}/images/organizing-fixture-scripts.pptx (100%)
rename extensions/fixtures/_adoc/modules/{ROOT/assets => ext-fixtures}/images/prompt-specifying-number.png (100%)
rename extensions/fixtures/_adoc/modules/{ROOT/assets => ext-fixtures}/images/prompt.png (100%)
rename extensions/fixtures/_adoc/modules/{ROOT/assets => ext-fixtures}/images/prototyping-menu.png (100%)
rename extensions/fixtures/_adoc/modules/{ROOT/assets => ext-fixtures}/images/result-list.png (100%)
create mode 100644 extensions/fixtures/_adoc/modules/ext-fixtures/nav.adoc
copy {mavendeps/_adoc/modules/ROOT => extensions/fixtures/_adoc/modules/ext-fixtures}/pages/_attributes.adoc (100%)
rename extensions/fixtures/_adoc/modules/{ROOT => ext-fixtures}/pages/about.adoc (100%)
rename extensions/{incubator/_adoc/modules/ROOT/pages/_partials => fixtures/_adoc/modules/ext-fixtures/pages/fixture-scripts}/_attributes.adoc (100%)
rename extensions/fixtures/_adoc/modules/{ROOT => ext-fixtures}/pages/fixture-scripts/api-and-usage.adoc (99%)
rename extensions/fixtures/_adoc/modules/{ROOT => ext-fixtures}/pages/fixture-scripts/sudo-service.adoc (100%)
rename extensions/fixtures/_adoc/modules/{ROOT => ext-fixtures}/pages/fixture-scripts/ticking-clock-fixture.adoc (100%)
copy {mavendeps/_adoc/modules/ROOT/pages => extensions/fixtures/_adoc/modules/ext-fixtures/partials}/_attributes.adoc (100%)
create mode 100644 extensions/fixtures/_adoc/modules/ext-fixtures/partials/module-nav.adoc
rename {core/security/shiro/_adoc/modules/realm-ldap/assets => extensions/incubator/_adoc/modules/ROOT}/attachments/.gitkeep (100%)
rename {core/security/shiro/_adoc/modules/realm-jdbc/assets/attachments => extensions/incubator/_adoc/modules/ROOT/images}/.gitkeep (100%)
copy {mavendeps/_adoc/modules/ROOT/pages => extensions/incubator/_adoc/modules/ROOT/partials}/_attributes.adoc (100%)
rename {core/security/shiro/_adoc/modules/ROOT/assets => extensions/markdown/_adoc/modules/ROOT}/attachments/.gitkeep (100%)
rename {core/security/bypass/_adoc/modules/ROOT/assets/attachments => extensions/markdown/_adoc/modules/ROOT/images}/.gitkeep (100%)
copy {mavendeps/_adoc/modules/ROOT/pages => extensions/markdown/_adoc/modules/ROOT/partials}/_attributes.adoc (100%)
rename {core/security/api/_adoc/modules/ROOT/assets/images => extensions/secman/_adoc/modules/ROOT/attachments}/.gitkeep (100%)
rename {core/schema/_adoc/modules/ROOT/assets/attachments => extensions/secman/_adoc/modules/ROOT/images}/.gitkeep (100%)
rename {core/runtime-services/_adoc/modules/ROOT/assets => extensions/secman/_adoc/modules/api}/attachments/.gitkeep (100%)
rename {core/plugins/jdo/_adoc/modules/ROOT/assets/attachments => extensions/secman/_adoc/modules/api/images}/.gitkeep (100%)
rename {core/config/_adoc/modules/ROOT/assets/images => extensions/secman/_adoc/modules/encryption-jbcrypt/attachments}/.gitkeep (100%)
rename {core/config/_adoc/modules/ROOT/assets/attachments => extensions/secman/_adoc/modules/encryption-jbcrypt/images}/.gitkeep (100%)
copy {mavendeps/_adoc/modules/ROOT/examples => extensions/secman/_adoc/modules/model/attachments}/.gitkeep (100%)
copy {mavendeps/_adoc/modules/ROOT/examples => extensions/secman/_adoc/modules/model/images}/.gitkeep (100%)
copy {mavendeps/_adoc/modules/ROOT/examples => extensions/secman/_adoc/modules/persistence-jdo/attachments}/.gitkeep (100%)
copy {mavendeps/_adoc/modules/ROOT/examples => extensions/secman/_adoc/modules/persistence-jdo/images}/.gitkeep (100%)
copy {mavendeps/_adoc/modules/ROOT/examples => extensions/secman/_adoc/modules/realm-shiro/attachments}/.gitkeep (100%)
copy {mavendeps/_adoc/modules/ROOT/examples => extensions/secman/_adoc/modules/realm-shiro/images}/.gitkeep (100%)
rename extensions/secman/_adoc/modules/realm-shiro/{assets => }/images/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG (100%)
rename extensions/secman/_adoc/modules/realm-shiro/{assets => }/images/configure-shiro-to-use-isisaddons-security-module-realm.PNG (100%)
delete mode 100644 extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc
delete mode 100644 extensions/specsupport/_adoc/modules/ROOT/nav.adoc
create mode 100644 extensions/specsupport/_adoc/modules/ext-specsupport/_attributes.adoc
copy {mavendeps/_adoc/modules/ROOT/examples => extensions/specsupport/_adoc/modules/ext-specsupport/attachments}/.gitkeep (100%)
copy {mavendeps/_adoc/modules/ROOT => extensions/specsupport/_adoc/modules/ext-specsupport}/examples/.gitkeep (100%)
copy {mavendeps/_adoc/modules/ROOT/examples => extensions/specsupport/_adoc/modules/ext-specsupport/images}/.gitkeep (100%)
create mode 100644 extensions/specsupport/_adoc/modules/ext-specsupport/nav.adoc
copy {mavendeps/_adoc/modules/ROOT => extensions/specsupport/_adoc/modules/ext-specsupport}/pages/_attributes.adoc (100%)
rename extensions/specsupport/_adoc/modules/{ROOT => ext-specsupport}/pages/about.adoc (100%)
rename extensions/{fixtures/_adoc/modules/ROOT/pages/fixture-scripts => specsupport/_adoc/modules/ext-specsupport/pages/bdd-spec-support}/_attributes.adoc (100%)
rename extensions/specsupport/_adoc/modules/{ROOT => ext-specsupport}/pages/bdd-spec-support/how-it-works.adoc (100%)
rename extensions/specsupport/_adoc/modules/{ROOT => ext-specsupport}/pages/bdd-spec-support/maven-configuration.adoc (100%)
rename extensions/specsupport/_adoc/modules/{ROOT => ext-specsupport}/pages/bdd-spec-support/writing-a-bdd-spec.adoc (100%)
copy {mavendeps/_adoc/modules/ROOT/pages => extensions/specsupport/_adoc/modules/ext-specsupport/partials}/_attributes.adoc (100%)
create mode 100644 extensions/specsupport/_adoc/modules/ext-specsupport/partials/module-nav.adoc
copy {mavendeps/_adoc/modules/ROOT/examples => extensions/sse/_adoc/modules/ROOT/attachments}/.gitkeep (100%)
copy {mavendeps/_adoc/modules/ROOT/examples => extensions/sse/_adoc/modules/ROOT/images}/.gitkeep (100%)
copy {mavendeps/_adoc/modules/ROOT/pages => extensions/sse/_adoc/modules/ROOT/partials}/_attributes.adoc (100%)
copy {mavendeps/_adoc/modules/ROOT/examples => extensions/viewer-wicket-excel/_adoc/modules/ROOT/attachments}/.gitkeep (100%)
copy {mavendeps/_adoc/modules/ROOT/examples => extensions/viewer-wicket-excel/_adoc/modules/ROOT/images}/.gitkeep (100%)
copy {mavendeps/_adoc/modules/ROOT/pages => extensions/viewer-wicket-excel/_adoc/modules/ROOT/partials}/_attributes.adoc (100%)
copy mavendeps/_adoc/modules/ROOT/{examples => attachments}/.gitkeep (100%)
copy mavendeps/_adoc/modules/ROOT/{examples => images}/.gitkeep (100%)
copy mavendeps/_adoc/modules/ROOT/{pages => partials}/_attributes.adoc (100%)
[isis] 03/04: ISIS-2062: fixes includes for
simplified-representations
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e6e4f229aa87c564dcbde98ca7c1c471e195d817
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 8 07:13:06 2019 +0100
ISIS-2062: fixes includes for simplified-representations
---
antora/components/refguide/modules/ROOT/pages/about.adoc | 2 +-
.../_adoc/modules/ROOT/pages/simplified-representations.adoc | 12 ++++++------
examples/apps/demo/pom.xml | 3 +++
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/antora/components/refguide/modules/ROOT/pages/about.adoc b/antora/components/refguide/modules/ROOT/pages/about.adoc
index f4aaf71..9c5c6e7 100644
--- a/antora/components/refguide/modules/ROOT/pages/about.adoc
+++ b/antora/components/refguide/modules/ROOT/pages/about.adoc
@@ -6,7 +6,7 @@ The reference guides are:
* xref:applib:ant:about.adoc[Annotations]
* xref:applib:svc:about.adoc[Domain Services]
* xref:applib:cms:about.adoc[Classes & Methods]
-* xref:schema:ROOT:about.adoc[Schemas]
* xref:cfg:ROOT:about.adoc[Configuration]
+* xref:schema:ROOT:about.adoc[Schemas]
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc
index 5795e48..f84a59d 100644
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc
@@ -18,9 +18,9 @@ xref:vro:ROOT:architecture.adoc[architecture] chapter.
-include::vro:ROOT:simplified-representations/apache-isis-profile.adoc[leveloffset=+1]
-include::vro:ROOT:simplified-representations/domain-object.adoc[leveloffset=+1]
-include::vro:ROOT:simplified-representations/object-collection.adoc[leveloffset=+1]
-include::vro:ROOT:simplified-representations/action-invocation.adoc[leveloffset=+1]
-include::vro:ROOT:simplified-representations/other-representations.adoc[leveloffset=+1]
-include::vro:ROOT:simplified-representations/configuration-properties.adoc[leveloffset=+1]
+include::simplified-representations/apache-isis-profile.adoc[leveloffset=+1]
+include::simplified-representations/domain-object.adoc[leveloffset=+1]
+include::simplified-representations/object-collection.adoc[leveloffset=+1]
+include::simplified-representations/action-invocation.adoc[leveloffset=+1]
+include::simplified-representations/other-representations.adoc[leveloffset=+1]
+include::simplified-representations/configuration-properties.adoc[leveloffset=+1]
diff --git a/examples/apps/demo/pom.xml b/examples/apps/demo/pom.xml
index 1b117b3..cfbec9b 100644
--- a/examples/apps/demo/pom.xml
+++ b/examples/apps/demo/pom.xml
@@ -32,6 +32,9 @@
<maven-war-plugin.warName>${project.artifactId}</maven-war-plugin.warName>
+ <!-- this can be overridden using -Dflavor=... -->
+ <flavor>payara</flavor>
+
<docker-plugin.imageName>apacheisis/isis-2-demo</docker-plugin.imageName>
<docker-plugin.imageTag>${flavor}</docker-plugin.imageTag>
<docker-plugin.resource.include>${maven-war-plugin.warName}.war</docker-plugin.resource.include>
[isis] 04/04: ISIS-2062: refactors testing docs to use distributed
component pattern
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1311c32cc70e000ce8bbf83135b68e3d0171d6f7
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 8 07:52:21 2019 +0100
ISIS-2062: refactors testing docs to use distributed component pattern
---
antora/components/testing/antora.yml | 2 +-
antora/components/testing/modules/ROOT/nav.adoc | 2 +-
.../modules/ROOT/partials/component-nav.adoc | 9 ++
.../testing/modules/ROOT/partials/module-nav.adoc | 3 +
.../testing/modules/ROOT/partials/nav.adoc | 9 --
.../pages/what-is-apache-isis/screencasts.adoc | 6 +-
.../partials/_powered-by_gesconsultor-grc.adoc | 2 +-
.../userguide/modules/btb/pages/i18n.adoc | 2 +-
.../apache-isis-vs/mvc-server-side.adoc | 2 +-
.../userguide/modules/fun/pages/crud.adoc | 2 +-
core/applib/_adoc/modules/ant/pages/Inject.adoc | 2 +-
.../pages/classes/AppManifest-bootstrapping.adoc | 2 +-
.../pages/classes/AppManifest2-bootstrapping.adoc | 2 +-
.../application-layer-api/WrapperFactory.adoc | 4 +-
.../persistence-layer-api/IsisJdoSupport.adoc | 2 +-
.../modules/svc/pages/testing/SudoService.adoc | 2 +-
core/pom.xml | 7 +
core/testsupport/integtestsupport/_adoc/antora.yml | 7 +-
.../integtestsupport/_adoc/modules/ROOT/nav.adoc | 2 -
.../_adoc/modules/ROOT/partials/nav.adoc | 9 --
.../modules/integ-test-support}/_attributes.adoc | 0
.../integ-test-support/attachments}/.gitkeep | 0
.../modules/integ-test-support}/examples/.gitkeep | 0
.../images/integ-tests.png | Bin
.../images/integ-tests.pptx | Bin
.../images/wrapper-factory.png | Bin
.../_adoc/modules/integ-test-support/nav.adoc | 2 +
.../integ-test-support/pages}/_attributes.adoc | 0
.../{ROOT => integ-test-support}/pages/about.adoc | 12 +-
.../pages/integ-test-support}/_attributes.adoc | 0
.../pages/integ-test-support/abstract-class.adoc | 6 +-
.../pages/integ-test-support/bootstrapping.adoc | 0
.../configuration-properties.adoc | 0
.../integ-test-support/maven-configuration.adoc | 0
.../pages/integ-test-support/typical-usage.adoc | 0
.../pages/integ-test-support/wrapper-factory.adoc | 0
.../integ-test-support/partials}/_attributes.adoc | 0
.../integ-test-support/partials/module-nav.adoc | 1 +
core/testsupport/integtestsupport/test.data | 5 -
core/testsupport/mavenplugin/_adoc/antora.yml | 2 +
core/testsupport/mavenplugin/_adoc/examples.csv | 1 +
.../_adoc/modules/mvn}/_attributes.adoc | 0
.../_adoc/modules/mvn}/attachments/.gitkeep | 0
.../_adoc/modules/mvn/examples}/.gitkeep | 0
.../modules/mvn/images/maven-plugin/xsd-goal.png | Bin
.../modules/mvn/images/maven-plugin/xsd-goal.pptx | Bin
.../mavenplugin/_adoc/modules/mvn/nav.adoc | 2 +
.../_adoc/modules/mvn/pages}/_attributes.adoc | 0
.../_adoc/modules/mvn/pages/about.adoc | 0
.../_adoc/modules/mvn/pages/intro.adoc | 0
.../_adoc/modules/mvn/pages/swagger.adoc | 0
.../_adoc/modules/mvn/pages/validate.adoc | 0
.../_adoc/modules/mvn/pages/xsd.adoc | 0
.../_adoc/modules/mvn/partials}/_attributes.adoc | 0
.../_adoc/modules/mvn/partials}/nav.adoc | 0
.../testsupport/mavenplugin/_adoc/sync_examples.sh | 39 ++++++
core/testsupport/mavenplugin/pom.xml | 148 +++++++++++++++++++++
.../apache/isis/mavenplugin/IsisMojoAbstract.java | 0
.../apache/isis/mavenplugin/IsisMojoSwagger.java | 0
.../apache/isis/mavenplugin/IsisMojoValidate.java | 0
.../org/apache/isis/mavenplugin/IsisMojoXsd.java | 0
.../isis/mavenplugin/MetaModelProcessor.java | 0
.../IsisMavenPlugin_SpringContextConfig.java | 0
.../IsisMavenPlugin_SpringContextLauncher.java | 0
core/testsupport/unittestsupport/_adoc/antora.yml | 6 +-
.../unittestsupport/_adoc/modules/ROOT/nav.adoc | 2 -
.../_adoc/modules/ROOT/partials/nav.adoc | 9 --
.../{ROOT => unit-test-support}/_attributes.adoc | 0
.../unit-test-support/attachments}/.gitkeep | 0
.../modules/unit-test-support/examples}/.gitkeep | 0
.../{ROOT => unit-test-support}/images/.gitkeep | 0
.../_adoc/modules/unit-test-support/nav.adoc | 2 +
.../pages}/_attributes.adoc | 0
.../{ROOT => unit-test-support}/pages/about.adoc | 0
.../pages/unit-test-support}/_attributes.adoc | 0
.../pages/unit-test-support/contract-tests.adoc | 0
.../pages/unit-test-support/jmock-extensions.adoc | 0
.../unit-test-support/maven-configuration.adoc | 0
.../soap-fake-server-junit-rule.adoc | 0
.../partials}/_attributes.adoc | 0
.../unit-test-support/partials/module-nav.adoc | 1 +
extensions/fixtures/_adoc/antora.yml | 6 +-
extensions/fixtures/_adoc/modules/ROOT/nav.adoc | 2 -
.../_adoc/modules/ext-fixtures}/_attributes.adoc | 0
.../modules/ext-fixtures/attachments}/.gitkeep | 0
.../_adoc/modules/ext-fixtures/examples}/.gitkeep | 0
.../_adoc/modules/ext-fixtures/images}/.gitkeep | 0
.../{ROOT => ext-fixtures}/images/composite.png | Bin
.../{ROOT => ext-fixtures}/images/flat-1.png | Bin
.../{ROOT => ext-fixtures}/images/flat-2.png | Bin
.../images/organizing-fixture-scripts.pptx | Bin
.../images/prompt-specifying-number.png | Bin
.../{ROOT => ext-fixtures}/images/prompt.png | Bin
.../images/prototyping-menu.png | Bin
.../{ROOT => ext-fixtures}/images/result-list.png | Bin
.../fixtures/_adoc/modules/ext-fixtures/nav.adoc | 2 +
.../modules/ext-fixtures/pages}/_attributes.adoc | 0
.../{ROOT => ext-fixtures}/pages/about.adoc | 0
.../pages/fixture-scripts}/_attributes.adoc | 0
.../pages/fixture-scripts/api-and-usage.adoc | 2 +-
.../pages/fixture-scripts/sudo-service.adoc | 0
.../fixture-scripts/ticking-clock-fixture.adoc | 0
.../ext-fixtures/partials}/_attributes.adoc | 0
.../modules/ext-fixtures/partials/module-nav.adoc | 3 +
extensions/specsupport/_adoc/antora.yml | 6 +-
extensions/specsupport/_adoc/modules/ROOT/nav.adoc | 2 -
.../modules/ext-specsupport}/_attributes.adoc | 0
.../modules/ext-specsupport}/attachments/.gitkeep | 0
.../modules/ext-specsupport}/examples/.gitkeep | 0
.../_adoc/modules/ext-specsupport/images}/.gitkeep | 0
.../_adoc/modules/ext-specsupport/nav.adoc | 2 +
.../ext-specsupport/pages}/_attributes.adoc | 0
.../{ROOT => ext-specsupport}/pages/about.adoc | 0
.../pages/bdd-spec-support}/_attributes.adoc | 0
.../pages/bdd-spec-support/how-it-works.adoc | 0
.../bdd-spec-support/maven-configuration.adoc | 0
.../pages/bdd-spec-support/writing-a-bdd-spec.adoc | 0
.../ext-specsupport/partials}/_attributes.adoc | 0
.../ext-specsupport/partials/module-nav.adoc | 3 +
site.yml | 4 +
120 files changed, 261 insertions(+), 87 deletions(-)
diff --git a/antora/components/testing/antora.yml b/antora/components/testing/antora.yml
index a4e4f01..f626323 100644
--- a/antora/components/testing/antora.yml
+++ b/antora/components/testing/antora.yml
@@ -1,6 +1,6 @@
name: testing
-title: "Testing"
version: master
+title: "Testing"
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/antora/components/testing/modules/ROOT/nav.adoc b/antora/components/testing/modules/ROOT/nav.adoc
index 5df99fd..13d0804 100644
--- a/antora/components/testing/modules/ROOT/nav.adoc
+++ b/antora/components/testing/modules/ROOT/nav.adoc
@@ -1,2 +1,2 @@
-include::testing:ROOT:partial$nav.adoc[]
+include::testing:ROOT:partial$component-nav.adoc[]
diff --git a/antora/components/testing/modules/ROOT/partials/component-nav.adoc b/antora/components/testing/modules/ROOT/partials/component-nav.adoc
new file mode 100644
index 0000000..ace20b6
--- /dev/null
+++ b/antora/components/testing/modules/ROOT/partials/component-nav.adoc
@@ -0,0 +1,9 @@
+// the navs of all modules in this component use this file as their own nav's.
+
+include::testing:ROOT:partial$module-nav.adoc[]
+include::testing:unit-test-support:partial$module-nav.adoc[]
+include::testing:integ-test-support:partial$module-nav.adoc[]
+include::testing:ext-specsupport:partial$module-nav.adoc[]
+include::testing:ext-fixtures:partial$module-nav.adoc[]
+
+
diff --git a/antora/components/testing/modules/ROOT/partials/module-nav.adoc b/antora/components/testing/modules/ROOT/partials/module-nav.adoc
new file mode 100644
index 0000000..86084b8
--- /dev/null
+++ b/antora/components/testing/modules/ROOT/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+* xref:testing:ROOT:about.adoc[About]
+** xref:testing:ROOT:overview.adoc[Overview]
+
diff --git a/antora/components/testing/modules/ROOT/partials/nav.adoc b/antora/components/testing/modules/ROOT/partials/nav.adoc
deleted file mode 100644
index e65dbf0..0000000
--- a/antora/components/testing/modules/ROOT/partials/nav.adoc
+++ /dev/null
@@ -1,9 +0,0 @@
-:page-partial:
-
-* xref:testing:ROOT:about.adoc[Testing]
-
-** xref:testing:ROOT:overview.adoc[Overview]
-** xref:unit-test-support:ROOT:about.adoc[Unit Test Support]
-** xref:integ-test-support:ROOT:about.adoc[Integ Test Support]
-** xref:ext-specsupport:ROOT:about.adoc[BDD Spec Support (extension)]
-** xref:ext-fixtures:ROOT:about.adoc[Fixture Scripts (extension)]
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
index 46e7fb4..cdef222 100644
--- a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
+++ b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
@@ -90,13 +90,13 @@ Implementing xref:ug:fun:business-rules.adoc[business rules]for domain object me
|x||||||||||
|link:https://www.youtube.com/watch?v=imHfxQGUgV8[007^] +
-Writing xref:unit-test-support:ROOT:about.adoc[unit tests] for a domain object responsibility
+Writing xref:testing:unit-test-support:about.adoc[unit tests] for a domain object responsibility
||x|||||||||
|link:https://www.youtube.com/watch?v=-lAt4UWiBjE[008^] +
-Writing end-to-end xref:integ-test-support:ROOT:about.adoc[integration tests] for a domain object responsibility
+Writing end-to-end xref:testing:integ-test-support:about.adoc[integration tests] for a domain object responsibility
||x|||||||||
@@ -284,7 +284,7 @@ Using the xref:applib:ant:Title.adoc[`@Title`] annotation (instead of the xref:a
|link:https://www.youtube.com/watch?v=yi52Gbd3lmY[027^] +
-How to write an xref:integ-test-support:ROOT:about.adoc[integration test] for an xref:applib:ant:Mixin.adoc[mixin].
+How to write an xref:testing:integ-test-support:about.adoc[integration test] for an xref:applib:ant:Mixin.adoc[mixin].
||x|||||||||
diff --git a/antora/components/toc/modules/ROOT/partials/_powered-by_gesconsultor-grc.adoc b/antora/components/toc/modules/ROOT/partials/_powered-by_gesconsultor-grc.adoc
index 0930991..0a5bd5f 100644
--- a/antora/components/toc/modules/ROOT/partials/_powered-by_gesconsultor-grc.adoc
+++ b/antora/components/toc/modules/ROOT/partials/_powered-by_gesconsultor-grc.adoc
@@ -80,7 +80,7 @@ At the last count more than 400 domain entities, across 6 different Bounded Cont
At the Domain level, we also extensively use the xref:ug:fun:building-blocks.adoc#domain-events[domain events] functionality available in Apache Isis, along with many of the (non-ASF) link:https://platform.incode.org[Incode Platform^] (such as audit, security and excel modules).
-The GRC platform currently has more than 5600 automated tests, about 2000 being xref:ext-specsupport:ROOT:about.adoc[BDD tests] and 3600 xref:integ-test-support:ROOT:about.adoc[integration tests], all leveraging Apache Isis' extensive testing capabilities.
+The GRC platform currently has more than 5600 automated tests, about 2000 being xref:testing:ext-specsupport:about.adoc[BDD tests] and 3600 xref:testing:integ-test-support:about.adoc[integration tests], all leveraging Apache Isis' extensive testing capabilities.
== Summing up
diff --git a/antora/components/userguide/modules/btb/pages/i18n.adoc b/antora/components/userguide/modules/btb/pages/i18n.adoc
index 4c734bd..20c6103 100644
--- a/antora/components/userguide/modules/btb/pages/i18n.adoc
+++ b/antora/components/userguide/modules/btb/pages/i18n.adoc
@@ -492,7 +492,7 @@ msgstr "Username"
So much for the API; but as noted, it is also necessary to ensure that the required translations are recorded (by the `TranslationService`) into the `.pot` file.
-For this, we recommend that you ensure that all such methods are tested through an xref:integ-test-support:ROOT:about.adoc[integration test] (not unit test).
+For this, we recommend that you ensure that all such methods are tested through an xref:testing:integ-test-support:about.adoc[integration test] (not unit test).
For example, here's the corresponding integration test for the "Exclamation mark" example from the simpleapp (above):
diff --git a/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc b/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
index 775afc4..f9cd743 100644
--- a/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
+++ b/antora/components/userguide/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
@@ -25,5 +25,5 @@ Again, these addons can be plugged into any Isis app.
In terms of testing support, each of these other frameworks provide mechanisms to allow the webapp to be tested from within a JUnit test harness.
Apache Isis' support is similar.
Where Apache Isis differs though is that it enables end-to-end testing without the need for slow and fragile Selenium tests.
-Instead, Apache Isis provides a "xref:integ-test-support:ROOT:about.adoc#wrapper-factory[WrapperFactory]" domain service that allows the generic UI provided to in essence be simulated.
+Instead, Apache Isis provides a "xref:testing:integ-test-support:about.adoc#wrapper-factory[WrapperFactory]" domain service that allows the generic UI provided to in essence be simulated.
On a more pragmatic level, the link:https://platform.incode.org[Incode Platform^]'s fakedata module does "what it says on the tin", allowing both unit- and integration-tests to focus on the salient data and fake out the rest.
diff --git a/antora/components/userguide/modules/fun/pages/crud.adoc b/antora/components/userguide/modules/fun/pages/crud.adoc
index 6d7f883..e62a065 100644
--- a/antora/components/userguide/modules/fun/pages/crud.adoc
+++ b/antora/components/userguide/modules/fun/pages/crud.adoc
@@ -7,7 +7,7 @@ include::_attributes.adoc[]
This chapter shows the idioms for creating, reading, updating and deleting xref:ug:fun:building-blocks.adoc#domain-entities[domain entities].
The main domain services used for this are xref:applib:svc:persistence-layer-api/RepositoryService.adoc[`RepositoryService`] and xref:applib:svc:core-domain-api/FactoryService.adoc[`FactoryService`].
-It also shows how to instantiate xref:ug:fun:building-blocks.adoc#view-models[view models] and how to programmatically instantiate xref:ug:fun:building-blocks.adoc#mixins[mixins] (useful primarily for xref:integ-test-support:ROOT:about.adoc[integration testing]).
+It also shows how to instantiate xref:ug:fun:building-blocks.adoc#view-models[view models] and how to programmatically instantiate xref:ug:fun:building-blocks.adoc#mixins[mixins] (useful primarily for xref:testing:integ-test-support:about.adoc[integration testing]).
diff --git a/core/applib/_adoc/modules/ant/pages/Inject.adoc b/core/applib/_adoc/modules/ant/pages/Inject.adoc
index ec8ffd1..c01cf68 100644
--- a/core/applib/_adoc/modules/ant/pages/Inject.adoc
+++ b/core/applib/_adoc/modules/ant/pages/Inject.adoc
@@ -5,7 +5,7 @@ include::_attributes.adoc[]
Apache Isis automatically injects domain services into other domain services and also into domain objects and view models.
-In fact, it also injects domain services into xref:integ-test-support:ROOT:about.adoc[integration tests] and xref:ext-fixtures:ROOT:about.adoc[fixture scripts].
+In fact, it also injects domain services into xref:testing:integ-test-support:about.adoc[integration tests] and xref:ext-fixtures:ROOT:about.adoc[fixture scripts].
[NOTE]
====
diff --git a/core/applib/_adoc/modules/cms/pages/classes/AppManifest-bootstrapping.adoc b/core/applib/_adoc/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
index 309209a..790c798 100644
--- a/core/applib/_adoc/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
+++ b/core/applib/_adoc/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
@@ -221,7 +221,7 @@ java org.apache.isis.WebServer -m com.mycompany.myapp.MyAppAppManifestWithFixtur
* the third case is within an integration test. +
+
-The code to boostrap an integration test is shown in the xref:integ-test-support:ROOT:about.adoc#bootstrapping[testing guide], but once again an `AppManifest` is required.
+The code to boostrap an integration test is shown in the xref:testing:integ-test-support:about.adoc#bootstrapping[testing guide], but once again an `AppManifest` is required.
In some cases an integration test uses the exact same `AppManifest` as the regular webapp.
Sometimes though it is necessary to "tweak" the `AppManifest`:
diff --git a/core/applib/_adoc/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc b/core/applib/_adoc/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc
index a9cda82..dc965d2 100644
--- a/core/applib/_adoc/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc
+++ b/core/applib/_adoc/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc
@@ -185,6 +185,6 @@ The `AppManifest` implementation must (necessarily) reference all the modules wt
(As noted above), the `IntegrationTestAbstract3` adapter class is bootstrapped from a `Module` rather than an `AppManifest`.
This therefore allows the integration tests to reside alongside the module that they exercise, and to bootstrap only the subset of the application required (that is, the module being tested and any of its transitive dependencies)..
-For more on `IntegrationTestAbstract3`, see the xref:integ-test-support:ROOT:about.adoc#bootstrapping[testing user guide].
+For more on `IntegrationTestAbstract3`, see the xref:testing:integ-test-support:about.adoc#bootstrapping[testing user guide].
diff --git a/core/applib/_adoc/modules/svc/pages/application-layer-api/WrapperFactory.adoc b/core/applib/_adoc/modules/svc/pages/application-layer-api/WrapperFactory.adoc
index 42d2510..878aac5 100644
--- a/core/applib/_adoc/modules/svc/pages/application-layer-api/WrapperFactory.adoc
+++ b/core/applib/_adoc/modules/svc/pages/application-layer-api/WrapperFactory.adoc
@@ -15,12 +15,12 @@ Said another way: interactions are performed "as if" they are through the viewer
[NOTE]
====
-For a discussion of the use of the `WrapperFactory` within integration tests (the primary or at least original use case for this service) can be found xref:integ-test-support:ROOT:about.adoc#wrapper-factory[here]
+For a discussion of the use of the `WrapperFactory` within integration tests (the primary or at least original use case for this service) can be found xref:testing:integ-test-support:about.adoc#wrapper-factory[here]
====
This capability goes beyond enforcing the (imperative) constraints within the `hideXxx()`, `disableXxx()` and `validateXxx()` supporting methods; it also enforces (declarative) constraints such as those represented by annotations, eg `@Parameter(maxLength=...)` or `@Property(mustSatisfy=...)`.
-This capability is frequently used within xref:integ-test-support:ROOT:about.adoc[integration tests], but can also be used in production code. (There are analogies that can be drawn here with the way that JEE beans can interact through an EJB local interface).
+This capability is frequently used within xref:testing:integ-test-support:about.adoc[integration tests], but can also be used in production code. (There are analogies that can be drawn here with the way that JEE beans can interact through an EJB local interface).
diff --git a/core/applib/_adoc/modules/svc/pages/persistence-layer-api/IsisJdoSupport.adoc b/core/applib/_adoc/modules/svc/pages/persistence-layer-api/IsisJdoSupport.adoc
index 91e046c..e93e452 100644
--- a/core/applib/_adoc/modules/svc/pages/persistence-layer-api/IsisJdoSupport.adoc
+++ b/core/applib/_adoc/modules/svc/pages/persistence-layer-api/IsisJdoSupport.adoc
@@ -145,7 +145,7 @@ private static <T> List<T> executeListAndClose(final TypesafeQuery<T> query) {
== Fixture support
-When writing xref:integ-test-support:ROOT:about.adoc[integration tests] you'll usually need to tear down some/all mutable transactional data before each test. One way to do that is to use the `executeUpdate(...)` method described xref:applib:svc:persistence-layer-api/IsisJdoSupport.adoc#executing-sql[above].
+When writing xref:testing:integ-test-support:about.adoc[integration tests] you'll usually need to tear down some/all mutable transactional data before each test. One way to do that is to use the `executeUpdate(...)` method described xref:applib:svc:persistence-layer-api/IsisJdoSupport.adoc#executing-sql[above].
Alternatively, the `deleteAll(...)` method will let your test delete all instances of a class without resorting to SQL:
diff --git a/core/applib/_adoc/modules/svc/pages/testing/SudoService.adoc b/core/applib/_adoc/modules/svc/pages/testing/SudoService.adoc
index a3c967b..caf6c8b 100644
--- a/core/applib/_adoc/modules/svc/pages/testing/SudoService.adoc
+++ b/core/applib/_adoc/modules/svc/pages/testing/SudoService.adoc
@@ -7,7 +7,7 @@ include::_attributes.adoc[]
The `SudoService` allows the current user reported by the xref:applib:svc:core-domain-api/UserService.adoc[`UserService`] to be temporarily changed to some other user.
-This is useful both for xref:integ-test-support:ROOT:about.adoc[integration testing] (eg if testing a workflow system whereby objects are moved from one user to another) and while running xref:ext-fixtures:ROOT:about.adoc[fixture scripts] (eg setting up objects that would normally require several users to have acted upon the objects).
+This is useful both for xref:testing:integ-test-support:about.adoc[integration testing] (eg if testing a workflow system whereby objects are moved from one user to another) and while running xref:ext-fixtures:ROOT:about.adoc[fixture scripts] (eg setting up objects that would normally require several users to have acted upon the objects).
== API
diff --git a/core/pom.xml b/core/pom.xml
index 5cb3ef2..0d1414d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1342,6 +1342,13 @@
<version>${isis.version}</version>
</dependency>
+ <!-- maven plugin -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-mavenplugin</artifactId>
+ <version>${isis.version}</version>
+ </dependency>
+
<!-- Restful Objects viewer -->
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/testsupport/integtestsupport/_adoc/antora.yml b/core/testsupport/integtestsupport/_adoc/antora.yml
index 377c49f..0d34b75 100644
--- a/core/testsupport/integtestsupport/_adoc/antora.yml
+++ b/core/testsupport/integtestsupport/_adoc/antora.yml
@@ -1,7 +1,2 @@
-name: integ-test-support
-title: "Integ Test Support"
+name: testing
version: master
-start_page: ROOT:about.adoc
-nav:
-- modules/ROOT/nav.adoc
-#- modules/mvn/nav.adoc # TODO: this will be converted to utilities, perhaps as extensions.
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/nav.adoc b/core/testsupport/integtestsupport/_adoc/modules/ROOT/nav.adoc
deleted file mode 100644
index 5df99fd..0000000
--- a/core/testsupport/integtestsupport/_adoc/modules/ROOT/nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-include::testing:ROOT:partial$nav.adoc[]
-
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/partials/nav.adoc b/core/testsupport/integtestsupport/_adoc/modules/ROOT/partials/nav.adoc
deleted file mode 100644
index e65dbf0..0000000
--- a/core/testsupport/integtestsupport/_adoc/modules/ROOT/partials/nav.adoc
+++ /dev/null
@@ -1,9 +0,0 @@
-:page-partial:
-
-* xref:testing:ROOT:about.adoc[Testing]
-
-** xref:testing:ROOT:overview.adoc[Overview]
-** xref:unit-test-support:ROOT:about.adoc[Unit Test Support]
-** xref:integ-test-support:ROOT:about.adoc[Integ Test Support]
-** xref:ext-specsupport:ROOT:about.adoc[BDD Spec Support (extension)]
-** xref:ext-fixtures:ROOT:about.adoc[Fixture Scripts (extension)]
diff --git a/extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/_attributes.adoc
similarity index 100%
rename from extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc
rename to core/testsupport/integtestsupport/_adoc/modules/integ-test-support/_attributes.adoc
diff --git a/extensions/specsupport/_adoc/modules/ROOT/images/.gitkeep b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/attachments/.gitkeep
similarity index 100%
rename from extensions/specsupport/_adoc/modules/ROOT/images/.gitkeep
rename to core/testsupport/integtestsupport/_adoc/modules/integ-test-support/attachments/.gitkeep
diff --git a/extensions/specsupport/_adoc/modules/ROOT/examples/.gitkeep b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/examples/.gitkeep
similarity index 100%
rename from extensions/specsupport/_adoc/modules/ROOT/examples/.gitkeep
rename to core/testsupport/integtestsupport/_adoc/modules/integ-test-support/examples/.gitkeep
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/images/integ-tests.png b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/images/integ-tests.png
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/images/integ-tests.png
rename to core/testsupport/integtestsupport/_adoc/modules/integ-test-support/images/integ-tests.png
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/images/integ-tests.pptx b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/images/integ-tests.pptx
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/images/integ-tests.pptx
rename to core/testsupport/integtestsupport/_adoc/modules/integ-test-support/images/integ-tests.pptx
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/images/wrapper-factory.png b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/images/wrapper-factory.png
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/images/wrapper-factory.png
rename to core/testsupport/integtestsupport/_adoc/modules/integ-test-support/images/wrapper-factory.png
diff --git a/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/nav.adoc b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/nav.adoc
new file mode 100644
index 0000000..13d0804
--- /dev/null
+++ b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/nav.adoc
@@ -0,0 +1,2 @@
+include::testing:ROOT:partial$component-nav.adoc[]
+
diff --git a/extensions/specsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/_attributes.adoc
similarity index 100%
rename from extensions/specsupport/_adoc/modules/ROOT/partials/_attributes.adoc
rename to core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/_attributes.adoc
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/about.adoc b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/about.adoc
similarity index 76%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/about.adoc
rename to core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/about.adoc
index a2569ea..c70c972 100644
--- a/core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/about.adoc
+++ b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/about.adoc
@@ -16,9 +16,9 @@ We'll get to all that shortly, but let's start by taking a look at what a typica
-include::integ-test-support/typical-usage.adoc[leveloffset=+1]
-include::integ-test-support/bootstrapping.adoc[leveloffset=+1]
-include::integ-test-support/abstract-class.adoc[leveloffset=+1]
-include::integ-test-support/configuration-properties.adoc[leveloffset=+1]
-include::integ-test-support/wrapper-factory.adoc[leveloffset=+1]
-include::integ-test-support/maven-configuration.adoc[leveloffset=+1]
+include::./integ-test-support/typical-usage.adoc[leveloffset=+1]
+include::./integ-test-support/bootstrapping.adoc[leveloffset=+1]
+include::./integ-test-support/abstract-class.adoc[leveloffset=+1]
+include::./integ-test-support/configuration-properties.adoc[leveloffset=+1]
+include::./integ-test-support/wrapper-factory.adoc[leveloffset=+1]
+include::./integ-test-support/maven-configuration.adoc[leveloffset=+1]
diff --git a/extensions/specsupport/_adoc/modules/ROOT/pages/bdd-spec-support/_attributes.adoc b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/integ-test-support/_attributes.adoc
similarity index 100%
rename from extensions/specsupport/_adoc/modules/ROOT/pages/bdd-spec-support/_attributes.adoc
rename to core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/integ-test-support/_attributes.adoc
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/integ-test-support/abstract-class.adoc b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc
similarity index 87%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/integ-test-support/abstract-class.adoc
rename to core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc
index 1265536..2ceeeed 100644
--- a/core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/integ-test-support/abstract-class.adoc
+++ b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc
@@ -7,14 +7,14 @@ include::_attributes.adoc[]
When writing integration tests, it's easiest to inherit from the `IntegrationTestAbstract3` base class.
-This base class xref:integ-test-support:ROOT:about.adoc#bootstrapping[bootstraps] the framework (caching the framework on a thread-local), and provides various utility methods and framework-provided services for use by your application's subclass tests.
+This base class xref:testing:integ-test-support:about.adoc#bootstrapping[bootstraps] the framework (caching the framework on a thread-local), and provides various utility methods and framework-provided services for use by your application's subclass tests.
== `IntegrationTestAbstract3`
We recommend that your integration tests inherit from Apache Isis' `IntegrationTestAbstract3` class.
-The primary benefit over its predecessor, `IntegrationTestAbstract2` (discussed xref:integ-test-support:ROOT:about.adoc#IntegrationTestAbstract2[below] is that it allows the test to be bootstrapped by passing in a `Module` rather than an `AppManifest`.
+The primary benefit over its predecessor, `IntegrationTestAbstract2` (discussed xref:testing:integ-test-support:about.adoc#IntegrationTestAbstract2[below] is that it allows the test to be bootstrapped by passing in a `Module` rather than an `AppManifest`.
For example:
@@ -65,7 +65,7 @@ public ExceptionRecognizerTranslate exceptionRecognizerTranslations = // <4>
ExceptionRecognizerTranslate.create();
----
<1> ensures an Apache Isis session/transaction running for each test
-<2> sets up a JMock context (using Apache Isis' extension to JMock as described in xref:unit-test-support:ROOT:about.adoc#jmock-extensions[JMock Extensions].
+<2> sets up a JMock context (using Apache Isis' extension to JMock as described in xref:testing:unit-test-support:about.adoc#jmock-extensions[JMock Extensions].
<3> standard JUnit rule for writing tests that throw exceptions
<4> to capture messages that require translation, as described in xref:ug:btb:i18n.adoc[i18 support].
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/integ-test-support/bootstrapping.adoc b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/integ-test-support/bootstrapping.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/integ-test-support/bootstrapping.adoc
rename to core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/integ-test-support/bootstrapping.adoc
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/integ-test-support/configuration-properties.adoc b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/integ-test-support/configuration-properties.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/integ-test-support/configuration-properties.adoc
rename to core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/integ-test-support/configuration-properties.adoc
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/integ-test-support/maven-configuration.adoc b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/integ-test-support/maven-configuration.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/integ-test-support/maven-configuration.adoc
rename to core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/integ-test-support/maven-configuration.adoc
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/integ-test-support/typical-usage.adoc b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/integ-test-support/typical-usage.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/integ-test-support/typical-usage.adoc
rename to core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/integ-test-support/typical-usage.adoc
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/integ-test-support/wrapper-factory.adoc b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/integ-test-support/wrapper-factory.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/integ-test-support/wrapper-factory.adoc
rename to core/testsupport/integtestsupport/_adoc/modules/integ-test-support/pages/integ-test-support/wrapper-factory.adoc
diff --git a/extensions/specsupport/_adoc/modules/ROOT/pages/_attributes.adoc b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/partials/_attributes.adoc
similarity index 100%
rename from extensions/specsupport/_adoc/modules/ROOT/pages/_attributes.adoc
rename to core/testsupport/integtestsupport/_adoc/modules/integ-test-support/partials/_attributes.adoc
diff --git a/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/partials/module-nav.adoc b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/partials/module-nav.adoc
new file mode 100644
index 0000000..15c429b
--- /dev/null
+++ b/core/testsupport/integtestsupport/_adoc/modules/integ-test-support/partials/module-nav.adoc
@@ -0,0 +1 @@
+* xref:testing:integ-test-support:about.adoc[Integ Test Support]
diff --git a/core/testsupport/integtestsupport/test.data b/core/testsupport/integtestsupport/test.data
deleted file mode 100644
index 78b3ff7..0000000
--- a/core/testsupport/integtestsupport/test.data
+++ /dev/null
@@ -1,5 +0,0 @@
-org.apache.isis.core.tck.dom.refs.SimpleEntity#4
- date: 08-Mar-2010 13:32
- name: Fred Smith
- nullable:
- size: 0
diff --git a/core/testsupport/mavenplugin/_adoc/antora.yml b/core/testsupport/mavenplugin/_adoc/antora.yml
new file mode 100644
index 0000000..0d34b75
--- /dev/null
+++ b/core/testsupport/mavenplugin/_adoc/antora.yml
@@ -0,0 +1,2 @@
+name: testing
+version: master
diff --git a/core/testsupport/mavenplugin/_adoc/examples.csv b/core/testsupport/mavenplugin/_adoc/examples.csv
new file mode 100644
index 0000000..5d5804b
--- /dev/null
+++ b/core/testsupport/mavenplugin/_adoc/examples.csv
@@ -0,0 +1 @@
+#file,source,target
diff --git a/extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc b/core/testsupport/mavenplugin/_adoc/modules/mvn/_attributes.adoc
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc
rename to core/testsupport/mavenplugin/_adoc/modules/mvn/_attributes.adoc
diff --git a/extensions/specsupport/_adoc/modules/ROOT/attachments/.gitkeep b/core/testsupport/mavenplugin/_adoc/modules/mvn/attachments/.gitkeep
similarity index 100%
rename from extensions/specsupport/_adoc/modules/ROOT/attachments/.gitkeep
rename to core/testsupport/mavenplugin/_adoc/modules/mvn/attachments/.gitkeep
diff --git a/extensions/fixtures/_adoc/modules/ROOT/images/.gitkeep b/core/testsupport/mavenplugin/_adoc/modules/mvn/examples/.gitkeep
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/images/.gitkeep
rename to core/testsupport/mavenplugin/_adoc/modules/mvn/examples/.gitkeep
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/images/maven-plugin/xsd-goal.png b/core/testsupport/mavenplugin/_adoc/modules/mvn/images/maven-plugin/xsd-goal.png
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/images/maven-plugin/xsd-goal.png
rename to core/testsupport/mavenplugin/_adoc/modules/mvn/images/maven-plugin/xsd-goal.png
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/images/maven-plugin/xsd-goal.pptx b/core/testsupport/mavenplugin/_adoc/modules/mvn/images/maven-plugin/xsd-goal.pptx
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/images/maven-plugin/xsd-goal.pptx
rename to core/testsupport/mavenplugin/_adoc/modules/mvn/images/maven-plugin/xsd-goal.pptx
diff --git a/core/testsupport/mavenplugin/_adoc/modules/mvn/nav.adoc b/core/testsupport/mavenplugin/_adoc/modules/mvn/nav.adoc
new file mode 100644
index 0000000..13d0804
--- /dev/null
+++ b/core/testsupport/mavenplugin/_adoc/modules/mvn/nav.adoc
@@ -0,0 +1,2 @@
+include::testing:ROOT:partial$component-nav.adoc[]
+
diff --git a/extensions/fixtures/_adoc/modules/ROOT/partials/_attributes.adoc b/core/testsupport/mavenplugin/_adoc/modules/mvn/pages/_attributes.adoc
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/partials/_attributes.adoc
rename to core/testsupport/mavenplugin/_adoc/modules/mvn/pages/_attributes.adoc
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/pages/about.adoc b/core/testsupport/mavenplugin/_adoc/modules/mvn/pages/about.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/pages/about.adoc
rename to core/testsupport/mavenplugin/_adoc/modules/mvn/pages/about.adoc
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/pages/intro.adoc b/core/testsupport/mavenplugin/_adoc/modules/mvn/pages/intro.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/pages/intro.adoc
rename to core/testsupport/mavenplugin/_adoc/modules/mvn/pages/intro.adoc
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/pages/swagger.adoc b/core/testsupport/mavenplugin/_adoc/modules/mvn/pages/swagger.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/pages/swagger.adoc
rename to core/testsupport/mavenplugin/_adoc/modules/mvn/pages/swagger.adoc
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/pages/validate.adoc b/core/testsupport/mavenplugin/_adoc/modules/mvn/pages/validate.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/pages/validate.adoc
rename to core/testsupport/mavenplugin/_adoc/modules/mvn/pages/validate.adoc
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/pages/xsd.adoc b/core/testsupport/mavenplugin/_adoc/modules/mvn/pages/xsd.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/pages/xsd.adoc
rename to core/testsupport/mavenplugin/_adoc/modules/mvn/pages/xsd.adoc
diff --git a/extensions/fixtures/_adoc/modules/ROOT/pages/_attributes.adoc b/core/testsupport/mavenplugin/_adoc/modules/mvn/partials/_attributes.adoc
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/pages/_attributes.adoc
rename to core/testsupport/mavenplugin/_adoc/modules/mvn/partials/_attributes.adoc
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/nav.adoc b/core/testsupport/mavenplugin/_adoc/modules/mvn/partials/nav.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/nav.adoc
rename to core/testsupport/mavenplugin/_adoc/modules/mvn/partials/nav.adoc
diff --git a/core/testsupport/mavenplugin/_adoc/sync_examples.sh b/core/testsupport/mavenplugin/_adoc/sync_examples.sh
new file mode 100644
index 0000000..5260cd7
--- /dev/null
+++ b/core/testsupport/mavenplugin/_adoc/sync_examples.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+SCRIPT=$(readlink -f "$0")
+SCRIPTPATH=$(dirname "$SCRIPT")
+if [ $# -ne 1 ]; then
+ FILELIST=$SCRIPTPATH/examples.csv
+else
+ FILELIST=$1
+fi
+FILELISTFQN=$(readlink -f $FILELIST)
+DIRNAME=$(dirname $FILELISTFQN)
+BASENAME=$(basename $FILELISTFQN)
+
+cd $DIRNAME >/dev/null 2>&1
+cat $BASENAME | tail +2 | grep -v ^# | while read LINE
+do
+ FILE=$(echo $LINE | awk -F, '{print $1}' | awk '{$1=$1;print}')
+ F2=$(echo $LINE | awk -F, '{print $2}' | awk '{$1=$1;print}')
+ F3=$(echo $LINE | awk -F, '{print $3}' | awk '{$1=$1;print}')
+ SOURCEFQN=$DIRNAME/$F2/$FILE
+ TARGETDIR=$DIRNAME/$F3
+ TARGETFQN=$DIRNAME/$F3/$FILE
+
+ echo "SOURCEFQN: $SOURCEFQN"
+
+ if [ -f "$SOURCEFQN" ]
+ then
+
+ if [ -f "$TARGETFQN" ]
+ then
+ rm $TARGETFQN
+ fi
+ mkdir -p $TARGETDIR
+ cp $SOURCEFQN $TARGETFQN
+ else
+ echo "- does not exist ($SOURCEFQN) " >&2
+ exit 1
+ fi
+done
+cd - >/dev/null 2>&1
\ No newline at end of file
diff --git a/core/testsupport/mavenplugin/pom.xml b/core/testsupport/mavenplugin/pom.xml
new file mode 100644
index 0000000..ea523e3
--- /dev/null
+++ b/core/testsupport/mavenplugin/pom.xml
@@ -0,0 +1,148 @@
+<?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</artifactId>
+ <version>${revision}</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>isis-mavenplugin</artifactId>
+ <name>Apache Isis Maven Plugin</name>
+
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.integtestsupport</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/integtestsupport</git-plugin.propertiesDir>
+ </properties>
+
+ <dependencies>
+
+ <!-- JDO API (non transient, provided by plugin) -->
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ <!-- provided by plugins -->
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-unittestsupport</artifactId>
+ </dependency>
+
+ <!-- JUPITER -->
+ <dependency>
+ <!-- JUnit API for writing tests and extensions -->
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ </dependency>
+ <dependency>
+ <!-- implementation of the JUnit Jupiter test engine -->
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ </dependency>
+ <dependency>
+ <!-- support for unit tests that use JUnit 4 or JUnit 3 -->
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-security</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-security-bypass</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime-services</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime-extensions</artifactId>
+ </dependency>
+
+
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>flatten</id>
+ <activation>
+ <property>
+ <name>!skip.flatten</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>1.0.0</version>
+ <executions>
+ <execution>
+ <id>flatten</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ <configuration>
+ <flattenMode>defaults</flattenMode>
+ <updatePomFile>true</updatePomFile>
+ <pomElements>
+ <name>resolve</name>
+ <description>resolve</description>
+ <dependencies>resolve</dependencies>
+ </pomElements>
+ </configuration>
+ </execution>
+ <execution>
+ <id>flatten.clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
diff --git a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java b/core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java
rename to core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoAbstract.java
diff --git a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java b/core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java
rename to core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoSwagger.java
diff --git a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java b/core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java
rename to core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoValidate.java
diff --git a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java b/core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java
rename to core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/IsisMojoXsd.java
diff --git a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java b/core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java
rename to core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/MetaModelProcessor.java
diff --git a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java b/core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
rename to core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
diff --git a/core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java b/core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
similarity index 100%
rename from core/testsupport/integtestsupport/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
rename to core/testsupport/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
diff --git a/core/testsupport/unittestsupport/_adoc/antora.yml b/core/testsupport/unittestsupport/_adoc/antora.yml
index 4840443..0d34b75 100644
--- a/core/testsupport/unittestsupport/_adoc/antora.yml
+++ b/core/testsupport/unittestsupport/_adoc/antora.yml
@@ -1,6 +1,2 @@
-name: unit-test-support
-title: "Unit Test Support"
+name: testing
version: master
-start_page: ROOT:about.adoc
-nav:
-- modules/ROOT/nav.adoc
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/nav.adoc b/core/testsupport/unittestsupport/_adoc/modules/ROOT/nav.adoc
deleted file mode 100644
index 5df99fd..0000000
--- a/core/testsupport/unittestsupport/_adoc/modules/ROOT/nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-include::testing:ROOT:partial$nav.adoc[]
-
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/partials/nav.adoc b/core/testsupport/unittestsupport/_adoc/modules/ROOT/partials/nav.adoc
deleted file mode 100644
index e65dbf0..0000000
--- a/core/testsupport/unittestsupport/_adoc/modules/ROOT/partials/nav.adoc
+++ /dev/null
@@ -1,9 +0,0 @@
-:page-partial:
-
-* xref:testing:ROOT:about.adoc[Testing]
-
-** xref:testing:ROOT:overview.adoc[Overview]
-** xref:unit-test-support:ROOT:about.adoc[Unit Test Support]
-** xref:integ-test-support:ROOT:about.adoc[Integ Test Support]
-** xref:ext-specsupport:ROOT:about.adoc[BDD Spec Support (extension)]
-** xref:ext-fixtures:ROOT:about.adoc[Fixture Scripts (extension)]
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc b/core/testsupport/unittestsupport/_adoc/modules/unit-test-support/_attributes.adoc
similarity index 100%
rename from core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc
rename to core/testsupport/unittestsupport/_adoc/modules/unit-test-support/_attributes.adoc
diff --git a/extensions/fixtures/_adoc/modules/ROOT/examples/.gitkeep b/core/testsupport/unittestsupport/_adoc/modules/unit-test-support/attachments/.gitkeep
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/examples/.gitkeep
rename to core/testsupport/unittestsupport/_adoc/modules/unit-test-support/attachments/.gitkeep
diff --git a/extensions/fixtures/_adoc/modules/ROOT/attachments/.gitkeep b/core/testsupport/unittestsupport/_adoc/modules/unit-test-support/examples/.gitkeep
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/attachments/.gitkeep
rename to core/testsupport/unittestsupport/_adoc/modules/unit-test-support/examples/.gitkeep
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/images/.gitkeep b/core/testsupport/unittestsupport/_adoc/modules/unit-test-support/images/.gitkeep
similarity index 100%
rename from core/testsupport/unittestsupport/_adoc/modules/ROOT/images/.gitkeep
rename to core/testsupport/unittestsupport/_adoc/modules/unit-test-support/images/.gitkeep
diff --git a/core/testsupport/unittestsupport/_adoc/modules/unit-test-support/nav.adoc b/core/testsupport/unittestsupport/_adoc/modules/unit-test-support/nav.adoc
new file mode 100644
index 0000000..13d0804
--- /dev/null
+++ b/core/testsupport/unittestsupport/_adoc/modules/unit-test-support/nav.adoc
@@ -0,0 +1,2 @@
+include::testing:ROOT:partial$component-nav.adoc[]
+
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/core/testsupport/unittestsupport/_adoc/modules/unit-test-support/pages/_attributes.adoc
similarity index 100%
rename from core/testsupport/unittestsupport/_adoc/modules/ROOT/partials/_attributes.adoc
rename to core/testsupport/unittestsupport/_adoc/modules/unit-test-support/pages/_attributes.adoc
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/pages/about.adoc b/core/testsupport/unittestsupport/_adoc/modules/unit-test-support/pages/about.adoc
similarity index 100%
rename from core/testsupport/unittestsupport/_adoc/modules/ROOT/pages/about.adoc
rename to core/testsupport/unittestsupport/_adoc/modules/unit-test-support/pages/about.adoc
diff --git a/extensions/fixtures/_adoc/modules/ROOT/pages/fixture-scripts/_attributes.adoc b/core/testsupport/unittestsupport/_adoc/modules/unit-test-support/pages/unit-test-support/_attributes.adoc
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/pages/fixture-scripts/_attributes.adoc
rename to core/testsupport/unittestsupport/_adoc/modules/unit-test-support/pages/unit-test-support/_attributes.adoc
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/pages/unit-test-support/contract-tests.adoc b/core/testsupport/unittestsupport/_adoc/modules/unit-test-support/pages/unit-test-support/contract-tests.adoc
similarity index 100%
rename from core/testsupport/unittestsupport/_adoc/modules/ROOT/pages/unit-test-support/contract-tests.adoc
rename to core/testsupport/unittestsupport/_adoc/modules/unit-test-support/pages/unit-test-support/contract-tests.adoc
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/pages/unit-test-support/jmock-extensions.adoc b/core/testsupport/unittestsupport/_adoc/modules/unit-test-support/pages/unit-test-support/jmock-extensions.adoc
similarity index 100%
rename from core/testsupport/unittestsupport/_adoc/modules/ROOT/pages/unit-test-support/jmock-extensions.adoc
rename to core/testsupport/unittestsupport/_adoc/modules/unit-test-support/pages/unit-test-support/jmock-extensions.adoc
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/pages/unit-test-support/maven-configuration.adoc b/core/testsupport/unittestsupport/_adoc/modules/unit-test-support/pages/unit-test-support/maven-configuration.adoc
similarity index 100%
rename from core/testsupport/unittestsupport/_adoc/modules/ROOT/pages/unit-test-support/maven-configuration.adoc
rename to core/testsupport/unittestsupport/_adoc/modules/unit-test-support/pages/unit-test-support/maven-configuration.adoc
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/pages/unit-test-support/soap-fake-server-junit-rule.adoc b/core/testsupport/unittestsupport/_adoc/modules/unit-test-support/pages/unit-test-support/soap-fake-server-junit-rule.adoc
similarity index 100%
rename from core/testsupport/unittestsupport/_adoc/modules/ROOT/pages/unit-test-support/soap-fake-server-junit-rule.adoc
rename to core/testsupport/unittestsupport/_adoc/modules/unit-test-support/pages/unit-test-support/soap-fake-server-junit-rule.adoc
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/pages/_attributes.adoc b/core/testsupport/unittestsupport/_adoc/modules/unit-test-support/partials/_attributes.adoc
similarity index 100%
rename from core/testsupport/unittestsupport/_adoc/modules/ROOT/pages/_attributes.adoc
rename to core/testsupport/unittestsupport/_adoc/modules/unit-test-support/partials/_attributes.adoc
diff --git a/core/testsupport/unittestsupport/_adoc/modules/unit-test-support/partials/module-nav.adoc b/core/testsupport/unittestsupport/_adoc/modules/unit-test-support/partials/module-nav.adoc
new file mode 100644
index 0000000..3cdcf2c
--- /dev/null
+++ b/core/testsupport/unittestsupport/_adoc/modules/unit-test-support/partials/module-nav.adoc
@@ -0,0 +1 @@
+* xref:testing:unit-test-support:about.adoc[Unit Test Support]
diff --git a/extensions/fixtures/_adoc/antora.yml b/extensions/fixtures/_adoc/antora.yml
index fc4f3a1..0d34b75 100644
--- a/extensions/fixtures/_adoc/antora.yml
+++ b/extensions/fixtures/_adoc/antora.yml
@@ -1,6 +1,2 @@
-name: ext-fixtures
-title: "Extensions - Fixtures"
+name: testing
version: master
-start_page: ROOT:about.adoc
-nav:
-- modules/ROOT/nav.adoc
diff --git a/extensions/fixtures/_adoc/modules/ROOT/nav.adoc b/extensions/fixtures/_adoc/modules/ROOT/nav.adoc
deleted file mode 100644
index 5df99fd..0000000
--- a/extensions/fixtures/_adoc/modules/ROOT/nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-include::testing:ROOT:partial$nav.adoc[]
-
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc b/extensions/fixtures/_adoc/modules/ext-fixtures/_attributes.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc
rename to extensions/fixtures/_adoc/modules/ext-fixtures/_attributes.adoc
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/examples/.gitkeep b/extensions/fixtures/_adoc/modules/ext-fixtures/attachments/.gitkeep
similarity index 100%
rename from core/testsupport/unittestsupport/_adoc/modules/ROOT/examples/.gitkeep
rename to extensions/fixtures/_adoc/modules/ext-fixtures/attachments/.gitkeep
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/attachments/.gitkeep b/extensions/fixtures/_adoc/modules/ext-fixtures/examples/.gitkeep
similarity index 100%
rename from core/testsupport/unittestsupport/_adoc/modules/ROOT/attachments/.gitkeep
rename to extensions/fixtures/_adoc/modules/ext-fixtures/examples/.gitkeep
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/examples/.gitkeep b/extensions/fixtures/_adoc/modules/ext-fixtures/images/.gitkeep
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/examples/.gitkeep
rename to extensions/fixtures/_adoc/modules/ext-fixtures/images/.gitkeep
diff --git a/extensions/fixtures/_adoc/modules/ROOT/images/composite.png b/extensions/fixtures/_adoc/modules/ext-fixtures/images/composite.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/images/composite.png
rename to extensions/fixtures/_adoc/modules/ext-fixtures/images/composite.png
diff --git a/extensions/fixtures/_adoc/modules/ROOT/images/flat-1.png b/extensions/fixtures/_adoc/modules/ext-fixtures/images/flat-1.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/images/flat-1.png
rename to extensions/fixtures/_adoc/modules/ext-fixtures/images/flat-1.png
diff --git a/extensions/fixtures/_adoc/modules/ROOT/images/flat-2.png b/extensions/fixtures/_adoc/modules/ext-fixtures/images/flat-2.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/images/flat-2.png
rename to extensions/fixtures/_adoc/modules/ext-fixtures/images/flat-2.png
diff --git a/extensions/fixtures/_adoc/modules/ROOT/images/organizing-fixture-scripts.pptx b/extensions/fixtures/_adoc/modules/ext-fixtures/images/organizing-fixture-scripts.pptx
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/images/organizing-fixture-scripts.pptx
rename to extensions/fixtures/_adoc/modules/ext-fixtures/images/organizing-fixture-scripts.pptx
diff --git a/extensions/fixtures/_adoc/modules/ROOT/images/prompt-specifying-number.png b/extensions/fixtures/_adoc/modules/ext-fixtures/images/prompt-specifying-number.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/images/prompt-specifying-number.png
rename to extensions/fixtures/_adoc/modules/ext-fixtures/images/prompt-specifying-number.png
diff --git a/extensions/fixtures/_adoc/modules/ROOT/images/prompt.png b/extensions/fixtures/_adoc/modules/ext-fixtures/images/prompt.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/images/prompt.png
rename to extensions/fixtures/_adoc/modules/ext-fixtures/images/prompt.png
diff --git a/extensions/fixtures/_adoc/modules/ROOT/images/prototyping-menu.png b/extensions/fixtures/_adoc/modules/ext-fixtures/images/prototyping-menu.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/images/prototyping-menu.png
rename to extensions/fixtures/_adoc/modules/ext-fixtures/images/prototyping-menu.png
diff --git a/extensions/fixtures/_adoc/modules/ROOT/images/result-list.png b/extensions/fixtures/_adoc/modules/ext-fixtures/images/result-list.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/images/result-list.png
rename to extensions/fixtures/_adoc/modules/ext-fixtures/images/result-list.png
diff --git a/extensions/fixtures/_adoc/modules/ext-fixtures/nav.adoc b/extensions/fixtures/_adoc/modules/ext-fixtures/nav.adoc
new file mode 100644
index 0000000..13d0804
--- /dev/null
+++ b/extensions/fixtures/_adoc/modules/ext-fixtures/nav.adoc
@@ -0,0 +1,2 @@
+include::testing:ROOT:partial$component-nav.adoc[]
+
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/partials/_attributes.adoc b/extensions/fixtures/_adoc/modules/ext-fixtures/pages/_attributes.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/partials/_attributes.adoc
rename to extensions/fixtures/_adoc/modules/ext-fixtures/pages/_attributes.adoc
diff --git a/extensions/fixtures/_adoc/modules/ROOT/pages/about.adoc b/extensions/fixtures/_adoc/modules/ext-fixtures/pages/about.adoc
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/pages/about.adoc
rename to extensions/fixtures/_adoc/modules/ext-fixtures/pages/about.adoc
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/pages/unit-test-support/_attributes.adoc b/extensions/fixtures/_adoc/modules/ext-fixtures/pages/fixture-scripts/_attributes.adoc
similarity index 100%
rename from core/testsupport/unittestsupport/_adoc/modules/ROOT/pages/unit-test-support/_attributes.adoc
rename to extensions/fixtures/_adoc/modules/ext-fixtures/pages/fixture-scripts/_attributes.adoc
diff --git a/extensions/fixtures/_adoc/modules/ROOT/pages/fixture-scripts/api-and-usage.adoc b/extensions/fixtures/_adoc/modules/ext-fixtures/pages/fixture-scripts/api-and-usage.adoc
similarity index 99%
rename from extensions/fixtures/_adoc/modules/ROOT/pages/fixture-scripts/api-and-usage.adoc
rename to extensions/fixtures/_adoc/modules/ext-fixtures/pages/fixture-scripts/api-and-usage.adoc
index 93253be..482ae9a 100644
--- a/extensions/fixtures/_adoc/modules/ROOT/pages/fixture-scripts/api-and-usage.adoc
+++ b/extensions/fixtures/_adoc/modules/ext-fixtures/pages/fixture-scripts/api-and-usage.adoc
@@ -39,7 +39,7 @@ public class DomainAppFixtureScriptsSpecificationProvider
}
----
<1> search for all fixture scripts under the package containing this class
-<2> if the same fixture script (class) is encountered more than once, then run anyway; more on this in xref:ext-fixtures:ROOT:about/api-and-usage.adoc#organizing[Organizing Fixture scripts], below.
+<2> if the same fixture script (class) is encountered more than once, then run anyway; more on this in xref:testing:ext-fixtures:about/api-and-usage.adoc#organizing[Organizing Fixture scripts], below.
<3> specify the fixture script class to provide as the default for the service's "run fixture script" action
<4> whether the service's "run fixture script" action should display other fixture scripts using a choices drop down or (if there are very many of them) using an auto-complete
<5> if present, enables a "recreate objects and return first" action to be displayed in the UI
diff --git a/extensions/fixtures/_adoc/modules/ROOT/pages/fixture-scripts/sudo-service.adoc b/extensions/fixtures/_adoc/modules/ext-fixtures/pages/fixture-scripts/sudo-service.adoc
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/pages/fixture-scripts/sudo-service.adoc
rename to extensions/fixtures/_adoc/modules/ext-fixtures/pages/fixture-scripts/sudo-service.adoc
diff --git a/extensions/fixtures/_adoc/modules/ROOT/pages/fixture-scripts/ticking-clock-fixture.adoc b/extensions/fixtures/_adoc/modules/ext-fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/pages/fixture-scripts/ticking-clock-fixture.adoc
rename to extensions/fixtures/_adoc/modules/ext-fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/pages/_attributes.adoc b/extensions/fixtures/_adoc/modules/ext-fixtures/partials/_attributes.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/pages/_attributes.adoc
rename to extensions/fixtures/_adoc/modules/ext-fixtures/partials/_attributes.adoc
diff --git a/extensions/fixtures/_adoc/modules/ext-fixtures/partials/module-nav.adoc b/extensions/fixtures/_adoc/modules/ext-fixtures/partials/module-nav.adoc
new file mode 100644
index 0000000..c6af38a
--- /dev/null
+++ b/extensions/fixtures/_adoc/modules/ext-fixtures/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+* xref:testing:ext-fixtures:about.adoc[Fixture Scripts (extension)]
+
+
diff --git a/extensions/specsupport/_adoc/antora.yml b/extensions/specsupport/_adoc/antora.yml
index 5c7bc3b..0d34b75 100644
--- a/extensions/specsupport/_adoc/antora.yml
+++ b/extensions/specsupport/_adoc/antora.yml
@@ -1,6 +1,2 @@
-name: ext-specsupport
-title: "Extensions - (BDD) Spec Support"
+name: testing
version: master
-start_page: ROOT:about.adoc
-nav:
-- modules/ROOT/nav.adoc
diff --git a/extensions/specsupport/_adoc/modules/ROOT/nav.adoc b/extensions/specsupport/_adoc/modules/ROOT/nav.adoc
deleted file mode 100644
index 5df99fd..0000000
--- a/extensions/specsupport/_adoc/modules/ROOT/nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-include::testing:ROOT:partial$nav.adoc[]
-
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc b/extensions/specsupport/_adoc/modules/ext-specsupport/_attributes.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc
rename to extensions/specsupport/_adoc/modules/ext-specsupport/_attributes.adoc
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/attachments/.gitkeep b/extensions/specsupport/_adoc/modules/ext-specsupport/attachments/.gitkeep
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/attachments/.gitkeep
rename to extensions/specsupport/_adoc/modules/ext-specsupport/attachments/.gitkeep
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/examples/.gitkeep b/extensions/specsupport/_adoc/modules/ext-specsupport/examples/.gitkeep
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/examples/.gitkeep
rename to extensions/specsupport/_adoc/modules/ext-specsupport/examples/.gitkeep
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/attachments/.gitkeep b/extensions/specsupport/_adoc/modules/ext-specsupport/images/.gitkeep
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/attachments/.gitkeep
rename to extensions/specsupport/_adoc/modules/ext-specsupport/images/.gitkeep
diff --git a/extensions/specsupport/_adoc/modules/ext-specsupport/nav.adoc b/extensions/specsupport/_adoc/modules/ext-specsupport/nav.adoc
new file mode 100644
index 0000000..13d0804
--- /dev/null
+++ b/extensions/specsupport/_adoc/modules/ext-specsupport/nav.adoc
@@ -0,0 +1,2 @@
+include::testing:ROOT:partial$component-nav.adoc[]
+
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/extensions/specsupport/_adoc/modules/ext-specsupport/pages/_attributes.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/partials/_attributes.adoc
rename to extensions/specsupport/_adoc/modules/ext-specsupport/pages/_attributes.adoc
diff --git a/extensions/specsupport/_adoc/modules/ROOT/pages/about.adoc b/extensions/specsupport/_adoc/modules/ext-specsupport/pages/about.adoc
similarity index 100%
rename from extensions/specsupport/_adoc/modules/ROOT/pages/about.adoc
rename to extensions/specsupport/_adoc/modules/ext-specsupport/pages/about.adoc
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/integ-test-support/_attributes.adoc b/extensions/specsupport/_adoc/modules/ext-specsupport/pages/bdd-spec-support/_attributes.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/integ-test-support/_attributes.adoc
rename to extensions/specsupport/_adoc/modules/ext-specsupport/pages/bdd-spec-support/_attributes.adoc
diff --git a/extensions/specsupport/_adoc/modules/ROOT/pages/bdd-spec-support/how-it-works.adoc b/extensions/specsupport/_adoc/modules/ext-specsupport/pages/bdd-spec-support/how-it-works.adoc
similarity index 100%
rename from extensions/specsupport/_adoc/modules/ROOT/pages/bdd-spec-support/how-it-works.adoc
rename to extensions/specsupport/_adoc/modules/ext-specsupport/pages/bdd-spec-support/how-it-works.adoc
diff --git a/extensions/specsupport/_adoc/modules/ROOT/pages/bdd-spec-support/maven-configuration.adoc b/extensions/specsupport/_adoc/modules/ext-specsupport/pages/bdd-spec-support/maven-configuration.adoc
similarity index 100%
rename from extensions/specsupport/_adoc/modules/ROOT/pages/bdd-spec-support/maven-configuration.adoc
rename to extensions/specsupport/_adoc/modules/ext-specsupport/pages/bdd-spec-support/maven-configuration.adoc
diff --git a/extensions/specsupport/_adoc/modules/ROOT/pages/bdd-spec-support/writing-a-bdd-spec.adoc b/extensions/specsupport/_adoc/modules/ext-specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc
similarity index 100%
rename from extensions/specsupport/_adoc/modules/ROOT/pages/bdd-spec-support/writing-a-bdd-spec.adoc
rename to extensions/specsupport/_adoc/modules/ext-specsupport/pages/bdd-spec-support/writing-a-bdd-spec.adoc
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/_attributes.adoc b/extensions/specsupport/_adoc/modules/ext-specsupport/partials/_attributes.adoc
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/pages/_attributes.adoc
rename to extensions/specsupport/_adoc/modules/ext-specsupport/partials/_attributes.adoc
diff --git a/extensions/specsupport/_adoc/modules/ext-specsupport/partials/module-nav.adoc b/extensions/specsupport/_adoc/modules/ext-specsupport/partials/module-nav.adoc
new file mode 100644
index 0000000..3948a13
--- /dev/null
+++ b/extensions/specsupport/_adoc/modules/ext-specsupport/partials/module-nav.adoc
@@ -0,0 +1,3 @@
+* xref:testing:ext-specsupport:about.adoc[BDD Spec Support (extension)]
+
+
diff --git a/site.yml b/site.yml
index 9165176..daa691f 100644
--- a/site.yml
+++ b/site.yml
@@ -62,6 +62,10 @@ content:
- url: .
start_path: core/testsupport/integtestsupport/_adoc
branches: HEAD
+ # to be resurrected somehow.
+ #- url: .
+ # start_path: core/testsupport/mvnplugin/_adoc
+ # branches: HEAD
- url: .
branches: HEAD
start_path: extensions/fixtures/_adoc
[isis] 01/04: ISIS-2062: reorgs _partials dir
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f9d2318cdc33f0eb9e3bd4c21fbb0d59f75deefc
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 7 22:33:54 2019 +0100
ISIS-2062: reorgs _partials dir
---
.../archdesign/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../modules/ROOT/partials}/_attributes.adoc | 0
.../mignotes/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../modules/ROOT/partials}/_attributes.adoc | 0
.../refguide/modules/ROOT/_attributes.adoc | 3 +-
.../modules/ROOT/partials/_attributes.adoc | 2 +-
.../relnotes/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../modules/ROOT/partials/_attributes.adoc | 0
.../_adoc => antora/components/testing}/antora.yml | 0
.../components/testing}/examples.csv | 0
.../{toc => testing}/modules/ROOT/_attributes.adoc | 3 +-
.../modules/ROOT/assets/attachments}/.gitkeep | 0
.../testing}/modules/ROOT/assets/images/.gitkeep | 0
.../testing/modules/ROOT/examples}/.gitkeep | 0
.../components/testing}/modules/ROOT/nav.adoc | 0
.../testing}/modules/ROOT/pages/_attributes.adoc | 0
.../testing}/modules/ROOT/pages/about.adoc | 0
.../testing}/modules/ROOT/pages/overview.adoc | 0
.../modules/ROOT/partials/_attributes.adoc | 0
.../testing}/modules/ROOT/partials/nav.adoc | 0
.../components/testing}/sync_examples.sh | 0
.../components/toc/modules/ROOT/_attributes.adoc | 1 -
.../toc/modules/ROOT/partials/_attributes.adoc | 2 +-
.../ROOT/partials/_powered-by_contactapp.adoc | 3 +-
.../toc/modules/comguide/_attributes.adoc | 2 +-
.../comguide/pages/_partials/_attributes.adoc | 4 --
.../modules/comguide}/partials/_attributes.adoc | 0
.../toc/modules/devguide/_attributes.adoc | 2 +-
.../devguide/pages/_partials/_attributes.adoc | 4 --
.../modules/devguide}/partials/_attributes.adoc | 0
.../devguide/{pages/_partials => partials}/x.sh | 0
.../toc/modules/module-template/_attributes.adoc | 2 +-
.../pages/_partials/_attributes.adoc | 4 --
.../module-template}/partials/_attributes.adoc | 0
.../userguide/modules/btb/_attributes.adoc | 2 +-
.../modules/btb/pages/_partials/_attributes.adoc | 4 --
.../modules/btb}/partials/_attributes.adoc | 0
.../userguide/modules/fun/_attributes.adoc | 2 +-
.../modules/fun/pages/_partials/_attributes.adoc | 4 --
.../modules/fun}/partials/_attributes.adoc | 0
core/applib/_adoc/modules/ROOT/_attributes.adoc | 3 +-
.../_adoc/modules/ROOT/partials/_attributes.adoc | 2 +-
core/applib/_adoc/modules/ant/_attributes.adoc | 2 +-
.../_adoc/modules/ant/partials/_attributes.adoc | 2 +-
core/applib/_adoc/modules/cms/_attributes.adoc | 2 +-
.../_adoc/modules/cms/partials/_attributes.adoc | 2 +-
core/applib/_adoc/modules/svc/_attributes.adoc | 2 +-
.../svc/pages/metadata-api/SwaggerService.adoc | 3 +-
core/config/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../_adoc/modules/ROOT/partials/_attributes.adoc | 2 +-
.../jdo/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
core/pom.xml | 2 +-
.../_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
core/schema/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../_adoc/modules/ROOT/partials/_attributes.adoc | 2 +-
.../api/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../bypass/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../shiro/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../_adoc/modules/ROOT/partials/_attributes.adoc | 2 +-
.../_adoc/modules/realm-jdbc/_attributes.adoc | 2 +-
.../modules/realm-jdbc/partials/_attributes.adoc | 2 +-
.../_adoc/modules/realm-ldap/_attributes.adoc | 2 +-
.../modules/realm-ldap/partials/_attributes.adoc | 2 +-
core/security/shiro/pom.xml | 2 +-
.../_adoc/modules/ROOT/_attributes.adoc | 6 ---
.../_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../_adoc/modules/mvn/_attributes.adoc | 2 +-
.../modules/mvn/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/mvn}/partials/_attributes.adoc | 0
.../_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../_adoc/modules/ROOT/nav.adoc | 47 +---------------------
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/pages/hints-and-tips.adoc | 2 -
.../ROOT/pages/simplified-representations.adoc | 6 +++
.../action-invocation.adoc | 4 +-
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
.../_adoc/modules/ROOT/partials/nav.adoc | 26 ++++++++++++
.../_adoc/modules/security/_attributes.adoc | 2 +-
.../_adoc/modules/security/nav.adoc | 4 ++
.../_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
.../_adoc/modules/security/_attributes.adoc | 2 +-
core/viewer-wicket/_adoc/modules/security/nav.adoc | 4 ++
.../apps/demo/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials}/_attributes.adoc | 0
examples/apps/demo/pom.xml | 2 +-
.../helloworld/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
examples/apps/helloworld/pom.xml | 2 +-
.../simpleapp/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
examples/apps/simpleapp/application/pom.xml | 2 +-
.../smoketests/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
examples/smoketests/pom.xml | 2 +-
.../asciidoc/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
.../fixtures/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
.../incubator/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
.../markdown/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../modules/ROOT/pages/_partials/_attributes.adoc | 4 --
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
.../secman/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../secman/_adoc/modules/api/_attributes.adoc | 2 +-
.../modules/encryption-jbcrypt/_attributes.adoc | 2 +-
.../secman/_adoc/modules/model/_attributes.adoc | 2 +-
.../_adoc/modules/persistence-jdo/_attributes.adoc | 2 +-
.../_adoc/modules/realm-shiro/_attributes.adoc | 2 +-
extensions/secman/realm-shiro/pom.xml | 2 +-
.../_adoc/modules/ROOT/_attributes.adoc | 2 +-
extensions/sse/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
.../_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
mavendeps/_adoc/modules/ROOT/_attributes.adoc | 2 +-
.../_adoc/modules/ROOT/partials/_attributes.adoc | 0
mavendeps/webapp/pom.xml | 2 +-
site.yml | 2 +-
136 files changed, 114 insertions(+), 213 deletions(-)
diff --git a/antora/components/archdesign/modules/ROOT/_attributes.adoc b/antora/components/archdesign/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/antora/components/archdesign/modules/ROOT/_attributes.adoc
+++ b/antora/components/archdesign/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/archdesign/modules/ROOT/pages/_partials/_attributes.adoc b/antora/components/archdesign/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/antora/components/archdesign/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/mavendeps/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/antora/components/archdesign/modules/ROOT/partials/_attributes.adoc
similarity index 100%
rename from mavendeps/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
rename to antora/components/archdesign/modules/ROOT/partials/_attributes.adoc
diff --git a/antora/components/mignotes/modules/ROOT/_attributes.adoc b/antora/components/mignotes/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/antora/components/mignotes/modules/ROOT/_attributes.adoc
+++ b/antora/components/mignotes/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/mignotes/modules/ROOT/pages/_partials/_attributes.adoc b/antora/components/mignotes/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/antora/components/mignotes/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/extensions/viewer-wicket-excel/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/antora/components/mignotes/modules/ROOT/partials/_attributes.adoc
similarity index 100%
rename from extensions/viewer-wicket-excel/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
rename to antora/components/mignotes/modules/ROOT/partials/_attributes.adoc
diff --git a/antora/components/refguide/modules/ROOT/_attributes.adoc b/antora/components/refguide/modules/ROOT/_attributes.adoc
index 42f13d9..7d698a2 100644
--- a/antora/components/refguide/modules/ROOT/_attributes.adoc
+++ b/antora/components/refguide/modules/ROOT/_attributes.adoc
@@ -2,6 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
-
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/refguide/modules/ROOT/partials/_attributes.adoc b/antora/components/refguide/modules/ROOT/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/antora/components/refguide/modules/ROOT/partials/_attributes.adoc
+++ b/antora/components/refguide/modules/ROOT/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/antora/components/relnotes/modules/ROOT/_attributes.adoc b/antora/components/relnotes/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/antora/components/relnotes/modules/ROOT/_attributes.adoc
+++ b/antora/components/relnotes/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/relnotes/modules/ROOT/pages/_partials/_attributes.adoc b/antora/components/relnotes/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/antora/components/relnotes/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/antora/components/relnotes/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to antora/components/relnotes/modules/ROOT/partials/_attributes.adoc
diff --git a/core/testsupport/_adoc/antora.yml b/antora/components/testing/antora.yml
similarity index 100%
rename from core/testsupport/_adoc/antora.yml
rename to antora/components/testing/antora.yml
diff --git a/core/testsupport/_adoc/examples.csv b/antora/components/testing/examples.csv
similarity index 100%
rename from core/testsupport/_adoc/examples.csv
rename to antora/components/testing/examples.csv
diff --git a/antora/components/toc/modules/ROOT/_attributes.adoc b/antora/components/testing/modules/ROOT/_attributes.adoc
similarity index 82%
copy from antora/components/toc/modules/ROOT/_attributes.adoc
copy to antora/components/testing/modules/ROOT/_attributes.adoc
index 5183e0b..7d698a2 100644
--- a/antora/components/toc/modules/ROOT/_attributes.adoc
+++ b/antora/components/testing/modules/ROOT/_attributes.adoc
@@ -1,7 +1,6 @@
ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
-:partialsdir: {moduledir}/partials
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/examples/.gitkeep b/antora/components/testing/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from core/testsupport/_adoc/modules/ROOT/examples/.gitkeep
rename to antora/components/testing/modules/ROOT/assets/attachments/.gitkeep
diff --git a/core/testsupport/_adoc/modules/ROOT/assets/images/.gitkeep b/antora/components/testing/modules/ROOT/assets/images/.gitkeep
similarity index 100%
rename from core/testsupport/_adoc/modules/ROOT/assets/images/.gitkeep
rename to antora/components/testing/modules/ROOT/assets/images/.gitkeep
diff --git a/core/testsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep b/antora/components/testing/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from core/testsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to antora/components/testing/modules/ROOT/examples/.gitkeep
diff --git a/core/testsupport/_adoc/modules/ROOT/nav.adoc b/antora/components/testing/modules/ROOT/nav.adoc
similarity index 100%
rename from core/testsupport/_adoc/modules/ROOT/nav.adoc
rename to antora/components/testing/modules/ROOT/nav.adoc
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/_attributes.adoc b/antora/components/testing/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from core/testsupport/_adoc/modules/ROOT/pages/_attributes.adoc
rename to antora/components/testing/modules/ROOT/pages/_attributes.adoc
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/about.adoc b/antora/components/testing/modules/ROOT/pages/about.adoc
similarity index 100%
rename from core/testsupport/_adoc/modules/ROOT/pages/about.adoc
rename to antora/components/testing/modules/ROOT/pages/about.adoc
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/overview.adoc b/antora/components/testing/modules/ROOT/pages/overview.adoc
similarity index 100%
rename from core/testsupport/_adoc/modules/ROOT/pages/overview.adoc
rename to antora/components/testing/modules/ROOT/pages/overview.adoc
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/antora/components/testing/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to antora/components/testing/modules/ROOT/partials/_attributes.adoc
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/nav.adoc b/antora/components/testing/modules/ROOT/partials/nav.adoc
similarity index 100%
rename from core/testsupport/_adoc/modules/ROOT/partials/nav.adoc
rename to antora/components/testing/modules/ROOT/partials/nav.adoc
diff --git a/core/testsupport/_adoc/sync_examples.sh b/antora/components/testing/sync_examples.sh
similarity index 100%
rename from core/testsupport/_adoc/sync_examples.sh
rename to antora/components/testing/sync_examples.sh
diff --git a/antora/components/toc/modules/ROOT/_attributes.adoc b/antora/components/toc/modules/ROOT/_attributes.adoc
index 5183e0b..8249db3 100644
--- a/antora/components/toc/modules/ROOT/_attributes.adoc
+++ b/antora/components/toc/modules/ROOT/_attributes.adoc
@@ -3,5 +3,4 @@ ifndef::env-site,env-github[]
:examplesdir: {moduledir}/examples
:partialsdir: {moduledir}/partials
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
endif::[]
diff --git a/antora/components/toc/modules/ROOT/partials/_attributes.adoc b/antora/components/toc/modules/ROOT/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/antora/components/toc/modules/ROOT/partials/_attributes.adoc
+++ b/antora/components/toc/modules/ROOT/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/antora/components/toc/modules/ROOT/partials/_powered-by_contactapp.adoc b/antora/components/toc/modules/ROOT/partials/_powered-by_contactapp.adoc
index cb16bef..18b6d7f 100644
--- a/antora/components/toc/modules/ROOT/partials/_powered-by_contactapp.adoc
+++ b/antora/components/toc/modules/ROOT/partials/_powered-by_contactapp.adoc
@@ -25,7 +25,8 @@ image:https://github.com/incodehq/contactapp/blob/master/docs/contactapp-fronten
As our first Apache Isis app making use of mobile technologies it opens the doors for more to follow.
Ionic has proven easy to learn and build apps with, and has a helpful community. Meanwhile we've used
Apache Isis' support for xref:ug:fun:programming-model.adoc#jaxb[JAXB view models]
-and in particular the http://isis.apache.org/guides/ugvro/ugvro.html#__ugvro_simplified-representations_apache-isis-profile[simplified REST representations] introduced in v1.12.0. The result is code that is easy to follow and enhance.
+and in particular the xref:vro:ROOT:simplified-representations.adoc[simplified REST representations] introduced in v1.12.0.
+The result is code that is easy to follow and enhance.
We expect that the scope of _Contact App_ will expand and new features added, these will (almost certainly) remain open source.
Meanwhile we're now set up nicely to build further mobile apps using this technology stack.
diff --git a/antora/components/toc/modules/comguide/_attributes.adoc b/antora/components/toc/modules/comguide/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/antora/components/toc/modules/comguide/_attributes.adoc
+++ b/antora/components/toc/modules/comguide/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/toc/modules/comguide/pages/_partials/_attributes.adoc b/antora/components/toc/modules/comguide/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/antora/components/toc/modules/comguide/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/antora/components/toc/modules/comguide/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to antora/components/toc/modules/comguide/partials/_attributes.adoc
diff --git a/antora/components/toc/modules/devguide/_attributes.adoc b/antora/components/toc/modules/devguide/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/antora/components/toc/modules/devguide/_attributes.adoc
+++ b/antora/components/toc/modules/devguide/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/toc/modules/devguide/pages/_partials/_attributes.adoc b/antora/components/toc/modules/devguide/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/antora/components/toc/modules/devguide/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/antora/components/toc/modules/devguide/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to antora/components/toc/modules/devguide/partials/_attributes.adoc
diff --git a/antora/components/toc/modules/devguide/pages/_partials/x.sh b/antora/components/toc/modules/devguide/partials/x.sh
similarity index 100%
rename from antora/components/toc/modules/devguide/pages/_partials/x.sh
rename to antora/components/toc/modules/devguide/partials/x.sh
diff --git a/antora/components/toc/modules/module-template/_attributes.adoc b/antora/components/toc/modules/module-template/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/antora/components/toc/modules/module-template/_attributes.adoc
+++ b/antora/components/toc/modules/module-template/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/toc/modules/module-template/pages/_partials/_attributes.adoc b/antora/components/toc/modules/module-template/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/antora/components/toc/modules/module-template/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/antora/components/toc/modules/module-template/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to antora/components/toc/modules/module-template/partials/_attributes.adoc
diff --git a/antora/components/userguide/modules/btb/_attributes.adoc b/antora/components/userguide/modules/btb/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/antora/components/userguide/modules/btb/_attributes.adoc
+++ b/antora/components/userguide/modules/btb/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/userguide/modules/btb/pages/_partials/_attributes.adoc b/antora/components/userguide/modules/btb/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/antora/components/userguide/modules/btb/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/antora/components/userguide/modules/btb/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to antora/components/userguide/modules/btb/partials/_attributes.adoc
diff --git a/antora/components/userguide/modules/fun/_attributes.adoc b/antora/components/userguide/modules/fun/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/antora/components/userguide/modules/fun/_attributes.adoc
+++ b/antora/components/userguide/modules/fun/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/userguide/modules/fun/pages/_partials/_attributes.adoc b/antora/components/userguide/modules/fun/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/antora/components/userguide/modules/fun/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/antora/components/userguide/modules/fun/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to antora/components/userguide/modules/fun/partials/_attributes.adoc
diff --git a/core/applib/_adoc/modules/ROOT/_attributes.adoc b/core/applib/_adoc/modules/ROOT/_attributes.adoc
index 42f13d9..7d698a2 100644
--- a/core/applib/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/applib/_adoc/modules/ROOT/_attributes.adoc
@@ -2,6 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
-
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/applib/_adoc/modules/ROOT/partials/_attributes.adoc b/core/applib/_adoc/modules/ROOT/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/core/applib/_adoc/modules/ROOT/partials/_attributes.adoc
+++ b/core/applib/_adoc/modules/ROOT/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/core/applib/_adoc/modules/ant/_attributes.adoc b/core/applib/_adoc/modules/ant/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/applib/_adoc/modules/ant/_attributes.adoc
+++ b/core/applib/_adoc/modules/ant/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/applib/_adoc/modules/ant/partials/_attributes.adoc b/core/applib/_adoc/modules/ant/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/core/applib/_adoc/modules/ant/partials/_attributes.adoc
+++ b/core/applib/_adoc/modules/ant/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/core/applib/_adoc/modules/cms/_attributes.adoc b/core/applib/_adoc/modules/cms/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/applib/_adoc/modules/cms/_attributes.adoc
+++ b/core/applib/_adoc/modules/cms/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/applib/_adoc/modules/cms/partials/_attributes.adoc b/core/applib/_adoc/modules/cms/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/core/applib/_adoc/modules/cms/partials/_attributes.adoc
+++ b/core/applib/_adoc/modules/cms/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/core/applib/_adoc/modules/svc/_attributes.adoc b/core/applib/_adoc/modules/svc/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/applib/_adoc/modules/svc/_attributes.adoc
+++ b/core/applib/_adoc/modules/svc/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/applib/_adoc/modules/svc/pages/metadata-api/SwaggerService.adoc b/core/applib/_adoc/modules/svc/pages/metadata-api/SwaggerService.adoc
index 17a3738..fe414ef 100644
--- a/core/applib/_adoc/modules/svc/pages/metadata-api/SwaggerService.adoc
+++ b/core/applib/_adoc/modules/svc/pages/metadata-api/SwaggerService.adoc
@@ -12,7 +12,8 @@ These spec files can then be used with the link:http://swagger.io/swagger-ui/[Sw
[NOTE]
====
-Not all of the REST API exposed by the xref:vro:ROOT:about.adoc[Restful Objects viewer] is included in the Swagger schema definition files; the emphasis is those REST resources that are used to develop custom apps: domain objects, domain object collections and action invocations. When combined with Apache Isis' own xref:vro:ROOT:simplified-representations.adoc[simplified representations], these are pretty much all that is needed for this use case.
+Not all of the REST API exposed by the xref:vro:ROOT:about.adoc[Restful Objects viewer] is included in the Swagger schema definition files; the emphasis is those REST resources that are used to develop custom apps: domain objects, domain object collections and action invocations.
+When combined with Apache Isis' own xref:vro:ROOT:simplified-representations.adoc[simplified representations], these are pretty much all that is needed for this use case.
====
diff --git a/core/config/_adoc/modules/ROOT/_attributes.adoc b/core/config/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/config/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/config/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/config/_adoc/modules/ROOT/partials/_attributes.adoc b/core/config/_adoc/modules/ROOT/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/core/config/_adoc/modules/ROOT/partials/_attributes.adoc
+++ b/core/config/_adoc/modules/ROOT/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc b/core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/plugins/jdo/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/core/plugins/jdo/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/core/plugins/jdo/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/core/plugins/jdo/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to core/plugins/jdo/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/core/pom.xml b/core/pom.xml
index 6cc920d..5cb3ef2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1397,7 +1397,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-plugins-security-shiro</artifactId>
+ <artifactId>isis-security-shiro</artifactId>
<version>${isis.version}</version>
</dependency>
diff --git a/core/runtime-services/_adoc/modules/ROOT/_attributes.adoc b/core/runtime-services/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/runtime-services/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/runtime-services/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/runtime-services/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/core/runtime-services/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/core/runtime-services/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/core/runtime-services/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to core/runtime-services/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/core/schema/_adoc/modules/ROOT/_attributes.adoc b/core/schema/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/schema/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/schema/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/schema/_adoc/modules/ROOT/partials/_attributes.adoc b/core/schema/_adoc/modules/ROOT/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/core/schema/_adoc/modules/ROOT/partials/_attributes.adoc
+++ b/core/schema/_adoc/modules/ROOT/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/core/security/api/_adoc/modules/ROOT/_attributes.adoc b/core/security/api/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/security/api/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/security/api/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/security/bypass/_adoc/modules/ROOT/_attributes.adoc b/core/security/bypass/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/security/bypass/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/security/bypass/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/security/shiro/_adoc/modules/ROOT/_attributes.adoc b/core/security/shiro/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/security/shiro/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/security/shiro/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/security/shiro/_adoc/modules/ROOT/partials/_attributes.adoc b/core/security/shiro/_adoc/modules/ROOT/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/core/security/shiro/_adoc/modules/ROOT/partials/_attributes.adoc
+++ b/core/security/shiro/_adoc/modules/ROOT/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/core/security/shiro/_adoc/modules/realm-jdbc/_attributes.adoc b/core/security/shiro/_adoc/modules/realm-jdbc/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/security/shiro/_adoc/modules/realm-jdbc/_attributes.adoc
+++ b/core/security/shiro/_adoc/modules/realm-jdbc/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/security/shiro/_adoc/modules/realm-jdbc/partials/_attributes.adoc b/core/security/shiro/_adoc/modules/realm-jdbc/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/core/security/shiro/_adoc/modules/realm-jdbc/partials/_attributes.adoc
+++ b/core/security/shiro/_adoc/modules/realm-jdbc/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/_attributes.adoc b/core/security/shiro/_adoc/modules/realm-ldap/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/security/shiro/_adoc/modules/realm-ldap/_attributes.adoc
+++ b/core/security/shiro/_adoc/modules/realm-ldap/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/partials/_attributes.adoc b/core/security/shiro/_adoc/modules/realm-ldap/partials/_attributes.adoc
index d011536..e8ada7c 100644
--- a/core/security/shiro/_adoc/modules/realm-ldap/partials/_attributes.adoc
+++ b/core/security/shiro/_adoc/modules/realm-ldap/partials/_attributes.adoc
@@ -1,4 +1,4 @@
ifndef::env-site,env-github[]
-:moduledir: ../..
+:moduledir: ..
include::{moduledir}/_attributes.adoc[]
endif::[]
diff --git a/core/security/shiro/pom.xml b/core/security/shiro/pom.xml
index f939626..580c0cc 100644
--- a/core/security/shiro/pom.xml
+++ b/core/security/shiro/pom.xml
@@ -27,7 +27,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-plugins-security-shiro</artifactId>
+ <artifactId>isis-security-shiro</artifactId>
<name>Apache Isis Plugin for Security (Shiro)</name>
<description>
diff --git a/core/testsupport/_adoc/modules/ROOT/_attributes.adoc b/core/testsupport/_adoc/modules/ROOT/_attributes.adoc
deleted file mode 100644
index 787e5c4..0000000
--- a/core/testsupport/_adoc/modules/ROOT/_attributes.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
-:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
-endif::[]
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc b/core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc b/core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc
+++ b/core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/pages/_partials/_attributes.adoc b/core/testsupport/integtestsupport/_adoc/modules/mvn/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/core/testsupport/integtestsupport/_adoc/modules/mvn/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/core/testsupport/integtestsupport/_adoc/modules/mvn/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to core/testsupport/integtestsupport/_adoc/modules/mvn/partials/_attributes.adoc
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc b/core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/_attributes.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/nav.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/nav.adoc
index 876bc34..3ff6c00 100644
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/nav.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/nav.adoc
@@ -1,46 +1 @@
-* xref:about.adoc[Restful Objects Viewer]
-
-
-
-** xref:ro-spec.adoc[RO Spec]
-
-
-
-** xref:architecture.adoc[Architecture]
-
-
-
-** xref:layout-resources.adoc[Layout Resources]
-
-
-
-** xref:health-check.adoc[Health Check]
-
-
-
-** xref:simplified-representations.adoc[Simplified Representations]
-*** xref:simplified-representations/apache-isis-profile.adoc[Apache Isis Profile]
-*** xref:simplified-representations/domain-object.adoc[Domain Object]
-*** xref:simplified-representations/object-collection.adoc[Object Collection]
-*** xref:simplified-representations/action-invocation.adoc[Action Invocation]
-*** xref:simplified-representations/other-representations.adoc[Other Representations]
-*** xref:simplified-representations/configuration-properties.adoc[Configuration Properties]
-
-
-
-** xref:configuration-properties.adoc[Configuration Properties]
-
-
-
-** xref:hints-and-tips.adoc[Hints-n-Tips]
-
-*** xref:hints-and-tips/using-chrome-devtools.adoc[Using Chrome DevTools]
-*** xref:hints-and-tips/angular-tips.adoc[Angular Tips]
-*** xref:hints-and-tips/pretty-printing.adoc[Pretty Printing]
-*** xref:hints-and-tips/restful-image-property.adoc[Restful Image Property]
-*** xref:hints-and-tips/view-model-as-parameter.adoc[View Model as Parameter]
-*** xref:hints-and-tips/troubleshooting.adoc[Troubleshooting]
-
-//https://lists.apache.org/thread.html/cbd18320bbf6e5c5e767283f9e675cf56e7f4692c109e1e79dbaa90a@%3Cusers.isis.apache.org%3E // FIXME: to add
-
-
+include::vro:ROOT:partial$nav.adoc[]
\ No newline at end of file
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc
index 3309e69..764b8f8 100644
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/hints-and-tips.adoc
@@ -6,8 +6,6 @@ include::_attributes.adoc[]
This chapter provides some solutions for problems we've encountered ourselves or have been raised on the Apache Isis mailing lists.
-
-
Since the Restful Objects viewer is designed for computer programs to interact with (rather than human beings), it can be a little difficult to explore and generally "grok" how it works.
This section provides a few hints-and-tips to help you on your way.
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc
index a3fdb27..5795e48 100644
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc
@@ -18,3 +18,9 @@ xref:vro:ROOT:architecture.adoc[architecture] chapter.
+include::vro:ROOT:simplified-representations/apache-isis-profile.adoc[leveloffset=+1]
+include::vro:ROOT:simplified-representations/domain-object.adoc[leveloffset=+1]
+include::vro:ROOT:simplified-representations/object-collection.adoc[leveloffset=+1]
+include::vro:ROOT:simplified-representations/action-invocation.adoc[leveloffset=+1]
+include::vro:ROOT:simplified-representations/other-representations.adoc[leveloffset=+1]
+include::vro:ROOT:simplified-representations/configuration-properties.adoc[leveloffset=+1]
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/action-invocation.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
index 8f5b1e6..4f71214 100644
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
@@ -8,7 +8,7 @@ When an action is invoked, it can return a domain object, a list, a scalar, or r
== Returning an Object
-If the action returned an object, then the xref:vro:ROOT:simplified-representations/domain-object.adoc[domain object representation] is returned.
+If the action returned an object, then the xref:vro:ROOT:simplified-representations.adoc#domain-object[domain object representation] is returned.
For example, using the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp], accessing
this resource:
@@ -58,7 +58,7 @@ Content-Type: application/json;profile="urn:org.apache.isis/v1";repr-type="objec
== Returning a List
On the other hand if the action returned a list (a "standalone" collection, then an array representation is returned.
-This is very similar to that returned by a xref:vro:ROOT:simplified-representations/object-collection.adoc[(parented) object collection], though with a slightly different `Content-Type` to distinguish.
+This is very similar to that returned by a xref:vro:ROOT:simplified-representations.adoc#object-collection[(parented) object collection], though with a slightly different `Content-Type` to distinguish.
For example, using the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp], accessing
this resource:
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to core/viewer-restfulobjects/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/partials/nav.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/partials/nav.adoc
new file mode 100644
index 0000000..22baf86
--- /dev/null
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/partials/nav.adoc
@@ -0,0 +1,26 @@
+* xref:vro:ROOT:about.adoc[Restful Objects Viewer]
+
+** xref:vro:ROOT:ro-spec.adoc[RO Spec]
+
+** xref:vro:ROOT:architecture.adoc[Architecture]
+
+** xref:vro:ROOT:layout-resources.adoc[Layout Resources]
+
+** xref:vro:ROOT:health-check.adoc[Health Check]
+
+** xref:vro:ROOT:simplified-representations.adoc[Simplified Representations]
+
+** xref:vro:ROOT:configuration-properties.adoc[Configuration Properties]
+
+** xref:vro:ROOT:hints-and-tips.adoc[Hints-n-Tips]
+
+*** xref:vro:ROOT:hints-and-tips/using-chrome-devtools.adoc[Using Chrome DevTools]
+*** xref:vro:ROOT:hints-and-tips/angular-tips.adoc[Angular Tips]
+*** xref:vro:ROOT:hints-and-tips/pretty-printing.adoc[Pretty Printing]
+*** xref:vro:ROOT:hints-and-tips/restful-image-property.adoc[Restful Image Property]
+*** xref:vro:ROOT:hints-and-tips/view-model-as-parameter.adoc[View Model as Parameter]
+*** xref:vro:ROOT:hints-and-tips/troubleshooting.adoc[Troubleshooting]
+
+//https://lists.apache.org/thread.html/cbd18320bbf6e5c5e767283f9e675cf56e7f4692c109e1e79dbaa90a@%3Cusers.isis.apache.org%3E // FIXME: to add
+
+
diff --git a/core/viewer-restfulobjects/_adoc/modules/security/_attributes.adoc b/core/viewer-restfulobjects/_adoc/modules/security/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/viewer-restfulobjects/_adoc/modules/security/_attributes.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/security/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/viewer-restfulobjects/_adoc/modules/security/nav.adoc b/core/viewer-restfulobjects/_adoc/modules/security/nav.adoc
index 1fa1d28..b592857 100644
--- a/core/viewer-restfulobjects/_adoc/modules/security/nav.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/security/nav.adoc
@@ -1 +1,5 @@
+//
+// These pages are include:d in both the RO viewer guide and also in the security guide
+//
+
* xref:about.adoc[Security]
\ No newline at end of file
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/core/viewer-wicket/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to core/viewer-wicket/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/core/viewer-wicket/_adoc/modules/security/_attributes.adoc b/core/viewer-wicket/_adoc/modules/security/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/core/viewer-wicket/_adoc/modules/security/_attributes.adoc
+++ b/core/viewer-wicket/_adoc/modules/security/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/viewer-wicket/_adoc/modules/security/nav.adoc b/core/viewer-wicket/_adoc/modules/security/nav.adoc
index 1fa1d28..b592857 100644
--- a/core/viewer-wicket/_adoc/modules/security/nav.adoc
+++ b/core/viewer-wicket/_adoc/modules/security/nav.adoc
@@ -1 +1,5 @@
+//
+// These pages are include:d in both the RO viewer guide and also in the security guide
+//
+
* xref:about.adoc[Security]
\ No newline at end of file
diff --git a/examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc b/examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc
+++ b/examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/examples/apps/demo/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/examples/apps/demo/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/examples/apps/demo/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/extensions/sse/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/examples/apps/demo/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
rename from extensions/sse/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
rename to examples/apps/demo/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/examples/apps/demo/pom.xml b/examples/apps/demo/pom.xml
index 5f9589d..1b117b3 100644
--- a/examples/apps/demo/pom.xml
+++ b/examples/apps/demo/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-plugins-security-shiro</artifactId>
+ <artifactId>isis-security-shiro</artifactId>
</dependency>
<dependency>
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/_attributes.adoc b/examples/apps/helloworld/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/examples/apps/helloworld/_adoc/modules/ROOT/_attributes.adoc
+++ b/examples/apps/helloworld/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/examples/apps/helloworld/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/examples/apps/helloworld/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/examples/apps/helloworld/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to examples/apps/helloworld/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/examples/apps/helloworld/pom.xml b/examples/apps/helloworld/pom.xml
index 3be5d3a..be6d9e6 100644
--- a/examples/apps/helloworld/pom.xml
+++ b/examples/apps/helloworld/pom.xml
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-plugins-security-shiro</artifactId>
+ <artifactId>isis-security-shiro</artifactId>
</dependency>
<!-- OTHER DEPENDENCIES -->
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/_attributes.adoc b/examples/apps/simpleapp/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/examples/apps/simpleapp/_adoc/modules/ROOT/_attributes.adoc
+++ b/examples/apps/simpleapp/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/examples/apps/simpleapp/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/examples/apps/simpleapp/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/examples/apps/simpleapp/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to examples/apps/simpleapp/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/examples/apps/simpleapp/application/pom.xml b/examples/apps/simpleapp/application/pom.xml
index 38bd321..8946688 100644
--- a/examples/apps/simpleapp/application/pom.xml
+++ b/examples/apps/simpleapp/application/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-plugins-security-shiro</artifactId>
+ <artifactId>isis-security-shiro</artifactId>
</dependency>
<!-- PERSISTENCE -->
diff --git a/examples/smoketests/_adoc/modules/ROOT/_attributes.adoc b/examples/smoketests/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/examples/smoketests/_adoc/modules/ROOT/_attributes.adoc
+++ b/examples/smoketests/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/examples/smoketests/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/examples/smoketests/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/examples/smoketests/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/examples/smoketests/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to examples/smoketests/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/examples/smoketests/pom.xml b/examples/smoketests/pom.xml
index 56ced4d..9b5eee8 100644
--- a/examples/smoketests/pom.xml
+++ b/examples/smoketests/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-plugins-security-shiro</artifactId>
+ <artifactId>isis-security-shiro</artifactId>
</dependency>
<dependency>
diff --git a/extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc b/extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/asciidoc/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/extensions/asciidoc/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/extensions/asciidoc/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/extensions/asciidoc/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to extensions/asciidoc/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc b/extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/fixtures/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/extensions/fixtures/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/extensions/fixtures/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/extensions/fixtures/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to extensions/fixtures/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc b/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/incubator/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/extensions/incubator/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/extensions/incubator/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/extensions/incubator/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to extensions/incubator/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/extensions/markdown/_adoc/modules/ROOT/_attributes.adoc b/extensions/markdown/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/markdown/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/markdown/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/markdown/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/extensions/markdown/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
deleted file mode 100644
index d011536..0000000
--- a/extensions/markdown/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifndef::env-site,env-github[]
-:moduledir: ../..
-include::{moduledir}/_attributes.adoc[]
-endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/extensions/markdown/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to extensions/markdown/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/extensions/secman/_adoc/modules/ROOT/_attributes.adoc b/extensions/secman/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/secman/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/api/_attributes.adoc b/extensions/secman/_adoc/modules/api/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/secman/_adoc/modules/api/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/api/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/encryption-jbcrypt/_attributes.adoc b/extensions/secman/_adoc/modules/encryption-jbcrypt/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/secman/_adoc/modules/encryption-jbcrypt/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/encryption-jbcrypt/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/model/_attributes.adoc b/extensions/secman/_adoc/modules/model/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/secman/_adoc/modules/model/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/model/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/persistence-jdo/_attributes.adoc b/extensions/secman/_adoc/modules/persistence-jdo/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/secman/_adoc/modules/persistence-jdo/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/persistence-jdo/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/realm-shiro/_attributes.adoc b/extensions/secman/_adoc/modules/realm-shiro/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/secman/_adoc/modules/realm-shiro/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/realm-shiro/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/realm-shiro/pom.xml b/extensions/secman/realm-shiro/pom.xml
index c486330..220ebda 100644
--- a/extensions/secman/realm-shiro/pom.xml
+++ b/extensions/secman/realm-shiro/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-plugins-security-shiro</artifactId>
+ <artifactId>isis-security-shiro</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc b/extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/sse/_adoc/modules/ROOT/_attributes.adoc b/extensions/sse/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/sse/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/sse/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/extensions/sse/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to extensions/sse/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/extensions/viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/extensions/viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
copy from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
copy to extensions/viewer-wicket-excel/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/mavendeps/_adoc/modules/ROOT/_attributes.adoc b/mavendeps/_adoc/modules/ROOT/_attributes.adoc
index 787e5c4..7d698a2 100644
--- a/mavendeps/_adoc/modules/ROOT/_attributes.adoc
+++ b/mavendeps/_adoc/modules/ROOT/_attributes.adoc
@@ -2,5 +2,5 @@ ifndef::env-site,env-github[]
:attachmentsdir: {moduledir}/assets/attachments
:examplesdir: {moduledir}/examples
:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc b/mavendeps/_adoc/modules/ROOT/partials/_attributes.adoc
similarity index 100%
rename from core/testsupport/_adoc/modules/ROOT/partials/_attributes.adoc
rename to mavendeps/_adoc/modules/ROOT/partials/_attributes.adoc
diff --git a/mavendeps/webapp/pom.xml b/mavendeps/webapp/pom.xml
index ba46be1..4e3049e 100644
--- a/mavendeps/webapp/pom.xml
+++ b/mavendeps/webapp/pom.xml
@@ -93,7 +93,7 @@
<!-- FIXME[ISIS-1976] plugins are optional -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-plugins-security-shiro</artifactId>
+ <artifactId>isis-security-shiro</artifactId>
</dependency>
</dependencies>
diff --git a/site.yml b/site.yml
index 0184fa5..9165176 100644
--- a/site.yml
+++ b/site.yml
@@ -54,7 +54,7 @@ content:
branches: HEAD
- url: .
- start_path: core/testsupport/_adoc
+ start_path: antora/components/testing
branches: HEAD
- url: .
start_path: core/testsupport/unittestsupport/_adoc
[isis] 02/04: ISIS-2062: uses simplified antora 2.x directory
structure (remove 'assets' dir)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c5b44e4648c0429de89c105f96710011cd1954e5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 8 07:06:12 2019 +0100
ISIS-2062: uses simplified antora 2.x directory structure (remove 'assets' dir)
---
antora/components/archdesign/modules/ROOT/_attributes.adoc | 4 ++--
.../archdesign/modules/ROOT/attachments}/.gitkeep | 0
.../components/archdesign/modules/ROOT/images}/.gitkeep | 0
antora/components/mignotes/modules/ROOT/_attributes.adoc | 4 ++--
.../components/mignotes/modules/ROOT/attachments}/.gitkeep | 0
.../components/mignotes/modules/ROOT/images}/.gitkeep | 0
antora/components/refguide/modules/ROOT/_attributes.adoc | 4 ++--
antora/components/relnotes/modules/ROOT/_attributes.adoc | 4 ++--
.../components/relnotes/modules/ROOT/attachments}/.gitkeep | 0
.../components/relnotes/modules/ROOT/images}/.gitkeep | 0
antora/components/testing/modules/ROOT/_attributes.adoc | 4 ++--
.../components/testing/modules/ROOT/attachments}/.gitkeep | 0
.../components/testing/modules/ROOT/images}/.gitkeep | 0
antora/components/toc/modules/ROOT/_attributes.adoc | 4 ++--
.../components/toc/modules/ROOT/attachments}/.gitkeep | 0
.../ROOT/{assets => }/images/going-deeper/books/dhnako.jpg | Bin
.../images/going-deeper/books/nakedobjects-book.jpg | Bin
.../modules/ROOT/{assets => }/images/more-thanks/ecp.png | Bin
.../ROOT/{assets => }/images/more-thanks/ecp_logo_white.png | Bin
.../{assets => }/images/more-thanks/ej-technologies.png | Bin
.../ROOT/{assets => }/images/more-thanks/icons8-logo.png | Bin
.../ROOT/{assets => }/images/more-thanks/s101_170.png | Bin
.../toc/modules/ROOT/{assets => }/images/tv_show-25.png | Bin
.../what-is-apache-isis/isis-in-pictures/010-login.png | Bin
.../isis-in-pictures/020-install-fixtures.png | Bin
.../isis-in-pictures/030-dashboard-view-model.png | Bin
.../isis-in-pictures/040-domain-entity.png | Bin
.../isis-in-pictures/050-edit-property.png | Bin
.../isis-in-pictures/060-invoke-action.png | Bin
.../isis-in-pictures/065-contributions.png | Bin
.../isis-in-pictures/067-contributed-action.png | Bin
.../isis-in-pictures/070-pluggable-views.png | Bin
.../what-is-apache-isis/isis-in-pictures/080-gmap3-view.png | Bin
.../isis-in-pictures/090-fullcalendar2-view.png | Bin
.../isis-in-pictures/100-excel-view-and-docx.png | Bin
.../what-is-apache-isis/isis-in-pictures/110-docx.png | Bin
.../what-is-apache-isis/isis-in-pictures/120-auditing.png | Bin
.../what-is-apache-isis/isis-in-pictures/130-security.png | Bin
.../what-is-apache-isis/isis-in-pictures/140-i18n.png | Bin
.../isis-in-pictures/150-appsettings.png | Bin
.../isis-in-pictures/160-switch-tenancy.png | Bin
.../images/what-is-apache-isis/isis-in-pictures/170-me.png | Bin
.../isis-in-pictures/180-app-user-entity.png | Bin
.../isis-in-pictures/190-switch-theme.png | Bin
.../what-is-apache-isis/isis-in-pictures/200-rest-api.png | Bin
.../what-is-apache-isis/isis-in-pictures/205-swagger-ui.png | Bin
.../isis-in-pictures/210-fixture-scripts.png | Bin
.../isis-in-pictures/220-testing-happy-case.png | Bin
.../isis-in-pictures/230-testing-wrapper-factory.png | Bin
.../isis-in-pictures/240-domain-events.png | Bin
.../isis-in-pictures/250-domain-event-subscriber.png | Bin
.../isis-in-pictures/260-domain-event-test.png | Bin
.../what-is-apache-isis/powered-by/commapp/screenshot-1.png | Bin
.../what-is-apache-isis/powered-by/commapp/screenshot-2.png | Bin
.../what-is-apache-isis/powered-by/cqnz/cqnz-advert.png | Bin
.../powered-by/estatio/est-home-page.png | Bin
.../what-is-apache-isis/powered-by/estatio/est-invoice.png | Bin
.../powered-by/estatio/est-payment-batch-manager.png | Bin
.../what-is-apache-isis/powered-by/estatio/estatio-1.png | Bin
.../powered-by/gesconsultor-grc/fig-1-custom-viewer.png | Bin
.../gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png | Bin
.../fig-3-custom-ui-analyzing-risk-scenarios.png | Bin
.../powered-by/gesconsultor-grc/fig-4-managing-projects.png | Bin
.../powered-by/transportplanner/TransportDemand.png | Bin
antora/components/toc/modules/comguide/_attributes.adoc | 4 ++--
.../components/toc/modules/comguide}/attachments/.gitkeep | 0
.../{assets => }/images/committers/github-pr-history.png | Bin
.../{assets => }/images/docker/020-docker-nat-public.png | Bin
.../images/docker/022-local-security-policy.png | Bin
.../images/docker/024-unidentified-are-private.png | Bin
.../{assets => }/images/docker/026-docker-nat-private.png | Bin
.../comguide/{assets => }/images/docker/docker-daemon.png | Bin
.../images/release-process/jira-create-release-notes.png | Bin
.../{assets => }/images/release-process/nexus-release-1.png | Bin
.../{assets => }/images/release-process/nexus-staging-0.png | Bin
.../{assets => }/images/release-process/nexus-staging-1.png | Bin
.../{assets => }/images/release-process/nexus-staging-2.png | Bin
.../images/release-process/nexus-staging-2a.png | Bin
.../{assets => }/images/release-process/nexus-staging-3.png | Bin
.../{assets => }/images/release-process/nexus-staging-4.png | Bin
antora/components/toc/modules/devguide/_attributes.adoc | 4 ++--
.../attachments/asciidoc-syntax-quick-reference.pdf | Bin
.../{assets => }/attachments/asciidoc-writers-guide.pdf | Bin
.../attachments/eclipse/Apache-Isis-code-style-cleanup.xml | 0
.../attachments/eclipse/Apache-code-style-formatting.xml | 0
.../attachments/eclipse/Apache-code-style-template.xml | 0
.../{assets => }/attachments/eclipse/isis-templates.xml | 0
.../{assets => }/attachments/eclipse/isis.importorder | 0
.../{assets => }/attachments/eclipse/jmock2-templates.xml | 0
.../{assets => }/attachments/eclipse/junit4-templates.xml | 0
.../devguide/{assets => }/attachments/intellij/.gitignore | 0
.../attachments/intellij/isis-settings-file-templates.jar | Bin
.../{assets => }/attachments/intellij/other/.gitignore | 0
.../attachments/intellij/other/dan-settings-keymaps.jar | Bin
.../{assets => }/attachments/resources/IsisCheatSheet.docx | Bin
.../{assets => }/attachments/resources/IsisCheatSheet.pdf | Bin
.../devguide/{assets => }/images/asciidoctor/ditaa-demo.png | Bin
.../{assets => }/images/asciidoctor/graphviz-demo.png | Bin
.../{assets => }/images/asciidoctor/plantuml-demo.png | Bin
.../images/building-apache-isis/setting-up-git.png | Bin
.../{assets => }/images/contributing/git-workflow.png | Bin
.../{assets => }/images/contributing/git-workflow.pptx | Bin
.../{assets => }/images/contributing/github-cloning.png | Bin
.../{assets => }/images/contributing/github-forking.png | Bin
.../images/eclipse/2017-oxygen/010-lombok-locate-jar.png | Bin
.../eclipse/2017-oxygen/020-lombok-install-into-eclipse.png | Bin
.../2017-oxygen/030-datanucleus-install-new-software.png | Bin
.../2017-oxygen/040-datanucleus-specify-repository.png | Bin
.../eclipse/2017-oxygen/050-datanucleus-select-plugin.png | Bin
.../eclipse/2017-oxygen/060-enable-annotation-processor.png | Bin
.../images/eclipse/eclipse-010-windows-preferences.png | Bin
.../images/eclipse/eclipse-025-project-properties.png | Bin
.../images/eclipse/eclipse-100-project-support.png | Bin
.../images/eclipse/eclipse-110-project-support.png | Bin
.../{assets => }/images/eclipse/eclipse-120-console.png | Bin
.../eclipse/eclipse-200-enhancer-fails-duplicates.png | Bin
.../eclipse/eclipse-210-enhancer-fails-duplicates.png | Bin
.../eclipse/eclipse-220-enhancer-fails-duplicates.png | Bin
.../intellij-idea/010-installing/010-welcome-page.png | Bin
.../intellij-idea/010-installing/020-choose-location.png | Bin
.../010-installing/030-installation-options.png | Bin
.../intellij-idea/010-installing/040-start-menu-folder.png | Bin
.../images/intellij-idea/010-installing/050-completing.png | Bin
.../010-installing/060-import-settings-or-not.png | Bin
.../intellij-idea/010-installing/070-set-ui-theme.png | Bin
.../020-create-new-project/010-new-project-create.png | Bin
.../020-create-new-project/020-java-project-setup-jdk.png | Bin
.../020-create-new-project/030-java-project-select-jdk.png | Bin
.../020-create-new-project/040-sdk-selected.png | Bin
.../020-create-new-project/050-name-and-location.png | Bin
.../intellij-idea/020-create-new-project/060-create-dir.png | Bin
.../030-import-settings/010-settings-import-jar.png | Bin
.../intellij-idea/030-import-settings/020-select-all.png | Bin
.../intellij-idea/030-import-settings/030-restart.png | Bin
.../030-import-settings/040-file-templates.png | Bin
.../030-import-settings/050-live-templates.png | Bin
.../040-other-settings-compiler/010-build-automatically.png | Bin
.../020-annotation-processor.png | Bin
.../042-other-settings-maven/010-maven-installation.png | Bin
.../042-other-settings-maven/020-maven-configuration.png | Bin
.../044-other-settings-misc/010-auto-import.png | Bin
.../intellij-idea/050-some-plugins/010-some-plugins.png | Bin
.../050-some-plugins/020-some-plugins-confirmation.png | Bin
.../050-some-plugins/maven-helper/010-dependency-tab.png | Bin
.../maven-helper/020-dependency-as-tree.png | Bin
.../050-some-plugins/maven-helper/030-maven-run-goal.png | Bin
.../050-some-plugins/maven-helper/040-maven-quick-run.png | Bin
.../060-troubleshooting/010-duplicate-classes.png | Bin
.../intellij-idea/070-advanced/002-compiler-exclude.png | Bin
.../images/intellij-idea/070-advanced/004-gradle-output.png | Bin
.../images/intellij-idea/070-advanced/005-gradle-output.png | Bin
.../images/intellij-idea/070-advanced/006-livereload-js.png | Bin
.../010-dcevm-list-of-found-jdk-installations.png | Bin
.../intellij-idea/070-advanced/020-dcevm-once-installed.png | Bin
.../070-advanced/030-dcevm-intellij-project-structure.png | Bin
.../070-advanced/040-dcevm-run-configuration.png | Bin
.../100-maven-module-mgmt/010-maven-modules-view.png | Bin
.../100-maven-module-mgmt/020-adding-another-module.png | Bin
.../100-maven-module-mgmt/030-other-module-added.png | Bin
.../100-maven-module-mgmt/040-ignoring-modules.png | Bin
.../100-maven-module-mgmt/050-ignoring-modules-2.png | Bin
.../100-maven-module-mgmt/060-ignored-modules.png | Bin
.../110-running-the-app/010-run-configuration.png | Bin
.../110-running-the-app/020-datanucleus-enhancer-goal.png | Bin
.../110-running-the-app/030-running-unit-tests.png | Bin
.../040-running-unit-tests-run-configuration.png | Bin
.../050-running-integration-tests-run-configuration.png | Bin
.../200-project-sdk/010-file-project-structure.png | Bin
.../images/intellij-idea/200-project-sdk/020-select-jdk.png | Bin
.../200-project-sdk/030-select-jdk-directory.png | Bin
.../intellij-idea/200-project-sdk/040-set-project-level.png | Bin
.../200-project-sdk/050-isis-language-level-7.png | Bin
.../200-project-sdk/060-app-language-level-8.png | Bin
.../intellij-idea/250-new-project/010-new-project.png | Bin
.../intellij-idea/250-new-project/020-new-project-name.png | Bin
.../250-new-project/030-new-project-new-window.png | Bin
.../040-new-module-from-existing-sources.png | Bin
.../250-new-project/050-specify-source-folder.png | Bin
.../250-new-project/060-import-using-maven.png | Bin
.../250-new-project/070-import-module-settings.png | Bin
.../intellij-idea/250-new-project/080-maven-profiles.png | Bin
.../intellij-idea/250-new-project/090-maven-coordinates.png | Bin
.../250-new-project/100-annotation-processing.png | Bin
.../images/intellij-idea/250-new-project/110-parameter8.png | Bin
.../250-new-project/120-clean-generate-sources.png | Bin
.../300-paraname8-support/010-configuring-the-compiler.png | Bin
.../run-debug-configuration-single-module.png | Bin
.../toc/modules/devguide}/images/layouts/estatio-Lease.png | Bin
.../{assets => }/images/resources/IsisCheatSheet.png | Bin
.../components/toc/modules/module-template/_attributes.adoc | 4 ++--
.../toc/modules/module-template/attachments}/.gitkeep | 0
.../components/toc/modules/module-template/images}/.gitkeep | 0
antora/components/userguide/modules/ROOT/_attributes.adoc | 6 +++---
antora/components/userguide/modules/btb/_attributes.adoc | 4 ++--
.../components/userguide/modules/btb/attachments}/.gitkeep | 0
.../images/headless-access/BackgroundCommandExecution.png | Bin
...roundCommandExecutionFromBackgroundCommandServiceJdo.png | Bin
.../images/hints-and-tips/action-semantics-are-you-sure.png | Bin
.../images/hints-and-tips/are-you-sure-happy-case.png | Bin
.../images/hints-and-tips/are-you-sure-sad-case.png | Bin
.../btb/{assets => }/images/hints-and-tips/are-you-sure.png | Bin
.../{assets => }/images/hints-and-tips/view-model-fail.png | Bin
.../images/hints-and-tips/view-model-success.png | Bin
.../modules/btb/{assets => }/images/runtime/web-xml/key.png | Bin
.../btb/{assets => }/images/runtime/web-xml/parts.pptx | Bin
.../btb/{assets => }/images/runtime/web-xml/ro-only.png | Bin
.../{assets => }/images/runtime/web-xml/wicket-and-ro.png | Bin
.../btb/{assets => }/images/runtime/web-xml/wicket-only.png | Bin
antora/components/userguide/modules/fun/_attributes.adoc | 4 ++--
.../core-concepts/Pawson-Naked-Objects-thesis.pdf | Bin
.../images/core-concepts/philosophy/build-vs-buy.png | Bin
.../images/core-concepts/philosophy/build-vs-buy.pptx | Bin
.../core-concepts/philosophy/decoupled-applications.png | Bin
.../core-concepts/philosophy/decoupled-applications.pptx | Bin
.../philosophy/hexagonal-architecture-addons.png | Bin
.../core-concepts/philosophy/hexagonal-architecture.png | Bin
.../core-concepts/philosophy/hexagonal-architecture.pptx | Bin
.../images/programming-model/todoapp-Dashboard.png | Bin
core/applib/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
core/applib/_adoc/modules/ant/_attributes.adoc | 4 ++--
.../applib/_adoc/modules/ant}/attachments/.gitkeep | 0
.../applib/_adoc/modules/ant}/images/.gitkeep | 0
.../reference-annotations/ActionLayout}/bookmarking.png | Bin
.../reference-annotations/ActionLayout/position-BELOW.png | Bin
.../reference-annotations/ActionLayout/position-PANEL.png | Bin
.../ActionLayout/position-PANEL_DROPDOWN.png | Bin
.../reference-annotations/ActionLayout/position-RIGHT.png | Bin
.../CollectionLayout/sortedby-dependencies.png | Bin
.../DomainObjectLayout/bookmarking-nested.png | Bin
.../DomainObjectLayout}/bookmarking.png | Bin
.../DomainServiceLayout/menuBar-primary.png | Bin
.../DomainServiceLayout/menuBar-secondary.png | Bin
.../DomainServiceLayout/menuBar-tertiary.png | Bin
.../reference-annotations/DomainServiceLayout/menuOrder.png | Bin
.../images/reference-annotations/HomePage/HomePage.png | Bin
.../PropertyLayout/labelPosition-LEFT.png | Bin
.../PropertyLayout/labelPosition-NONE.png | Bin
.../PropertyLayout/labelPosition-TOP.png | Bin
.../PropertyLayout/labelPosition-boolean-LEFT.png | Bin
.../PropertyLayout/labelPosition-boolean-RIGHT.png | Bin
core/applib/_adoc/modules/cms/_attributes.adoc | 4 ++--
.../applib/_adoc/modules/cms}/attachments/.gitkeep | 0
.../cms}/images/reference-classes/issue-in-more-detail.png | Bin
.../images/reference-methods/prefixes/choices/dependent.png | Bin
.../reference-methods/reserved/cssClass/strikethrough.png | Bin
.../reference-methods/reserved/iconName/differing.pdn | Bin
.../reference-methods/reserved/iconName/differing.png | Bin
.../reference-methods/reserved/iconName/png-files.png | Bin
.../_adoc/modules/cms}/images/value-types/markup.png | Bin
core/applib/_adoc/modules/svc/_attributes.adoc | 4 ++--
.../applib/_adoc/modules/svc/attachments}/.gitkeep | 0
.../images/reference-services-api/acceptheaderservice.png | Bin
.../images/reference-services-api/acceptheaderservice.pptx | Bin
.../ErrorReportingService/kitchensink-example.png | Bin
.../action-invocation-published-to-stderr.png | Bin
.../EventSerializer/changed-object-published-to-stderr.png | Bin
.../PublishingService/yuml.me-23db58a4.png | Bin
.../reference-services-spi/UserProfileService/todoapp.png | Bin
.../{assets => }/images/reference-services/categories.png | Bin
.../{assets => }/images/reference-services/categories.pptx | Bin
.../images/reference-services/commands-and-events.png | Bin
.../images/reference-services/commands-and-events.pptx | Bin
core/config/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../config/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../config/_adoc/modules/ROOT}/images/.gitkeep | 0
core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../plugins/jdo/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../images/hints-n-tips/diagnosing-n-plus-1.png | Bin
.../party-agreementrole-agreement.png | Bin
core/runtime-services/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../images/ContentNegotiationService/accept-json.png | Bin
.../images/ContentNegotiationService/accept-xml.png | Bin
.../images/ContentNegotiationService/facade-choices.png | Bin
.../images/ContentNegotiationService/facade-choices.pptx | Bin
.../RepresentationService}/service-collaborations.png | Bin
.../RepresentationService/service-collaborations.pptx | Bin
core/schema/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../schema/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../ROOT}/images/reference-classes/issue-in-more-detail.png | Bin
.../images/reference-methods/prefixes/choices/dependent.png | Bin
.../reference-methods/reserved/cssClass/strikethrough.png | Bin
.../reference-methods/reserved/iconName/differing.pdn | Bin
.../reference-methods/reserved/iconName/differing.png | Bin
.../reference-methods/reserved/iconName/png-files.png | Bin
.../_adoc/modules/ROOT}/images/value-types/markup.png | Bin
core/security/api/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../ROOT/{assets => }/attachments/security-apis-impl.pptx | Bin
.../security/api/_adoc/modules/ROOT}/images/.gitkeep | 0
core/security/bypass/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../bypass/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../security-apis-impl/configure-isis-to-use-bypass.PNG | Bin
core/security/shiro/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../security/shiro/_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../configuring-shiro/ldap}/activeds-ldap-groups.png | Bin
.../ldap}/activeds-ldap-mojo-partition.png | Bin
.../configuring-shiro/ldap}/activeds-ldap-mojo-root-dse.png | Bin
.../ldap}/activeds-ldap-sasl-authentication.png | Bin
.../configuring-shiro/ldap}/activeds-ldap-users.png | Bin
.../security-apis-impl/configure-isis-to-use-shiro.png | Bin
.../configure-shiro-to-use-custom-jdbc-realm.png | Bin
.../security-apis-impl/configure-shiro-to-use-ini-realm.PNG | Bin
.../configure-shiro-to-use-isis-ldap-realm.PNG | Bin
.../shiro/_adoc/modules/realm-jdbc/_attributes.adoc | 4 ++--
.../shiro/_adoc/modules/realm-jdbc}/attachments/.gitkeep | 0
.../images}/configure-shiro-to-use-custom-jdbc-realm.png | Bin
.../shiro/_adoc/modules/realm-ldap/_attributes.adoc | 4 ++--
.../shiro/_adoc/modules/realm-ldap/attachments}/.gitkeep | 0
.../ldap => realm-ldap/images}/activeds-ldap-groups.png | Bin
.../images}/activeds-ldap-mojo-partition.png | Bin
.../images}/activeds-ldap-mojo-root-dse.png | Bin
.../images}/activeds-ldap-sasl-authentication.png | Bin
.../ldap => realm-ldap/images}/activeds-ldap-users.png | Bin
.../images}/configure-shiro-to-use-isis-ldap-realm.PNG | Bin
.../integtestsupport/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../_adoc/modules/ROOT/{assets => }/images/integ-tests.png | Bin
.../_adoc/modules/ROOT/{assets => }/images/integ-tests.pptx | Bin
.../modules/ROOT/{assets => }/images/wrapper-factory.png | Bin
.../integtestsupport/_adoc/modules/mvn/_attributes.adoc | 4 ++--
.../_adoc/modules/mvn/attachments}/.gitkeep | 0
.../mvn/{assets => }/images/maven-plugin/xsd-goal.png | Bin
.../mvn/{assets => }/images/maven-plugin/xsd-goal.pptx | Bin
.../unittestsupport/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../unittestsupport/_adoc/modules/ROOT}/images/.gitkeep | 0
.../_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../ro-spec-resources-and-representations.png | Bin
.../modules/ROOT/images/rgfis}/service-collaborations.png | Bin
.../_adoc/modules/security/_attributes.adoc | 4 ++--
.../_adoc/modules/security/attachments}/.gitkeep | 0
.../_adoc/modules/security/images}/.gitkeep | 0
core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../_adoc/modules/ROOT/{assets => }/attachments/.gitkeep | 0
.../ROOT/{assets => }/images/about-page/about-page.png | Bin
.../ROOT/{assets => }/images/application-menu/dividers.png | Bin
.../{assets => }/images/application-menu/layout-menus.pdn | Bin
.../{assets => }/images/application-menu/layout-menus.png | Bin
.../ROOT/{assets => }/images/application-menu/tertiary.png | Bin
.../images/blob-attachments/010-attachment-field-940.png | Bin
.../images/blob-attachments/010-attachment-field.png | Bin
.../images/blob-attachments/020-edit-choose-file-940.png | Bin
.../images/blob-attachments/020-edit-choose-file.png | Bin
.../blob-attachments/030-choose-file-using-browser-520.png | Bin
.../blob-attachments/030-choose-file-using-browser.png | Bin
.../blob-attachments/040-edit-chosen-file-indicated-940.png | Bin
.../blob-attachments/040-edit-chosen-file-indicated.png | Bin
.../blob-attachments/050-ok-if-image-then-rendered-940.png | Bin
.../blob-attachments/050-ok-if-image-then-rendered.png | Bin
.../images/blob-attachments/060-download-940.png | Bin
.../{assets => }/images/blob-attachments/060-download.png | Bin
.../images/blob-attachments/070-edit-clear-940.png | Bin
.../{assets => }/images/blob-attachments/070-edit-clear.png | Bin
.../ROOT/{assets => }/images/bookmarked-pages/panel-940.png | Bin
.../images/bookmarked-pages/panel-estatio-940.png | Bin
.../{assets => }/images/bookmarked-pages/panel-estatio.png | Bin
.../ROOT/{assets => }/images/bookmarked-pages/panel.png | Bin
.../{assets => }/images/brand-logo/brand-logo-signin.png | Bin
.../ROOT/{assets => }/images/brand-logo/brand-logo.png | Bin
.../images/copy-link/010-copy-link-button-940.png | Bin
.../{assets => }/images/copy-link/010-copy-link-button.png | Bin
.../images/copy-link/020-copy-link-dialog-940.png | Bin
.../{assets => }/images/copy-link/020-copy-link-dialog.png | Bin
.../ROOT/{assets => }/images/copy-link/030-hints-940.png | Bin
.../ROOT/{assets => }/images/copy-link/030-hints.png | Bin
.../images/copy-link/040-copy-link-with-hints-940.png | Bin
.../images/copy-link/040-copy-link-with-hints.png | Bin
.../{assets => }/images/copy-link/050-title-url-940.png | Bin
.../ROOT/{assets => }/images/copy-link/050-title-url.png | Bin
.../modules/ROOT/{assets => }/images/dialog-mode/modal.png | Bin
.../ROOT/{assets => }/images/dialog-mode/sidebar.png | Bin
.../ROOT/{assets => }/images/embedded-view/no-footer.png | Bin
.../images/embedded-view/no-header-no-footer.png | Bin
.../ROOT/{assets => }/images/embedded-view/no-header.png | Bin
.../ROOT/{assets => }/images/embedded-view/regular.png | Bin
.../images/features/recent-pages/recent-pages.png | Bin
.../ui-hints/object-titles-and-icons/cust-order-product.png | Bin
.../images/layout-dynamic-xml/ToDoAppDashboard.png | Bin
.../{assets => }/images/layout-dynamic-xml/ToDoItem.png | Bin
.../ROOT/{assets => }/images/layouts/customer-order.png | Bin
.../ROOT/{assets => }/images/layouts/estatio-Invoice.png | Bin
.../_adoc/modules/ROOT}/images/layouts/estatio-Lease.png | Bin
.../ROOT/{assets => }/images/layouts/estatio-LeaseItem.png | Bin
.../ROOT/{assets => }/images/layouts/todoapp-ToDoItem.png | Bin
.../ROOT/{assets => }/images/menubars/010-download.png | Bin
.../ROOT/{assets => }/images/menubars/020-download.png | Bin
.../ROOT/{assets => }/images/reference-layout/4-0-8-0.png | Bin
.../ROOT/{assets => }/images/reference-layout/4-4-4-12.png | Bin
.../ROOT/{assets => }/images/reference-layout/6-6-0-12.png | Bin
.../images/reference-layout/isis-layout-show-facets.css | 0
.../{assets => }/images/reference-layout/isis-layout.css | 0
.../images/reference-layout/layout-4-0-8-0.html | 0
.../images/reference-layout/layout-4-4-4-12.html | 0
.../images/reference-layout/layout-6-6-0-12.html | 0
.../suppress-password-reset}/login-page-default.png | Bin
.../login-page-suppress-password-reset.png | Bin
.../suppress-remember-me}/login-page-default.png | Bin
.../login-page-suppress-remember-me.png | Bin
.../suppress-sign-up}/login-page-default.png | Bin
.../images/suppress-sign-up/login-page-suppress-sign-up.png | Bin
.../ROOT/{assets => }/images/theme-chooser/example-1.png | Bin
.../ROOT/{assets => }/images/theme-chooser/example-2.png | Bin
.../user-registration}/login-page-default.png | Bin
.../images/user-registration/sign-up-after-registration.png | Bin
.../sign-up-email-with-verification-link.png | Bin
.../user-registration/sign-up-login-page-after-sign-up.png | Bin
.../{assets => }/images/user-registration/sign-up-page.png | Bin
.../images/user-registration/sign-up-registration-page.png | Bin
.../ROOT/{assets => }/images/where-am-i/hello_grey_bg.png | Bin
core/viewer-wicket/_adoc/modules/security/_attributes.adoc | 4 ++--
.../_adoc/modules/security/attachments}/.gitkeep | 0
.../_adoc/modules/security/images}/.gitkeep | 0
examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../apps/helloworld/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../helloworld/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../apps/helloworld/_adoc/modules/ROOT}/images/.gitkeep | 0
.../ROOT/{assets => }/images/helloworld-before-launch.png | Bin
.../_adoc/modules/ROOT/{assets => }/images/helloworld.png | Bin
.../{assets => }/images/using-hello-world/010-root-page.png | Bin
.../images/using-hello-world/020-login-to-wicket-viewer.png | Bin
.../{assets => }/images/using-hello-world/030-home-page.png | Bin
.../using-hello-world/040-create-object-from-menu.png | Bin
.../050-create-object-from-menu-prompt.png | Bin
.../images/using-hello-world/060-created-object.png | Bin
.../images/using-hello-world/070-update-name.png | Bin
.../images/using-hello-world/080-edit-notes.png | Bin
.../images/using-hello-world/090-delete-object.png | Bin
.../images/using-hello-world/100-object-deleted.png | Bin
.../using-hello-world/200-swagger-ui-before-reload.png | Bin
.../images/using-hello-world/210-helloworld-resources.png | Bin
.../using-hello-world/220-create-object-thru-rest-api.png | Bin
.../230-create-object-thru-rest-api-response.png | Bin
.../240-retrieve-object-using-rest-api.png | Bin
.../250-retrieve-object-using-rest-api-response.png | Bin
examples/apps/simpleapp/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../modules/ROOT/{assets => }/images/dockerhub-tags.png | Bin
.../{assets => }/images/simpleapp-webapp-before-launch.png | Bin
.../{assets => }/images/simpleapp-webapp-with-fixtures.png | Bin
.../modules/ROOT/{assets => }/images/simpleapp-webapp.png | Bin
.../{assets => }/images/using-simple-app/030-home-page.png | Bin
.../images/using-simple-app/040-run-fixture-script-menu.png | Bin
.../using-simple-app/050-run-fixture-script-prompt.png | Bin
.../using-simple-app/060-run-fixture-script-result.png | Bin
.../{assets => }/images/using-simple-app/070-home-page.png | Bin
.../images/using-simple-app/structure/structure.pptx | Bin
.../images/using-simple-app/structure/structure/Slide1.PNG | Bin
.../images/using-simple-app/structure/structure/Slide2.PNG | Bin
examples/smoketests/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../smoketests/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../smoketests/_adoc/modules/ROOT/images}/.gitkeep | 0
extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../asciidoc/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../asciidoc/_adoc/modules/ROOT/images}/.gitkeep | 0
extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../fixtures/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../fixtures/_adoc/modules/ROOT/images}/.gitkeep | 0
.../_adoc/modules/ROOT/{assets => }/images/composite.png | Bin
.../_adoc/modules/ROOT/{assets => }/images/flat-1.png | Bin
.../_adoc/modules/ROOT/{assets => }/images/flat-2.png | Bin
.../{assets => }/images/organizing-fixture-scripts.pptx | Bin
.../ROOT/{assets => }/images/prompt-specifying-number.png | Bin
.../_adoc/modules/ROOT/{assets => }/images/prompt.png | Bin
.../modules/ROOT/{assets => }/images/prototyping-menu.png | Bin
.../_adoc/modules/ROOT/{assets => }/images/result-list.png | Bin
extensions/incubator/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../incubator/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../incubator/_adoc/modules/ROOT}/images/.gitkeep | 0
extensions/markdown/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../markdown/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../markdown/_adoc/modules/ROOT/images}/.gitkeep | 0
extensions/secman/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../secman/_adoc/modules/ROOT}/attachments/.gitkeep | 0
.../secman/_adoc/modules/ROOT}/images/.gitkeep | 0
extensions/secman/_adoc/modules/api/_attributes.adoc | 4 ++--
.../secman/_adoc/modules/api}/attachments/.gitkeep | 0
.../secman/_adoc/modules/api/images}/.gitkeep | 0
.../_adoc/modules/encryption-jbcrypt/_attributes.adoc | 4 ++--
.../_adoc/modules/encryption-jbcrypt}/attachments/.gitkeep | 0
.../_adoc/modules/encryption-jbcrypt}/images/.gitkeep | 0
extensions/secman/_adoc/modules/model/_attributes.adoc | 4 ++--
.../secman/_adoc/modules/model}/attachments/.gitkeep | 0
.../secman/_adoc/modules/model/images}/.gitkeep | 0
.../secman/_adoc/modules/persistence-jdo/_attributes.adoc | 4 ++--
.../_adoc/modules/persistence-jdo/attachments}/.gitkeep | 0
.../secman/_adoc/modules/persistence-jdo/images}/.gitkeep | 0
.../secman/_adoc/modules/realm-shiro/_attributes.adoc | 4 ++--
.../secman/_adoc/modules/realm-shiro}/attachments/.gitkeep | 0
.../secman/_adoc/modules/realm-shiro/images}/.gitkeep | 0
...isisaddons-security-module-realm-with-delegate-realm.PNG | Bin
...figure-shiro-to-use-isisaddons-security-module-realm.PNG | Bin
extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../specsupport/_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../specsupport/_adoc/modules/ROOT/images}/.gitkeep | 0
extensions/sse/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../sse/_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../sse/_adoc/modules/ROOT/images}/.gitkeep | 0
.../viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../viewer-wicket-excel/_adoc/modules/ROOT/images}/.gitkeep | 0
mavendeps/_adoc/modules/ROOT/_attributes.adoc | 4 ++--
.../_adoc/modules/ROOT/attachments}/.gitkeep | 0
.../_adoc/modules/ROOT/images}/.gitkeep | 0
503 files changed, 101 insertions(+), 101 deletions(-)
diff --git a/antora/components/archdesign/modules/ROOT/_attributes.adoc b/antora/components/archdesign/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/archdesign/modules/ROOT/_attributes.adoc
+++ b/antora/components/archdesign/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/mavendeps/_adoc/modules/ROOT/assets/images/.gitkeep b/antora/components/archdesign/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from mavendeps/_adoc/modules/ROOT/assets/images/.gitkeep
rename to antora/components/archdesign/modules/ROOT/attachments/.gitkeep
diff --git a/mavendeps/_adoc/modules/ROOT/assets/attachments/.gitkeep b/antora/components/archdesign/modules/ROOT/images/.gitkeep
similarity index 100%
rename from mavendeps/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to antora/components/archdesign/modules/ROOT/images/.gitkeep
diff --git a/antora/components/mignotes/modules/ROOT/_attributes.adoc b/antora/components/mignotes/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/mignotes/modules/ROOT/_attributes.adoc
+++ b/antora/components/mignotes/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/viewer-wicket-excel/_adoc/modules/ROOT/assets/images/.gitkeep b/antora/components/mignotes/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/viewer-wicket-excel/_adoc/modules/ROOT/assets/images/.gitkeep
rename to antora/components/mignotes/modules/ROOT/attachments/.gitkeep
diff --git a/extensions/viewer-wicket-excel/_adoc/modules/ROOT/assets/attachments/.gitkeep b/antora/components/mignotes/modules/ROOT/images/.gitkeep
similarity index 100%
rename from extensions/viewer-wicket-excel/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to antora/components/mignotes/modules/ROOT/images/.gitkeep
diff --git a/antora/components/refguide/modules/ROOT/_attributes.adoc b/antora/components/refguide/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/refguide/modules/ROOT/_attributes.adoc
+++ b/antora/components/refguide/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/relnotes/modules/ROOT/_attributes.adoc b/antora/components/relnotes/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/relnotes/modules/ROOT/_attributes.adoc
+++ b/antora/components/relnotes/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/sse/_adoc/modules/ROOT/assets/images/.gitkeep b/antora/components/relnotes/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/sse/_adoc/modules/ROOT/assets/images/.gitkeep
rename to antora/components/relnotes/modules/ROOT/attachments/.gitkeep
diff --git a/extensions/sse/_adoc/modules/ROOT/assets/attachments/.gitkeep b/antora/components/relnotes/modules/ROOT/images/.gitkeep
similarity index 100%
rename from extensions/sse/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to antora/components/relnotes/modules/ROOT/images/.gitkeep
diff --git a/antora/components/testing/modules/ROOT/_attributes.adoc b/antora/components/testing/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/testing/modules/ROOT/_attributes.adoc
+++ b/antora/components/testing/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/specsupport/_adoc/modules/ROOT/assets/images/.gitkeep b/antora/components/testing/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/specsupport/_adoc/modules/ROOT/assets/images/.gitkeep
rename to antora/components/testing/modules/ROOT/attachments/.gitkeep
diff --git a/extensions/specsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep b/antora/components/testing/modules/ROOT/images/.gitkeep
similarity index 100%
rename from extensions/specsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to antora/components/testing/modules/ROOT/images/.gitkeep
diff --git a/antora/components/toc/modules/ROOT/_attributes.adoc b/antora/components/toc/modules/ROOT/_attributes.adoc
index 8249db3..43cb529 100644
--- a/antora/components/toc/modules/ROOT/_attributes.adoc
+++ b/antora/components/toc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
-:imagesdir: {moduledir}/assets/images
endif::[]
diff --git a/extensions/secman/_adoc/modules/realm-shiro/assets/images/.gitkeep b/antora/components/toc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/realm-shiro/assets/images/.gitkeep
rename to antora/components/toc/modules/ROOT/attachments/.gitkeep
diff --git a/antora/components/toc/modules/ROOT/assets/images/going-deeper/books/dhnako.jpg b/antora/components/toc/modules/ROOT/images/going-deeper/books/dhnako.jpg
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/going-deeper/books/dhnako.jpg
rename to antora/components/toc/modules/ROOT/images/going-deeper/books/dhnako.jpg
diff --git a/antora/components/toc/modules/ROOT/assets/images/going-deeper/books/nakedobjects-book.jpg b/antora/components/toc/modules/ROOT/images/going-deeper/books/nakedobjects-book.jpg
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/going-deeper/books/nakedobjects-book.jpg
rename to antora/components/toc/modules/ROOT/images/going-deeper/books/nakedobjects-book.jpg
diff --git a/antora/components/toc/modules/ROOT/assets/images/more-thanks/ecp.png b/antora/components/toc/modules/ROOT/images/more-thanks/ecp.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/more-thanks/ecp.png
rename to antora/components/toc/modules/ROOT/images/more-thanks/ecp.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/more-thanks/ecp_logo_white.png b/antora/components/toc/modules/ROOT/images/more-thanks/ecp_logo_white.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/more-thanks/ecp_logo_white.png
rename to antora/components/toc/modules/ROOT/images/more-thanks/ecp_logo_white.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/more-thanks/ej-technologies.png b/antora/components/toc/modules/ROOT/images/more-thanks/ej-technologies.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/more-thanks/ej-technologies.png
rename to antora/components/toc/modules/ROOT/images/more-thanks/ej-technologies.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/more-thanks/icons8-logo.png b/antora/components/toc/modules/ROOT/images/more-thanks/icons8-logo.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/more-thanks/icons8-logo.png
rename to antora/components/toc/modules/ROOT/images/more-thanks/icons8-logo.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/more-thanks/s101_170.png b/antora/components/toc/modules/ROOT/images/more-thanks/s101_170.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/more-thanks/s101_170.png
rename to antora/components/toc/modules/ROOT/images/more-thanks/s101_170.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/tv_show-25.png b/antora/components/toc/modules/ROOT/images/tv_show-25.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/tv_show-25.png
rename to antora/components/toc/modules/ROOT/images/tv_show-25.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/010-login.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/010-login.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/010-login.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/010-login.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/020-install-fixtures.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/020-install-fixtures.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/020-install-fixtures.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/020-install-fixtures.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/030-dashboard-view-model.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/030-dashboard-view-model.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/030-dashboard-view-model.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/030-dashboard-view-model.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/040-domain-entity.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/040-domain-entity.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/040-domain-entity.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/040-domain-entity.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/050-edit-property.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/050-edit-property.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/050-edit-property.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/050-edit-property.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/060-invoke-action.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/060-invoke-action.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/060-invoke-action.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/060-invoke-action.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/065-contributions.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/065-contributions.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/065-contributions.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/065-contributions.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/067-contributed-action.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/067-contributed-action.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/067-contributed-action.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/067-contributed-action.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/070-pluggable-views.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/070-pluggable-views.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/070-pluggable-views.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/070-pluggable-views.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/080-gmap3-view.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/080-gmap3-view.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/080-gmap3-view.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/080-gmap3-view.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/090-fullcalendar2-view.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/090-fullcalendar2-view.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/090-fullcalendar2-view.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/090-fullcalendar2-view.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/100-excel-view-and-docx.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/100-excel-view-and-docx.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/100-excel-view-and-docx.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/100-excel-view-and-docx.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/110-docx.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/110-docx.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/110-docx.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/110-docx.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/120-auditing.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/120-auditing.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/120-auditing.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/120-auditing.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/130-security.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/130-security.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/130-security.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/130-security.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/140-i18n.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/140-i18n.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/140-i18n.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/140-i18n.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/150-appsettings.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/150-appsettings.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/150-appsettings.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/150-appsettings.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/170-me.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/170-me.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/170-me.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/170-me.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/180-app-user-entity.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/180-app-user-entity.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/180-app-user-entity.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/180-app-user-entity.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/190-switch-theme.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/190-switch-theme.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/190-switch-theme.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/190-switch-theme.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/200-rest-api.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/200-rest-api.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/200-rest-api.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/200-rest-api.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/205-swagger-ui.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/205-swagger-ui.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/205-swagger-ui.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/205-swagger-ui.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/210-fixture-scripts.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/210-fixture-scripts.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/210-fixture-scripts.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/210-fixture-scripts.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/220-testing-happy-case.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/220-testing-happy-case.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/220-testing-happy-case.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/220-testing-happy-case.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/230-testing-wrapper-factory.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/230-testing-wrapper-factory.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/230-testing-wrapper-factory.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/230-testing-wrapper-factory.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/240-domain-events.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/240-domain-events.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/240-domain-events.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/240-domain-events.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/250-domain-event-subscriber.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/250-domain-event-subscriber.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/250-domain-event-subscriber.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/250-domain-event-subscriber.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/260-domain-event-test.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/260-domain-event-test.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/isis-in-pictures/260-domain-event-test.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/260-domain-event-test.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/commapp/screenshot-1.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/commapp/screenshot-1.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/commapp/screenshot-1.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/commapp/screenshot-1.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/commapp/screenshot-2.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/commapp/screenshot-2.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/commapp/screenshot-2.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/commapp/screenshot-2.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/cqnz/cqnz-advert.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/cqnz/cqnz-advert.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/cqnz/cqnz-advert.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/cqnz/cqnz-advert.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/estatio/est-home-page.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-home-page.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/estatio/est-home-page.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-home-page.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/estatio/est-invoice.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-invoice.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/estatio/est-invoice.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-invoice.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/estatio/est-payment-batch-manager.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-payment-batch-manager.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/estatio/est-payment-batch-manager.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/est-payment-batch-manager.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/estatio/estatio-1.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/estatio-1.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/estatio/estatio-1.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/estatio/estatio-1.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-1-custom-viewer.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-1-custom-viewer.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-1-custom-viewer.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-1-custom-viewer.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-2-custom-drag-n-drop-interface.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-3-custom-ui-analyzing-risk-scenarios.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-4-managing-projects.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-4-managing-projects.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-4-managing-projects.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/gesconsultor-grc/fig-4-managing-projects.png
diff --git a/antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/transportplanner/TransportDemand.png b/antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/transportplanner/TransportDemand.png
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/images/what-is-apache-isis/powered-by/transportplanner/TransportDemand.png
rename to antora/components/toc/modules/ROOT/images/what-is-apache-isis/powered-by/transportplanner/TransportDemand.png
diff --git a/antora/components/toc/modules/comguide/_attributes.adoc b/antora/components/toc/modules/comguide/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/toc/modules/comguide/_attributes.adoc
+++ b/antora/components/toc/modules/comguide/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/realm-shiro/assets/attachments/.gitkeep b/antora/components/toc/modules/comguide/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/realm-shiro/assets/attachments/.gitkeep
rename to antora/components/toc/modules/comguide/attachments/.gitkeep
diff --git a/antora/components/toc/modules/comguide/assets/images/committers/github-pr-history.png b/antora/components/toc/modules/comguide/images/committers/github-pr-history.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/committers/github-pr-history.png
rename to antora/components/toc/modules/comguide/images/committers/github-pr-history.png
diff --git a/antora/components/toc/modules/comguide/assets/images/docker/020-docker-nat-public.png b/antora/components/toc/modules/comguide/images/docker/020-docker-nat-public.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/docker/020-docker-nat-public.png
rename to antora/components/toc/modules/comguide/images/docker/020-docker-nat-public.png
diff --git a/antora/components/toc/modules/comguide/assets/images/docker/022-local-security-policy.png b/antora/components/toc/modules/comguide/images/docker/022-local-security-policy.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/docker/022-local-security-policy.png
rename to antora/components/toc/modules/comguide/images/docker/022-local-security-policy.png
diff --git a/antora/components/toc/modules/comguide/assets/images/docker/024-unidentified-are-private.png b/antora/components/toc/modules/comguide/images/docker/024-unidentified-are-private.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/docker/024-unidentified-are-private.png
rename to antora/components/toc/modules/comguide/images/docker/024-unidentified-are-private.png
diff --git a/antora/components/toc/modules/comguide/assets/images/docker/026-docker-nat-private.png b/antora/components/toc/modules/comguide/images/docker/026-docker-nat-private.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/docker/026-docker-nat-private.png
rename to antora/components/toc/modules/comguide/images/docker/026-docker-nat-private.png
diff --git a/antora/components/toc/modules/comguide/assets/images/docker/docker-daemon.png b/antora/components/toc/modules/comguide/images/docker/docker-daemon.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/docker/docker-daemon.png
rename to antora/components/toc/modules/comguide/images/docker/docker-daemon.png
diff --git a/antora/components/toc/modules/comguide/assets/images/release-process/jira-create-release-notes.png b/antora/components/toc/modules/comguide/images/release-process/jira-create-release-notes.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/release-process/jira-create-release-notes.png
rename to antora/components/toc/modules/comguide/images/release-process/jira-create-release-notes.png
diff --git a/antora/components/toc/modules/comguide/assets/images/release-process/nexus-release-1.png b/antora/components/toc/modules/comguide/images/release-process/nexus-release-1.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/release-process/nexus-release-1.png
rename to antora/components/toc/modules/comguide/images/release-process/nexus-release-1.png
diff --git a/antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-0.png b/antora/components/toc/modules/comguide/images/release-process/nexus-staging-0.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-0.png
rename to antora/components/toc/modules/comguide/images/release-process/nexus-staging-0.png
diff --git a/antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-1.png b/antora/components/toc/modules/comguide/images/release-process/nexus-staging-1.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-1.png
rename to antora/components/toc/modules/comguide/images/release-process/nexus-staging-1.png
diff --git a/antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-2.png b/antora/components/toc/modules/comguide/images/release-process/nexus-staging-2.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-2.png
rename to antora/components/toc/modules/comguide/images/release-process/nexus-staging-2.png
diff --git a/antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-2a.png b/antora/components/toc/modules/comguide/images/release-process/nexus-staging-2a.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-2a.png
rename to antora/components/toc/modules/comguide/images/release-process/nexus-staging-2a.png
diff --git a/antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-3.png b/antora/components/toc/modules/comguide/images/release-process/nexus-staging-3.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-3.png
rename to antora/components/toc/modules/comguide/images/release-process/nexus-staging-3.png
diff --git a/antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-4.png b/antora/components/toc/modules/comguide/images/release-process/nexus-staging-4.png
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/images/release-process/nexus-staging-4.png
rename to antora/components/toc/modules/comguide/images/release-process/nexus-staging-4.png
diff --git a/antora/components/toc/modules/devguide/_attributes.adoc b/antora/components/toc/modules/devguide/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/toc/modules/devguide/_attributes.adoc
+++ b/antora/components/toc/modules/devguide/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/toc/modules/devguide/assets/attachments/asciidoc-syntax-quick-reference.pdf b/antora/components/toc/modules/devguide/attachments/asciidoc-syntax-quick-reference.pdf
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/asciidoc-syntax-quick-reference.pdf
rename to antora/components/toc/modules/devguide/attachments/asciidoc-syntax-quick-reference.pdf
diff --git a/antora/components/toc/modules/devguide/assets/attachments/asciidoc-writers-guide.pdf b/antora/components/toc/modules/devguide/attachments/asciidoc-writers-guide.pdf
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/asciidoc-writers-guide.pdf
rename to antora/components/toc/modules/devguide/attachments/asciidoc-writers-guide.pdf
diff --git a/antora/components/toc/modules/devguide/assets/attachments/eclipse/Apache-Isis-code-style-cleanup.xml b/antora/components/toc/modules/devguide/attachments/eclipse/Apache-Isis-code-style-cleanup.xml
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/eclipse/Apache-Isis-code-style-cleanup.xml
rename to antora/components/toc/modules/devguide/attachments/eclipse/Apache-Isis-code-style-cleanup.xml
diff --git a/antora/components/toc/modules/devguide/assets/attachments/eclipse/Apache-code-style-formatting.xml b/antora/components/toc/modules/devguide/attachments/eclipse/Apache-code-style-formatting.xml
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/eclipse/Apache-code-style-formatting.xml
rename to antora/components/toc/modules/devguide/attachments/eclipse/Apache-code-style-formatting.xml
diff --git a/antora/components/toc/modules/devguide/assets/attachments/eclipse/Apache-code-style-template.xml b/antora/components/toc/modules/devguide/attachments/eclipse/Apache-code-style-template.xml
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/eclipse/Apache-code-style-template.xml
rename to antora/components/toc/modules/devguide/attachments/eclipse/Apache-code-style-template.xml
diff --git a/antora/components/toc/modules/devguide/assets/attachments/eclipse/isis-templates.xml b/antora/components/toc/modules/devguide/attachments/eclipse/isis-templates.xml
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/eclipse/isis-templates.xml
rename to antora/components/toc/modules/devguide/attachments/eclipse/isis-templates.xml
diff --git a/antora/components/toc/modules/devguide/assets/attachments/eclipse/isis.importorder b/antora/components/toc/modules/devguide/attachments/eclipse/isis.importorder
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/eclipse/isis.importorder
rename to antora/components/toc/modules/devguide/attachments/eclipse/isis.importorder
diff --git a/antora/components/toc/modules/devguide/assets/attachments/eclipse/jmock2-templates.xml b/antora/components/toc/modules/devguide/attachments/eclipse/jmock2-templates.xml
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/eclipse/jmock2-templates.xml
rename to antora/components/toc/modules/devguide/attachments/eclipse/jmock2-templates.xml
diff --git a/antora/components/toc/modules/devguide/assets/attachments/eclipse/junit4-templates.xml b/antora/components/toc/modules/devguide/attachments/eclipse/junit4-templates.xml
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/eclipse/junit4-templates.xml
rename to antora/components/toc/modules/devguide/attachments/eclipse/junit4-templates.xml
diff --git a/antora/components/toc/modules/devguide/assets/attachments/intellij/.gitignore b/antora/components/toc/modules/devguide/attachments/intellij/.gitignore
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/intellij/.gitignore
rename to antora/components/toc/modules/devguide/attachments/intellij/.gitignore
diff --git a/antora/components/toc/modules/devguide/assets/attachments/intellij/isis-settings-file-templates.jar b/antora/components/toc/modules/devguide/attachments/intellij/isis-settings-file-templates.jar
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/intellij/isis-settings-file-templates.jar
rename to antora/components/toc/modules/devguide/attachments/intellij/isis-settings-file-templates.jar
diff --git a/antora/components/toc/modules/devguide/assets/attachments/intellij/other/.gitignore b/antora/components/toc/modules/devguide/attachments/intellij/other/.gitignore
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/intellij/other/.gitignore
rename to antora/components/toc/modules/devguide/attachments/intellij/other/.gitignore
diff --git a/antora/components/toc/modules/devguide/assets/attachments/intellij/other/dan-settings-keymaps.jar b/antora/components/toc/modules/devguide/attachments/intellij/other/dan-settings-keymaps.jar
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/intellij/other/dan-settings-keymaps.jar
rename to antora/components/toc/modules/devguide/attachments/intellij/other/dan-settings-keymaps.jar
diff --git a/antora/components/toc/modules/devguide/assets/attachments/resources/IsisCheatSheet.docx b/antora/components/toc/modules/devguide/attachments/resources/IsisCheatSheet.docx
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/resources/IsisCheatSheet.docx
rename to antora/components/toc/modules/devguide/attachments/resources/IsisCheatSheet.docx
diff --git a/antora/components/toc/modules/devguide/assets/attachments/resources/IsisCheatSheet.pdf b/antora/components/toc/modules/devguide/attachments/resources/IsisCheatSheet.pdf
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/attachments/resources/IsisCheatSheet.pdf
rename to antora/components/toc/modules/devguide/attachments/resources/IsisCheatSheet.pdf
diff --git a/antora/components/toc/modules/devguide/assets/images/asciidoctor/ditaa-demo.png b/antora/components/toc/modules/devguide/images/asciidoctor/ditaa-demo.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/asciidoctor/ditaa-demo.png
rename to antora/components/toc/modules/devguide/images/asciidoctor/ditaa-demo.png
diff --git a/antora/components/toc/modules/devguide/assets/images/asciidoctor/graphviz-demo.png b/antora/components/toc/modules/devguide/images/asciidoctor/graphviz-demo.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/asciidoctor/graphviz-demo.png
rename to antora/components/toc/modules/devguide/images/asciidoctor/graphviz-demo.png
diff --git a/antora/components/toc/modules/devguide/assets/images/asciidoctor/plantuml-demo.png b/antora/components/toc/modules/devguide/images/asciidoctor/plantuml-demo.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/asciidoctor/plantuml-demo.png
rename to antora/components/toc/modules/devguide/images/asciidoctor/plantuml-demo.png
diff --git a/antora/components/toc/modules/devguide/assets/images/building-apache-isis/setting-up-git.png b/antora/components/toc/modules/devguide/images/building-apache-isis/setting-up-git.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/building-apache-isis/setting-up-git.png
rename to antora/components/toc/modules/devguide/images/building-apache-isis/setting-up-git.png
diff --git a/antora/components/toc/modules/devguide/assets/images/contributing/git-workflow.png b/antora/components/toc/modules/devguide/images/contributing/git-workflow.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/contributing/git-workflow.png
rename to antora/components/toc/modules/devguide/images/contributing/git-workflow.png
diff --git a/antora/components/toc/modules/devguide/assets/images/contributing/git-workflow.pptx b/antora/components/toc/modules/devguide/images/contributing/git-workflow.pptx
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/contributing/git-workflow.pptx
rename to antora/components/toc/modules/devguide/images/contributing/git-workflow.pptx
diff --git a/antora/components/toc/modules/devguide/assets/images/contributing/github-cloning.png b/antora/components/toc/modules/devguide/images/contributing/github-cloning.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/contributing/github-cloning.png
rename to antora/components/toc/modules/devguide/images/contributing/github-cloning.png
diff --git a/antora/components/toc/modules/devguide/assets/images/contributing/github-forking.png b/antora/components/toc/modules/devguide/images/contributing/github-forking.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/contributing/github-forking.png
rename to antora/components/toc/modules/devguide/images/contributing/github-forking.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/010-lombok-locate-jar.png b/antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/010-lombok-locate-jar.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/010-lombok-locate-jar.png
rename to antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/010-lombok-locate-jar.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png b/antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png
rename to antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png b/antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png
rename to antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png b/antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png
rename to antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png b/antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png
rename to antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/060-enable-annotation-processor.png b/antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/060-enable-annotation-processor.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/2017-oxygen/060-enable-annotation-processor.png
rename to antora/components/toc/modules/devguide/images/eclipse/2017-oxygen/060-enable-annotation-processor.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-010-windows-preferences.png b/antora/components/toc/modules/devguide/images/eclipse/eclipse-010-windows-preferences.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-010-windows-preferences.png
rename to antora/components/toc/modules/devguide/images/eclipse/eclipse-010-windows-preferences.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-025-project-properties.png b/antora/components/toc/modules/devguide/images/eclipse/eclipse-025-project-properties.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-025-project-properties.png
rename to antora/components/toc/modules/devguide/images/eclipse/eclipse-025-project-properties.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-100-project-support.png b/antora/components/toc/modules/devguide/images/eclipse/eclipse-100-project-support.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-100-project-support.png
rename to antora/components/toc/modules/devguide/images/eclipse/eclipse-100-project-support.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-110-project-support.png b/antora/components/toc/modules/devguide/images/eclipse/eclipse-110-project-support.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-110-project-support.png
rename to antora/components/toc/modules/devguide/images/eclipse/eclipse-110-project-support.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-120-console.png b/antora/components/toc/modules/devguide/images/eclipse/eclipse-120-console.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-120-console.png
rename to antora/components/toc/modules/devguide/images/eclipse/eclipse-120-console.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-200-enhancer-fails-duplicates.png b/antora/components/toc/modules/devguide/images/eclipse/eclipse-200-enhancer-fails-duplicates.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-200-enhancer-fails-duplicates.png
rename to antora/components/toc/modules/devguide/images/eclipse/eclipse-200-enhancer-fails-duplicates.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-210-enhancer-fails-duplicates.png b/antora/components/toc/modules/devguide/images/eclipse/eclipse-210-enhancer-fails-duplicates.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-210-enhancer-fails-duplicates.png
rename to antora/components/toc/modules/devguide/images/eclipse/eclipse-210-enhancer-fails-duplicates.png
diff --git a/antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-220-enhancer-fails-duplicates.png b/antora/components/toc/modules/devguide/images/eclipse/eclipse-220-enhancer-fails-duplicates.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/eclipse/eclipse-220-enhancer-fails-duplicates.png
rename to antora/components/toc/modules/devguide/images/eclipse/eclipse-220-enhancer-fails-duplicates.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/010-welcome-page.png b/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/010-welcome-page.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/010-welcome-page.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/010-installing/010-welcome-page.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/020-choose-location.png b/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/020-choose-location.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/020-choose-location.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/010-installing/020-choose-location.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/030-installation-options.png b/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/030-installation-options.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/030-installation-options.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/010-installing/030-installation-options.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/040-start-menu-folder.png b/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/040-start-menu-folder.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/040-start-menu-folder.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/010-installing/040-start-menu-folder.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/050-completing.png b/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/050-completing.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/050-completing.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/010-installing/050-completing.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/060-import-settings-or-not.png b/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/060-import-settings-or-not.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/060-import-settings-or-not.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/010-installing/060-import-settings-or-not.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/070-set-ui-theme.png b/antora/components/toc/modules/devguide/images/intellij-idea/010-installing/070-set-ui-theme.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/010-installing/070-set-ui-theme.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/010-installing/070-set-ui-theme.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/010-new-project-create.png b/antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/010-new-project-create.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/010-new-project-create.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/010-new-project-create.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png b/antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/030-java-project-select-jdk.png b/antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/030-java-project-select-jdk.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/030-java-project-select-jdk.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/030-java-project-select-jdk.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/040-sdk-selected.png b/antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/040-sdk-selected.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/040-sdk-selected.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/040-sdk-selected.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/050-name-and-location.png b/antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/050-name-and-location.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/050-name-and-location.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/050-name-and-location.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/060-create-dir.png b/antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/060-create-dir.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/020-create-new-project/060-create-dir.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/020-create-new-project/060-create-dir.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/010-settings-import-jar.png b/antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/010-settings-import-jar.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/010-settings-import-jar.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/010-settings-import-jar.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/020-select-all.png b/antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/020-select-all.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/020-select-all.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/020-select-all.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/030-restart.png b/antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/030-restart.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/030-restart.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/030-restart.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/040-file-templates.png b/antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/040-file-templates.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/040-file-templates.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/040-file-templates.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/050-live-templates.png b/antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/050-live-templates.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/030-import-settings/050-live-templates.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/030-import-settings/050-live-templates.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png b/antora/components/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png b/antora/components/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/042-other-settings-maven/010-maven-installation.png b/antora/components/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/010-maven-installation.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/042-other-settings-maven/010-maven-installation.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/010-maven-installation.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png b/antora/components/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/044-other-settings-misc/010-auto-import.png b/antora/components/toc/modules/devguide/images/intellij-idea/044-other-settings-misc/010-auto-import.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/044-other-settings-misc/010-auto-import.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/044-other-settings-misc/010-auto-import.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/010-some-plugins.png b/antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/010-some-plugins.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/010-some-plugins.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/010-some-plugins.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png b/antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png b/antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png b/antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png b/antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png b/antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/060-troubleshooting/010-duplicate-classes.png b/antora/components/toc/modules/devguide/images/intellij-idea/060-troubleshooting/010-duplicate-classes.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/060-troubleshooting/010-duplicate-classes.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/060-troubleshooting/010-duplicate-classes.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/002-compiler-exclude.png b/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/002-compiler-exclude.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/002-compiler-exclude.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/002-compiler-exclude.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/004-gradle-output.png b/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/004-gradle-output.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/004-gradle-output.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/004-gradle-output.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/005-gradle-output.png b/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/005-gradle-output.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/005-gradle-output.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/005-gradle-output.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/006-livereload-js.png b/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/006-livereload-js.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/006-livereload-js.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/006-livereload-js.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png b/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/020-dcevm-once-installed.png b/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/020-dcevm-once-installed.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/020-dcevm-once-installed.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/020-dcevm-once-installed.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png b/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/040-dcevm-run-configuration.png b/antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/040-dcevm-run-configuration.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/070-advanced/040-dcevm-run-configuration.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/070-advanced/040-dcevm-run-configuration.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png b/antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png b/antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/030-other-module-added.png b/antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/030-other-module-added.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/030-other-module-added.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/030-other-module-added.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png b/antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png b/antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png b/antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/010-run-configuration.png b/antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/010-run-configuration.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/010-run-configuration.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/010-run-configuration.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png b/antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/030-running-unit-tests.png b/antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/030-running-unit-tests.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/030-running-unit-tests.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/030-running-unit-tests.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png b/antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png b/antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/010-file-project-structure.png b/antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/010-file-project-structure.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/010-file-project-structure.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/010-file-project-structure.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/020-select-jdk.png b/antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/020-select-jdk.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/020-select-jdk.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/020-select-jdk.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/030-select-jdk-directory.png b/antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/030-select-jdk-directory.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/030-select-jdk-directory.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/030-select-jdk-directory.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/040-set-project-level.png b/antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/040-set-project-level.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/040-set-project-level.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/040-set-project-level.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/050-isis-language-level-7.png b/antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/050-isis-language-level-7.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/050-isis-language-level-7.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/050-isis-language-level-7.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/060-app-language-level-8.png b/antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/060-app-language-level-8.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/200-project-sdk/060-app-language-level-8.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/200-project-sdk/060-app-language-level-8.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/010-new-project.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/010-new-project.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/010-new-project.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/010-new-project.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/020-new-project-name.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/020-new-project-name.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/020-new-project-name.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/020-new-project-name.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/030-new-project-new-window.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/030-new-project-new-window.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/030-new-project-new-window.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/030-new-project-new-window.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/040-new-module-from-existing-sources.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/040-new-module-from-existing-sources.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/040-new-module-from-existing-sources.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/040-new-module-from-existing-sources.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/050-specify-source-folder.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/050-specify-source-folder.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/050-specify-source-folder.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/050-specify-source-folder.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/060-import-using-maven.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/060-import-using-maven.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/060-import-using-maven.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/060-import-using-maven.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/070-import-module-settings.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/070-import-module-settings.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/070-import-module-settings.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/070-import-module-settings.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/080-maven-profiles.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/080-maven-profiles.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/080-maven-profiles.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/080-maven-profiles.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/090-maven-coordinates.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/090-maven-coordinates.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/090-maven-coordinates.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/090-maven-coordinates.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/100-annotation-processing.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/100-annotation-processing.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/100-annotation-processing.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/100-annotation-processing.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/110-parameter8.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/110-parameter8.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/110-parameter8.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/110-parameter8.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/120-clean-generate-sources.png b/antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/120-clean-generate-sources.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/250-new-project/120-clean-generate-sources.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/250-new-project/120-clean-generate-sources.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/300-paraname8-support/010-configuring-the-compiler.png b/antora/components/toc/modules/devguide/images/intellij-idea/300-paraname8-support/010-configuring-the-compiler.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/300-paraname8-support/010-configuring-the-compiler.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/300-paraname8-support/010-configuring-the-compiler.png
diff --git a/antora/components/toc/modules/devguide/assets/images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png b/antora/components/toc/modules/devguide/images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png
rename to antora/components/toc/modules/devguide/images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-Lease.png b/antora/components/toc/modules/devguide/images/layouts/estatio-Lease.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-Lease.png
rename to antora/components/toc/modules/devguide/images/layouts/estatio-Lease.png
diff --git a/antora/components/toc/modules/devguide/assets/images/resources/IsisCheatSheet.png b/antora/components/toc/modules/devguide/images/resources/IsisCheatSheet.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/resources/IsisCheatSheet.png
rename to antora/components/toc/modules/devguide/images/resources/IsisCheatSheet.png
diff --git a/antora/components/toc/modules/module-template/_attributes.adoc b/antora/components/toc/modules/module-template/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/toc/modules/module-template/_attributes.adoc
+++ b/antora/components/toc/modules/module-template/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/persistence-jdo/assets/images/.gitkeep b/antora/components/toc/modules/module-template/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/persistence-jdo/assets/images/.gitkeep
rename to antora/components/toc/modules/module-template/attachments/.gitkeep
diff --git a/extensions/secman/_adoc/modules/persistence-jdo/assets/attachments/.gitkeep b/antora/components/toc/modules/module-template/images/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/persistence-jdo/assets/attachments/.gitkeep
rename to antora/components/toc/modules/module-template/images/.gitkeep
diff --git a/antora/components/userguide/modules/ROOT/_attributes.adoc b/antora/components/userguide/modules/ROOT/_attributes.adoc
index 787e5c4..43cb529 100644
--- a/antora/components/userguide/modules/ROOT/_attributes.adoc
+++ b/antora/components/userguide/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
-:partialsdir: {moduledir}/pages/_partials
+:imagesdir: {moduledir}/images
+:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/userguide/modules/btb/_attributes.adoc b/antora/components/userguide/modules/btb/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/userguide/modules/btb/_attributes.adoc
+++ b/antora/components/userguide/modules/btb/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/model/assets/images/.gitkeep b/antora/components/userguide/modules/btb/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/model/assets/images/.gitkeep
rename to antora/components/userguide/modules/btb/attachments/.gitkeep
diff --git a/antora/components/userguide/modules/btb/assets/images/headless-access/BackgroundCommandExecution.png b/antora/components/userguide/modules/btb/images/headless-access/BackgroundCommandExecution.png
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/images/headless-access/BackgroundCommandExecution.png
rename to antora/components/userguide/modules/btb/images/headless-access/BackgroundCommandExecution.png
diff --git a/antora/components/userguide/modules/btb/assets/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png b/antora/components/userguide/modules/btb/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
rename to antora/components/userguide/modules/btb/images/headless-access/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.png
diff --git a/antora/components/userguide/modules/btb/assets/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 antora/components/userguide/modules/btb/assets/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/antora/components/userguide/modules/btb/assets/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 antora/components/userguide/modules/btb/assets/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/antora/components/userguide/modules/btb/assets/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 antora/components/userguide/modules/btb/assets/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/antora/components/userguide/modules/btb/assets/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 antora/components/userguide/modules/btb/assets/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/antora/components/userguide/modules/btb/assets/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 antora/components/userguide/modules/btb/assets/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/antora/components/userguide/modules/btb/assets/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 antora/components/userguide/modules/btb/assets/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/antora/components/userguide/modules/btb/assets/images/runtime/web-xml/key.png b/antora/components/userguide/modules/btb/images/runtime/web-xml/key.png
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/images/runtime/web-xml/key.png
rename to antora/components/userguide/modules/btb/images/runtime/web-xml/key.png
diff --git a/antora/components/userguide/modules/btb/assets/images/runtime/web-xml/parts.pptx b/antora/components/userguide/modules/btb/images/runtime/web-xml/parts.pptx
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/images/runtime/web-xml/parts.pptx
rename to antora/components/userguide/modules/btb/images/runtime/web-xml/parts.pptx
diff --git a/antora/components/userguide/modules/btb/assets/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 antora/components/userguide/modules/btb/assets/images/runtime/web-xml/ro-only.png
rename to antora/components/userguide/modules/btb/images/runtime/web-xml/ro-only.png
diff --git a/antora/components/userguide/modules/btb/assets/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 antora/components/userguide/modules/btb/assets/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/antora/components/userguide/modules/btb/assets/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 antora/components/userguide/modules/btb/assets/images/runtime/web-xml/wicket-only.png
rename to antora/components/userguide/modules/btb/images/runtime/web-xml/wicket-only.png
diff --git a/antora/components/userguide/modules/fun/_attributes.adoc b/antora/components/userguide/modules/fun/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/antora/components/userguide/modules/fun/_attributes.adoc
+++ b/antora/components/userguide/modules/fun/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/userguide/modules/fun/assets/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 antora/components/userguide/modules/fun/assets/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/antora/components/userguide/modules/fun/assets/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 antora/components/userguide/modules/fun/assets/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/antora/components/userguide/modules/fun/assets/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 antora/components/userguide/modules/fun/assets/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/antora/components/userguide/modules/fun/assets/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 antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.png
rename to antora/components/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.png
diff --git a/antora/components/userguide/modules/fun/assets/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 antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/decoupled-applications.pptx
rename to antora/components/userguide/modules/fun/images/core-concepts/philosophy/decoupled-applications.pptx
diff --git a/antora/components/userguide/modules/fun/assets/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 antora/components/userguide/modules/fun/assets/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/antora/components/userguide/modules/fun/assets/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 antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.png
rename to antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.png
diff --git a/antora/components/userguide/modules/fun/assets/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 antora/components/userguide/modules/fun/assets/images/core-concepts/philosophy/hexagonal-architecture.pptx
rename to antora/components/userguide/modules/fun/images/core-concepts/philosophy/hexagonal-architecture.pptx
diff --git a/antora/components/userguide/modules/fun/assets/images/programming-model/todoapp-Dashboard.png b/antora/components/userguide/modules/fun/images/programming-model/todoapp-Dashboard.png
similarity index 100%
rename from antora/components/userguide/modules/fun/assets/images/programming-model/todoapp-Dashboard.png
rename to antora/components/userguide/modules/fun/images/programming-model/todoapp-Dashboard.png
diff --git a/core/applib/_adoc/modules/ROOT/_attributes.adoc b/core/applib/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/applib/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/applib/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/applib/_adoc/modules/ant/_attributes.adoc b/core/applib/_adoc/modules/ant/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/applib/_adoc/modules/ant/_attributes.adoc
+++ b/core/applib/_adoc/modules/ant/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/model/assets/attachments/.gitkeep b/core/applib/_adoc/modules/ant/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/model/assets/attachments/.gitkeep
rename to core/applib/_adoc/modules/ant/attachments/.gitkeep
diff --git a/extensions/secman/_adoc/modules/encryption-jbcrypt/assets/images/.gitkeep b/core/applib/_adoc/modules/ant/images/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/encryption-jbcrypt/assets/images/.gitkeep
rename to core/applib/_adoc/modules/ant/images/.gitkeep
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainObjectLayout/bookmarking.png b/core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/bookmarking.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainObjectLayout/bookmarking.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/bookmarking.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/position-BELOW.png b/core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/position-BELOW.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/position-BELOW.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/position-BELOW.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/position-PANEL.png b/core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/position-PANEL.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/position-PANEL.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/position-PANEL.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png b/core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/position-RIGHT.png b/core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/position-RIGHT.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/position-RIGHT.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/ActionLayout/position-RIGHT.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/CollectionLayout/sortedby-dependencies.png b/core/applib/_adoc/modules/ant/images/reference-annotations/CollectionLayout/sortedby-dependencies.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/CollectionLayout/sortedby-dependencies.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/CollectionLayout/sortedby-dependencies.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png b/core/applib/_adoc/modules/ant/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/bookmarking.png b/core/applib/_adoc/modules/ant/images/reference-annotations/DomainObjectLayout/bookmarking.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/ActionLayout/bookmarking.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/DomainObjectLayout/bookmarking.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-primary.png b/core/applib/_adoc/modules/ant/images/reference-annotations/DomainServiceLayout/menuBar-primary.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-primary.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/DomainServiceLayout/menuBar-primary.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png b/core/applib/_adoc/modules/ant/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png b/core/applib/_adoc/modules/ant/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuOrder.png b/core/applib/_adoc/modules/ant/images/reference-annotations/DomainServiceLayout/menuOrder.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/DomainServiceLayout/menuOrder.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/DomainServiceLayout/menuOrder.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/HomePage/HomePage.png b/core/applib/_adoc/modules/ant/images/reference-annotations/HomePage/HomePage.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/HomePage/HomePage.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/HomePage/HomePage.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png b/core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-NONE.png b/core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-NONE.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-NONE.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-NONE.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-TOP.png b/core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-TOP.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-TOP.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-TOP.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png b/core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png
diff --git a/core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png b/core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png
rename to core/applib/_adoc/modules/ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png
diff --git a/core/applib/_adoc/modules/cms/_attributes.adoc b/core/applib/_adoc/modules/cms/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/applib/_adoc/modules/cms/_attributes.adoc
+++ b/core/applib/_adoc/modules/cms/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/encryption-jbcrypt/assets/attachments/.gitkeep b/core/applib/_adoc/modules/cms/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/encryption-jbcrypt/assets/attachments/.gitkeep
rename to core/applib/_adoc/modules/cms/attachments/.gitkeep
diff --git a/core/schema/_adoc/modules/ROOT/assets/images/reference-classes/issue-in-more-detail.png b/core/applib/_adoc/modules/cms/images/reference-classes/issue-in-more-detail.png
similarity index 100%
rename from core/schema/_adoc/modules/ROOT/assets/images/reference-classes/issue-in-more-detail.png
rename to core/applib/_adoc/modules/cms/images/reference-classes/issue-in-more-detail.png
diff --git a/core/schema/_adoc/modules/ROOT/assets/images/reference-methods/prefixes/choices/dependent.png b/core/applib/_adoc/modules/cms/images/reference-methods/prefixes/choices/dependent.png
similarity index 100%
rename from core/schema/_adoc/modules/ROOT/assets/images/reference-methods/prefixes/choices/dependent.png
rename to core/applib/_adoc/modules/cms/images/reference-methods/prefixes/choices/dependent.png
diff --git a/core/schema/_adoc/modules/ROOT/assets/images/reference-methods/reserved/cssClass/strikethrough.png b/core/applib/_adoc/modules/cms/images/reference-methods/reserved/cssClass/strikethrough.png
similarity index 100%
rename from core/schema/_adoc/modules/ROOT/assets/images/reference-methods/reserved/cssClass/strikethrough.png
rename to core/applib/_adoc/modules/cms/images/reference-methods/reserved/cssClass/strikethrough.png
diff --git a/core/schema/_adoc/modules/ROOT/assets/images/reference-methods/reserved/iconName/differing.pdn b/core/applib/_adoc/modules/cms/images/reference-methods/reserved/iconName/differing.pdn
similarity index 100%
rename from core/schema/_adoc/modules/ROOT/assets/images/reference-methods/reserved/iconName/differing.pdn
rename to core/applib/_adoc/modules/cms/images/reference-methods/reserved/iconName/differing.pdn
diff --git a/core/schema/_adoc/modules/ROOT/assets/images/reference-methods/reserved/iconName/differing.png b/core/applib/_adoc/modules/cms/images/reference-methods/reserved/iconName/differing.png
similarity index 100%
rename from core/schema/_adoc/modules/ROOT/assets/images/reference-methods/reserved/iconName/differing.png
rename to core/applib/_adoc/modules/cms/images/reference-methods/reserved/iconName/differing.png
diff --git a/core/schema/_adoc/modules/ROOT/assets/images/reference-methods/reserved/iconName/png-files.png b/core/applib/_adoc/modules/cms/images/reference-methods/reserved/iconName/png-files.png
similarity index 100%
rename from core/schema/_adoc/modules/ROOT/assets/images/reference-methods/reserved/iconName/png-files.png
rename to core/applib/_adoc/modules/cms/images/reference-methods/reserved/iconName/png-files.png
diff --git a/core/schema/_adoc/modules/ROOT/assets/images/value-types/markup.png b/core/applib/_adoc/modules/cms/images/value-types/markup.png
similarity index 100%
rename from core/schema/_adoc/modules/ROOT/assets/images/value-types/markup.png
rename to core/applib/_adoc/modules/cms/images/value-types/markup.png
diff --git a/core/applib/_adoc/modules/svc/_attributes.adoc b/core/applib/_adoc/modules/svc/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/applib/_adoc/modules/svc/_attributes.adoc
+++ b/core/applib/_adoc/modules/svc/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/api/assets/images/.gitkeep b/core/applib/_adoc/modules/svc/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/api/assets/images/.gitkeep
rename to core/applib/_adoc/modules/svc/attachments/.gitkeep
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services-api/acceptheaderservice.png b/core/applib/_adoc/modules/svc/images/reference-services-api/acceptheaderservice.png
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services-api/acceptheaderservice.png
rename to core/applib/_adoc/modules/svc/images/reference-services-api/acceptheaderservice.png
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services-api/acceptheaderservice.pptx b/core/applib/_adoc/modules/svc/images/reference-services-api/acceptheaderservice.pptx
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services-api/acceptheaderservice.pptx
rename to core/applib/_adoc/modules/svc/images/reference-services-api/acceptheaderservice.pptx
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services-spi/ErrorReportingService/kitchensink-example.png b/core/applib/_adoc/modules/svc/images/reference-services-spi/ErrorReportingService/kitchensink-example.png
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services-spi/ErrorReportingService/kitchensink-example.png
rename to core/applib/_adoc/modules/svc/images/reference-services-spi/ErrorReportingService/kitchensink-example.png
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png b/core/applib/_adoc/modules/svc/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png
rename to core/applib/_adoc/modules/svc/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png b/core/applib/_adoc/modules/svc/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png
rename to core/applib/_adoc/modules/svc/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png b/core/applib/_adoc/modules/svc/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png
rename to core/applib/_adoc/modules/svc/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services-spi/UserProfileService/todoapp.png b/core/applib/_adoc/modules/svc/images/reference-services-spi/UserProfileService/todoapp.png
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services-spi/UserProfileService/todoapp.png
rename to core/applib/_adoc/modules/svc/images/reference-services-spi/UserProfileService/todoapp.png
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services/categories.png b/core/applib/_adoc/modules/svc/images/reference-services/categories.png
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services/categories.png
rename to core/applib/_adoc/modules/svc/images/reference-services/categories.png
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services/categories.pptx b/core/applib/_adoc/modules/svc/images/reference-services/categories.pptx
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services/categories.pptx
rename to core/applib/_adoc/modules/svc/images/reference-services/categories.pptx
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services/commands-and-events.png b/core/applib/_adoc/modules/svc/images/reference-services/commands-and-events.png
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services/commands-and-events.png
rename to core/applib/_adoc/modules/svc/images/reference-services/commands-and-events.png
diff --git a/core/applib/_adoc/modules/svc/assets/images/reference-services/commands-and-events.pptx b/core/applib/_adoc/modules/svc/images/reference-services/commands-and-events.pptx
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/images/reference-services/commands-and-events.pptx
rename to core/applib/_adoc/modules/svc/images/reference-services/commands-and-events.pptx
diff --git a/core/config/_adoc/modules/ROOT/_attributes.adoc b/core/config/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/config/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/config/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/api/assets/attachments/.gitkeep b/core/config/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/api/assets/attachments/.gitkeep
rename to core/config/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/extensions/secman/_adoc/modules/ROOT/assets/images/.gitkeep b/core/config/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/ROOT/assets/images/.gitkeep
rename to core/config/_adoc/modules/ROOT/images/.gitkeep
diff --git a/core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc b/core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/plugins/jdo/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/secman/_adoc/modules/ROOT/assets/attachments/.gitkeep b/core/plugins/jdo/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/secman/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to core/plugins/jdo/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/plugins/jdo/_adoc/modules/ROOT/assets/images/hints-n-tips/diagnosing-n-plus-1.png b/core/plugins/jdo/_adoc/modules/ROOT/images/hints-n-tips/diagnosing-n-plus-1.png
similarity index 100%
rename from core/plugins/jdo/_adoc/modules/ROOT/assets/images/hints-n-tips/diagnosing-n-plus-1.png
rename to core/plugins/jdo/_adoc/modules/ROOT/images/hints-n-tips/diagnosing-n-plus-1.png
diff --git a/core/plugins/jdo/_adoc/modules/ROOT/assets/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png b/core/plugins/jdo/_adoc/modules/ROOT/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png
similarity index 100%
rename from core/plugins/jdo/_adoc/modules/ROOT/assets/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png
rename to core/plugins/jdo/_adoc/modules/ROOT/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png
diff --git a/core/runtime-services/_adoc/modules/ROOT/_attributes.adoc b/core/runtime-services/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/runtime-services/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/runtime-services/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/markdown/_adoc/modules/ROOT/assets/images/.gitkeep b/core/runtime-services/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/markdown/_adoc/modules/ROOT/assets/images/.gitkeep
rename to core/runtime-services/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/accept-json.png b/core/runtime-services/_adoc/modules/ROOT/images/ContentNegotiationService/accept-json.png
similarity index 100%
rename from core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/accept-json.png
rename to core/runtime-services/_adoc/modules/ROOT/images/ContentNegotiationService/accept-json.png
diff --git a/core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/accept-xml.png b/core/runtime-services/_adoc/modules/ROOT/images/ContentNegotiationService/accept-xml.png
similarity index 100%
rename from core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/accept-xml.png
rename to core/runtime-services/_adoc/modules/ROOT/images/ContentNegotiationService/accept-xml.png
diff --git a/core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/facade-choices.png b/core/runtime-services/_adoc/modules/ROOT/images/ContentNegotiationService/facade-choices.png
similarity index 100%
rename from core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/facade-choices.png
rename to core/runtime-services/_adoc/modules/ROOT/images/ContentNegotiationService/facade-choices.png
diff --git a/core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/facade-choices.pptx b/core/runtime-services/_adoc/modules/ROOT/images/ContentNegotiationService/facade-choices.pptx
similarity index 100%
rename from core/runtime-services/_adoc/modules/ROOT/assets/images/ContentNegotiationService/facade-choices.pptx
rename to core/runtime-services/_adoc/modules/ROOT/images/ContentNegotiationService/facade-choices.pptx
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/assets/images/rgfis/service-collaborations.png b/core/runtime-services/_adoc/modules/ROOT/images/RepresentationService/service-collaborations.png
similarity index 100%
rename from core/viewer-restfulobjects/_adoc/modules/ROOT/assets/images/rgfis/service-collaborations.png
rename to core/runtime-services/_adoc/modules/ROOT/images/RepresentationService/service-collaborations.png
diff --git a/core/runtime-services/_adoc/modules/ROOT/assets/images/RepresentationService/service-collaborations.pptx b/core/runtime-services/_adoc/modules/ROOT/images/RepresentationService/service-collaborations.pptx
similarity index 100%
rename from core/runtime-services/_adoc/modules/ROOT/assets/images/RepresentationService/service-collaborations.pptx
rename to core/runtime-services/_adoc/modules/ROOT/images/RepresentationService/service-collaborations.pptx
diff --git a/core/schema/_adoc/modules/ROOT/_attributes.adoc b/core/schema/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/schema/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/schema/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/markdown/_adoc/modules/ROOT/assets/attachments/.gitkeep b/core/schema/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/markdown/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to core/schema/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/applib/_adoc/modules/cms/assets/images/reference-classes/issue-in-more-detail.png b/core/schema/_adoc/modules/ROOT/images/reference-classes/issue-in-more-detail.png
similarity index 100%
rename from core/applib/_adoc/modules/cms/assets/images/reference-classes/issue-in-more-detail.png
rename to core/schema/_adoc/modules/ROOT/images/reference-classes/issue-in-more-detail.png
diff --git a/core/applib/_adoc/modules/cms/assets/images/reference-methods/prefixes/choices/dependent.png b/core/schema/_adoc/modules/ROOT/images/reference-methods/prefixes/choices/dependent.png
similarity index 100%
rename from core/applib/_adoc/modules/cms/assets/images/reference-methods/prefixes/choices/dependent.png
rename to core/schema/_adoc/modules/ROOT/images/reference-methods/prefixes/choices/dependent.png
diff --git a/core/applib/_adoc/modules/cms/assets/images/reference-methods/reserved/cssClass/strikethrough.png b/core/schema/_adoc/modules/ROOT/images/reference-methods/reserved/cssClass/strikethrough.png
similarity index 100%
rename from core/applib/_adoc/modules/cms/assets/images/reference-methods/reserved/cssClass/strikethrough.png
rename to core/schema/_adoc/modules/ROOT/images/reference-methods/reserved/cssClass/strikethrough.png
diff --git a/core/applib/_adoc/modules/cms/assets/images/reference-methods/reserved/iconName/differing.pdn b/core/schema/_adoc/modules/ROOT/images/reference-methods/reserved/iconName/differing.pdn
similarity index 100%
rename from core/applib/_adoc/modules/cms/assets/images/reference-methods/reserved/iconName/differing.pdn
rename to core/schema/_adoc/modules/ROOT/images/reference-methods/reserved/iconName/differing.pdn
diff --git a/core/applib/_adoc/modules/cms/assets/images/reference-methods/reserved/iconName/differing.png b/core/schema/_adoc/modules/ROOT/images/reference-methods/reserved/iconName/differing.png
similarity index 100%
rename from core/applib/_adoc/modules/cms/assets/images/reference-methods/reserved/iconName/differing.png
rename to core/schema/_adoc/modules/ROOT/images/reference-methods/reserved/iconName/differing.png
diff --git a/core/applib/_adoc/modules/cms/assets/images/reference-methods/reserved/iconName/png-files.png b/core/schema/_adoc/modules/ROOT/images/reference-methods/reserved/iconName/png-files.png
similarity index 100%
rename from core/applib/_adoc/modules/cms/assets/images/reference-methods/reserved/iconName/png-files.png
rename to core/schema/_adoc/modules/ROOT/images/reference-methods/reserved/iconName/png-files.png
diff --git a/core/applib/_adoc/modules/cms/assets/images/value-types/markup.png b/core/schema/_adoc/modules/ROOT/images/value-types/markup.png
similarity index 100%
rename from core/applib/_adoc/modules/cms/assets/images/value-types/markup.png
rename to core/schema/_adoc/modules/ROOT/images/value-types/markup.png
diff --git a/core/security/api/_adoc/modules/ROOT/_attributes.adoc b/core/security/api/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/security/api/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/security/api/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/security/api/_adoc/modules/ROOT/assets/attachments/security-apis-impl.pptx b/core/security/api/_adoc/modules/ROOT/attachments/security-apis-impl.pptx
similarity index 100%
rename from core/security/api/_adoc/modules/ROOT/assets/attachments/security-apis-impl.pptx
rename to core/security/api/_adoc/modules/ROOT/attachments/security-apis-impl.pptx
diff --git a/extensions/incubator/_adoc/modules/ROOT/assets/images/.gitkeep b/core/security/api/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from extensions/incubator/_adoc/modules/ROOT/assets/images/.gitkeep
rename to core/security/api/_adoc/modules/ROOT/images/.gitkeep
diff --git a/core/security/bypass/_adoc/modules/ROOT/_attributes.adoc b/core/security/bypass/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/security/bypass/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/security/bypass/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/incubator/_adoc/modules/ROOT/assets/attachments/.gitkeep b/core/security/bypass/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/incubator/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to core/security/bypass/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/security/bypass/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG b/core/security/bypass/_adoc/modules/ROOT/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
similarity index 100%
rename from core/security/bypass/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
rename to core/security/bypass/_adoc/modules/ROOT/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
diff --git a/core/security/shiro/_adoc/modules/ROOT/_attributes.adoc b/core/security/shiro/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/security/shiro/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/security/shiro/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/images/.gitkeep b/core/security/shiro/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/images/.gitkeep
rename to core/security/shiro/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-groups.png b/core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-groups.png
rename to core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-mojo-partition.png b/core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-mojo-partition.png
rename to core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-mojo-root-dse.png b/core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-mojo-root-dse.png
rename to core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-sasl-authentication.png b/core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-sasl-authentication.png
rename to core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-users.png b/core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/realm-ldap/assets/images/activeds-ldap-users.png
rename to core/security/shiro/_adoc/modules/ROOT/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-shiro.png b/core/security/shiro/_adoc/modules/ROOT/images/security/security-apis-impl/configure-isis-to-use-shiro.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-isis-to-use-shiro.png
rename to core/security/shiro/_adoc/modules/ROOT/images/security/security-apis-impl/configure-isis-to-use-shiro.png
diff --git a/core/security/shiro/_adoc/modules/realm-jdbc/assets/images/configure-shiro-to-use-custom-jdbc-realm.png b/core/security/shiro/_adoc/modules/ROOT/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/realm-jdbc/assets/images/configure-shiro-to-use-custom-jdbc-realm.png
rename to core/security/shiro/_adoc/modules/ROOT/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG b/core/security/shiro/_adoc/modules/ROOT/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG
rename to core/security/shiro/_adoc/modules/ROOT/images/security/security-apis-impl/configure-shiro-to-use-ini-realm.PNG
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/assets/images/configure-shiro-to-use-isis-ldap-realm.PNG b/core/security/shiro/_adoc/modules/ROOT/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG
similarity index 100%
rename from core/security/shiro/_adoc/modules/realm-ldap/assets/images/configure-shiro-to-use-isis-ldap-realm.PNG
rename to core/security/shiro/_adoc/modules/ROOT/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG
diff --git a/core/security/shiro/_adoc/modules/realm-jdbc/_attributes.adoc b/core/security/shiro/_adoc/modules/realm-jdbc/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/security/shiro/_adoc/modules/realm-jdbc/_attributes.adoc
+++ b/core/security/shiro/_adoc/modules/realm-jdbc/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/attachments/.gitkeep b/core/security/shiro/_adoc/modules/realm-jdbc/attachments/.gitkeep
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to core/security/shiro/_adoc/modules/realm-jdbc/attachments/.gitkeep
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png b/core/security/shiro/_adoc/modules/realm-jdbc/images/configure-shiro-to-use-custom-jdbc-realm.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-custom-jdbc-realm.png
rename to core/security/shiro/_adoc/modules/realm-jdbc/images/configure-shiro-to-use-custom-jdbc-realm.png
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/_attributes.adoc b/core/security/shiro/_adoc/modules/realm-ldap/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/security/shiro/_adoc/modules/realm-ldap/_attributes.adoc
+++ b/core/security/shiro/_adoc/modules/realm-ldap/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/asciidoc/_adoc/modules/ROOT/assets/images/.gitkeep b/core/security/shiro/_adoc/modules/realm-ldap/attachments/.gitkeep
similarity index 100%
rename from extensions/asciidoc/_adoc/modules/ROOT/assets/images/.gitkeep
rename to core/security/shiro/_adoc/modules/realm-ldap/attachments/.gitkeep
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png b/core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-groups.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-groups.png
rename to core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-groups.png
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png b/core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-mojo-partition.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-partition.png
rename to core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-mojo-partition.png
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png b/core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-mojo-root-dse.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-mojo-root-dse.png
rename to core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-mojo-root-dse.png
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png b/core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-sasl-authentication.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-sasl-authentication.png
rename to core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-sasl-authentication.png
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png b/core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-users.png
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/images/configuration/configuring-shiro/ldap/activeds-ldap-users.png
rename to core/security/shiro/_adoc/modules/realm-ldap/images/activeds-ldap-users.png
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG b/core/security/shiro/_adoc/modules/realm-ldap/images/configure-shiro-to-use-isis-ldap-realm.PNG
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/images/security/security-apis-impl/configure-shiro-to-use-isis-ldap-realm.PNG
rename to core/security/shiro/_adoc/modules/realm-ldap/images/configure-shiro-to-use-isis-ldap-realm.PNG
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc b/core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/testsupport/integtestsupport/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/extensions/asciidoc/_adoc/modules/ROOT/assets/attachments/.gitkeep b/core/testsupport/integtestsupport/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from extensions/asciidoc/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to core/testsupport/integtestsupport/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/assets/images/integ-tests.png b/core/testsupport/integtestsupport/_adoc/modules/ROOT/images/integ-tests.png
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/assets/images/integ-tests.png
rename to core/testsupport/integtestsupport/_adoc/modules/ROOT/images/integ-tests.png
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/assets/images/integ-tests.pptx b/core/testsupport/integtestsupport/_adoc/modules/ROOT/images/integ-tests.pptx
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/assets/images/integ-tests.pptx
rename to core/testsupport/integtestsupport/_adoc/modules/ROOT/images/integ-tests.pptx
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/assets/images/wrapper-factory.png b/core/testsupport/integtestsupport/_adoc/modules/ROOT/images/wrapper-factory.png
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/assets/images/wrapper-factory.png
rename to core/testsupport/integtestsupport/_adoc/modules/ROOT/images/wrapper-factory.png
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc b/core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc
+++ b/core/testsupport/integtestsupport/_adoc/modules/mvn/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/examples/smoketests/_adoc/modules/ROOT/assets/images/.gitkeep b/core/testsupport/integtestsupport/_adoc/modules/mvn/attachments/.gitkeep
similarity index 100%
rename from examples/smoketests/_adoc/modules/ROOT/assets/images/.gitkeep
rename to core/testsupport/integtestsupport/_adoc/modules/mvn/attachments/.gitkeep
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/assets/images/maven-plugin/xsd-goal.png b/core/testsupport/integtestsupport/_adoc/modules/mvn/images/maven-plugin/xsd-goal.png
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/assets/images/maven-plugin/xsd-goal.png
rename to core/testsupport/integtestsupport/_adoc/modules/mvn/images/maven-plugin/xsd-goal.png
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/assets/images/maven-plugin/xsd-goal.pptx b/core/testsupport/integtestsupport/_adoc/modules/mvn/images/maven-plugin/xsd-goal.pptx
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/assets/images/maven-plugin/xsd-goal.pptx
rename to core/testsupport/integtestsupport/_adoc/modules/mvn/images/maven-plugin/xsd-goal.pptx
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc b/core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/testsupport/unittestsupport/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/examples/smoketests/_adoc/modules/ROOT/assets/attachments/.gitkeep b/core/testsupport/unittestsupport/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from examples/smoketests/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to core/testsupport/unittestsupport/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/.gitkeep b/core/testsupport/unittestsupport/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/.gitkeep
rename to core/testsupport/unittestsupport/_adoc/modules/ROOT/images/.gitkeep
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/_attributes.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/attachments/.gitkeep b/core/viewer-restfulobjects/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/assets/images/restfulobjects/ro-spec-resources-and-representations.png b/core/viewer-restfulobjects/_adoc/modules/ROOT/images/restfulobjects/ro-spec-resources-and-representations.png
similarity index 100%
rename from core/viewer-restfulobjects/_adoc/modules/ROOT/assets/images/restfulobjects/ro-spec-resources-and-representations.png
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/images/restfulobjects/ro-spec-resources-and-representations.png
diff --git a/core/runtime-services/_adoc/modules/ROOT/assets/images/RepresentationService/service-collaborations.png b/core/viewer-restfulobjects/_adoc/modules/ROOT/images/rgfis/service-collaborations.png
similarity index 100%
rename from core/runtime-services/_adoc/modules/ROOT/assets/images/RepresentationService/service-collaborations.png
rename to core/viewer-restfulobjects/_adoc/modules/ROOT/images/rgfis/service-collaborations.png
diff --git a/core/viewer-restfulobjects/_adoc/modules/security/_attributes.adoc b/core/viewer-restfulobjects/_adoc/modules/security/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/viewer-restfulobjects/_adoc/modules/security/_attributes.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/security/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/viewer-wicket/_adoc/modules/security/assets/images/.gitkeep b/core/viewer-restfulobjects/_adoc/modules/security/attachments/.gitkeep
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/security/assets/images/.gitkeep
rename to core/viewer-restfulobjects/_adoc/modules/security/attachments/.gitkeep
diff --git a/core/viewer-wicket/_adoc/modules/security/assets/attachments/.gitkeep b/core/viewer-restfulobjects/_adoc/modules/security/images/.gitkeep
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/security/assets/attachments/.gitkeep
rename to core/viewer-restfulobjects/_adoc/modules/security/images/.gitkeep
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc b/core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc
+++ b/core/viewer-wicket/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/attachments/.gitkeep b/core/viewer-wicket/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to core/viewer-wicket/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/about-page/about-page.png b/core/viewer-wicket/_adoc/modules/ROOT/images/about-page/about-page.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/about-page/about-page.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/about-page/about-page.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/dividers.png b/core/viewer-wicket/_adoc/modules/ROOT/images/application-menu/dividers.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/dividers.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/application-menu/dividers.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/layout-menus.pdn b/core/viewer-wicket/_adoc/modules/ROOT/images/application-menu/layout-menus.pdn
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/layout-menus.pdn
rename to core/viewer-wicket/_adoc/modules/ROOT/images/application-menu/layout-menus.pdn
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/layout-menus.png b/core/viewer-wicket/_adoc/modules/ROOT/images/application-menu/layout-menus.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/layout-menus.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/application-menu/layout-menus.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/tertiary.png b/core/viewer-wicket/_adoc/modules/ROOT/images/application-menu/tertiary.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/application-menu/tertiary.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/application-menu/tertiary.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/010-attachment-field-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/010-attachment-field-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/010-attachment-field-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/010-attachment-field-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/010-attachment-field.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/010-attachment-field.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/010-attachment-field.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/010-attachment-field.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/020-edit-choose-file.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser-520.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser-520.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser-520.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser-520.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/030-choose-file-using-browser.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/040-edit-chosen-file-indicated.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/050-ok-if-image-then-rendered.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/060-download-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/060-download-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/060-download-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/060-download-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/060-download.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/060-download.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/060-download.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/060-download.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/070-edit-clear-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/070-edit-clear-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/070-edit-clear-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/070-edit-clear-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/070-edit-clear.png b/core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/070-edit-clear.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/blob-attachments/070-edit-clear.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/blob-attachments/070-edit-clear.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/bookmarked-pages/panel-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/bookmarked-pages/panel-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-estatio-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/bookmarked-pages/panel-estatio-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-estatio-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/bookmarked-pages/panel-estatio-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-estatio.png b/core/viewer-wicket/_adoc/modules/ROOT/images/bookmarked-pages/panel-estatio.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel-estatio.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/bookmarked-pages/panel-estatio.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel.png b/core/viewer-wicket/_adoc/modules/ROOT/images/bookmarked-pages/panel.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/bookmarked-pages/panel.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/bookmarked-pages/panel.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/brand-logo/brand-logo-signin.png b/core/viewer-wicket/_adoc/modules/ROOT/images/brand-logo/brand-logo-signin.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/brand-logo/brand-logo-signin.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/brand-logo/brand-logo-signin.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/brand-logo/brand-logo.png b/core/viewer-wicket/_adoc/modules/ROOT/images/brand-logo/brand-logo.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/brand-logo/brand-logo.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/brand-logo/brand-logo.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/010-copy-link-button-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/010-copy-link-button-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/010-copy-link-button-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/010-copy-link-button-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/010-copy-link-button.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/010-copy-link-button.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/010-copy-link-button.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/010-copy-link-button.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/020-copy-link-dialog-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/020-copy-link-dialog-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/020-copy-link-dialog-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/020-copy-link-dialog-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/020-copy-link-dialog.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/020-copy-link-dialog.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/020-copy-link-dialog.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/020-copy-link-dialog.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/030-hints-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/030-hints-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/030-hints-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/030-hints-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/030-hints.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/030-hints.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/030-hints.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/030-hints.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/040-copy-link-with-hints.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/050-title-url-940.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/050-title-url-940.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/050-title-url-940.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/050-title-url-940.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/050-title-url.png b/core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/050-title-url.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/copy-link/050-title-url.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/copy-link/050-title-url.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/dialog-mode/modal.png b/core/viewer-wicket/_adoc/modules/ROOT/images/dialog-mode/modal.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/dialog-mode/modal.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/dialog-mode/modal.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/dialog-mode/sidebar.png b/core/viewer-wicket/_adoc/modules/ROOT/images/dialog-mode/sidebar.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/dialog-mode/sidebar.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/dialog-mode/sidebar.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-footer.png b/core/viewer-wicket/_adoc/modules/ROOT/images/embedded-view/no-footer.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-footer.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/embedded-view/no-footer.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-header-no-footer.png b/core/viewer-wicket/_adoc/modules/ROOT/images/embedded-view/no-header-no-footer.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-header-no-footer.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/embedded-view/no-header-no-footer.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-header.png b/core/viewer-wicket/_adoc/modules/ROOT/images/embedded-view/no-header.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/no-header.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/embedded-view/no-header.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/regular.png b/core/viewer-wicket/_adoc/modules/ROOT/images/embedded-view/regular.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/embedded-view/regular.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/embedded-view/regular.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/features/recent-pages/recent-pages.png b/core/viewer-wicket/_adoc/modules/ROOT/images/features/recent-pages/recent-pages.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/features/recent-pages/recent-pages.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/features/recent-pages/recent-pages.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png b/core/viewer-wicket/_adoc/modules/ROOT/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layout-dynamic-xml/ToDoAppDashboard.png b/core/viewer-wicket/_adoc/modules/ROOT/images/layout-dynamic-xml/ToDoAppDashboard.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/layout-dynamic-xml/ToDoAppDashboard.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/layout-dynamic-xml/ToDoAppDashboard.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layout-dynamic-xml/ToDoItem.png b/core/viewer-wicket/_adoc/modules/ROOT/images/layout-dynamic-xml/ToDoItem.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/layout-dynamic-xml/ToDoItem.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/layout-dynamic-xml/ToDoItem.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/customer-order.png b/core/viewer-wicket/_adoc/modules/ROOT/images/layouts/customer-order.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/customer-order.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/layouts/customer-order.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-Invoice.png b/core/viewer-wicket/_adoc/modules/ROOT/images/layouts/estatio-Invoice.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-Invoice.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/layouts/estatio-Invoice.png
diff --git a/antora/components/toc/modules/devguide/assets/images/layouts/estatio-Lease.png b/core/viewer-wicket/_adoc/modules/ROOT/images/layouts/estatio-Lease.png
similarity index 100%
rename from antora/components/toc/modules/devguide/assets/images/layouts/estatio-Lease.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/layouts/estatio-Lease.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-LeaseItem.png b/core/viewer-wicket/_adoc/modules/ROOT/images/layouts/estatio-LeaseItem.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/estatio-LeaseItem.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/layouts/estatio-LeaseItem.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/todoapp-ToDoItem.png b/core/viewer-wicket/_adoc/modules/ROOT/images/layouts/todoapp-ToDoItem.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/layouts/todoapp-ToDoItem.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/layouts/todoapp-ToDoItem.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/menubars/010-download.png b/core/viewer-wicket/_adoc/modules/ROOT/images/menubars/010-download.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/menubars/010-download.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/menubars/010-download.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/menubars/020-download.png b/core/viewer-wicket/_adoc/modules/ROOT/images/menubars/020-download.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/menubars/020-download.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/menubars/020-download.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/4-0-8-0.png b/core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/4-0-8-0.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/4-0-8-0.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/4-0-8-0.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/4-4-4-12.png b/core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/4-4-4-12.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/4-4-4-12.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/4-4-4-12.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/6-6-0-12.png b/core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/6-6-0-12.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/6-6-0-12.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/6-6-0-12.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/isis-layout-show-facets.css b/core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/isis-layout-show-facets.css
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/isis-layout-show-facets.css
rename to core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/isis-layout-show-facets.css
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/isis-layout.css b/core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/isis-layout.css
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/isis-layout.css
rename to core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/isis-layout.css
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-4-0-8-0.html b/core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/layout-4-0-8-0.html
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-4-0-8-0.html
rename to core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/layout-4-0-8-0.html
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-4-4-4-12.html b/core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/layout-4-4-4-12.html
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-4-4-4-12.html
rename to core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/layout-4-4-4-12.html
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-6-6-0-12.html b/core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/layout-6-6-0-12.html
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/reference-layout/layout-6-6-0-12.html
rename to core/viewer-wicket/_adoc/modules/ROOT/images/reference-layout/layout-6-6-0-12.html
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/login-page-default.png b/core/viewer-wicket/_adoc/modules/ROOT/images/suppress-password-reset/login-page-default.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/login-page-default.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/suppress-password-reset/login-page-default.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-password-reset/login-page-suppress-password-reset.png b/core/viewer-wicket/_adoc/modules/ROOT/images/suppress-password-reset/login-page-suppress-password-reset.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-password-reset/login-page-suppress-password-reset.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/suppress-password-reset/login-page-suppress-password-reset.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-sign-up/login-page-default.png b/core/viewer-wicket/_adoc/modules/ROOT/images/suppress-remember-me/login-page-default.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-sign-up/login-page-default.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/suppress-remember-me/login-page-default.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-remember-me/login-page-suppress-remember-me.png b/core/viewer-wicket/_adoc/modules/ROOT/images/suppress-remember-me/login-page-suppress-remember-me.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-remember-me/login-page-suppress-remember-me.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/suppress-remember-me/login-page-suppress-remember-me.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-remember-me/login-page-default.png b/core/viewer-wicket/_adoc/modules/ROOT/images/suppress-sign-up/login-page-default.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-remember-me/login-page-default.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/suppress-sign-up/login-page-default.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-sign-up/login-page-suppress-sign-up.png b/core/viewer-wicket/_adoc/modules/ROOT/images/suppress-sign-up/login-page-suppress-sign-up.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-sign-up/login-page-suppress-sign-up.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/suppress-sign-up/login-page-suppress-sign-up.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/theme-chooser/example-1.png b/core/viewer-wicket/_adoc/modules/ROOT/images/theme-chooser/example-1.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/theme-chooser/example-1.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/theme-chooser/example-1.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/theme-chooser/example-2.png b/core/viewer-wicket/_adoc/modules/ROOT/images/theme-chooser/example-2.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/theme-chooser/example-2.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/theme-chooser/example-2.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-password-reset/login-page-default.png b/core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/login-page-default.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/suppress-password-reset/login-page-default.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/login-page-default.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-after-registration.png b/core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-after-registration.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-after-registration.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-after-registration.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-email-with-verification-link.png b/core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-email-with-verification-link.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-email-with-verification-link.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-email-with-verification-link.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-login-page-after-sign-up.png b/core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-login-page-after-sign-up.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-login-page-after-sign-up.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-login-page-after-sign-up.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-page.png b/core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-page.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-page.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-page.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-registration-page.png b/core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-registration-page.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/user-registration/sign-up-registration-page.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/user-registration/sign-up-registration-page.png
diff --git a/core/viewer-wicket/_adoc/modules/ROOT/assets/images/where-am-i/hello_grey_bg.png b/core/viewer-wicket/_adoc/modules/ROOT/images/where-am-i/hello_grey_bg.png
similarity index 100%
rename from core/viewer-wicket/_adoc/modules/ROOT/assets/images/where-am-i/hello_grey_bg.png
rename to core/viewer-wicket/_adoc/modules/ROOT/images/where-am-i/hello_grey_bg.png
diff --git a/core/viewer-wicket/_adoc/modules/security/_attributes.adoc b/core/viewer-wicket/_adoc/modules/security/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/core/viewer-wicket/_adoc/modules/security/_attributes.adoc
+++ b/core/viewer-wicket/_adoc/modules/security/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/viewer-restfulobjects/_adoc/modules/security/assets/images/.gitkeep b/core/viewer-wicket/_adoc/modules/security/attachments/.gitkeep
similarity index 100%
rename from core/viewer-restfulobjects/_adoc/modules/security/assets/images/.gitkeep
rename to core/viewer-wicket/_adoc/modules/security/attachments/.gitkeep
diff --git a/core/viewer-restfulobjects/_adoc/modules/security/assets/attachments/.gitkeep b/core/viewer-wicket/_adoc/modules/security/images/.gitkeep
similarity index 100%
rename from core/viewer-restfulobjects/_adoc/modules/security/assets/attachments/.gitkeep
rename to core/viewer-wicket/_adoc/modules/security/images/.gitkeep
diff --git a/examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc b/examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc
+++ b/examples/apps/demo/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/_attributes.adoc b/examples/apps/helloworld/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/examples/apps/helloworld/_adoc/modules/ROOT/_attributes.adoc
+++ b/examples/apps/helloworld/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/assets/attachments/.gitkeep b/examples/apps/helloworld/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from core/viewer-restfulobjects/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to examples/apps/helloworld/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/assets/images/.gitkeep b/examples/apps/helloworld/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from core/testsupport/unittestsupport/_adoc/modules/ROOT/assets/images/.gitkeep
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/.gitkeep
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/helloworld-before-launch.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/helloworld-before-launch.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/helloworld-before-launch.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/helloworld-before-launch.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/helloworld.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/helloworld.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/helloworld.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/helloworld.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/010-root-page.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/010-root-page.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/010-root-page.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/010-root-page.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/020-login-to-wicket-viewer.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/020-login-to-wicket-viewer.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/020-login-to-wicket-viewer.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/020-login-to-wicket-viewer.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/030-home-page.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/030-home-page.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/030-home-page.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/030-home-page.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/040-create-object-from-menu.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/040-create-object-from-menu.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/040-create-object-from-menu.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/040-create-object-from-menu.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/050-create-object-from-menu-prompt.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/050-create-object-from-menu-prompt.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/050-create-object-from-menu-prompt.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/050-create-object-from-menu-prompt.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/060-created-object.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/060-created-object.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/060-created-object.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/060-created-object.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/070-update-name.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/070-update-name.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/070-update-name.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/070-update-name.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/080-edit-notes.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/080-edit-notes.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/080-edit-notes.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/080-edit-notes.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/090-delete-object.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/090-delete-object.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/090-delete-object.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/090-delete-object.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/100-object-deleted.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/100-object-deleted.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/100-object-deleted.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/100-object-deleted.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/200-swagger-ui-before-reload.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/200-swagger-ui-before-reload.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/200-swagger-ui-before-reload.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/200-swagger-ui-before-reload.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/210-helloworld-resources.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/210-helloworld-resources.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/210-helloworld-resources.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/210-helloworld-resources.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/220-create-object-thru-rest-api.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/220-create-object-thru-rest-api.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/220-create-object-thru-rest-api.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/220-create-object-thru-rest-api.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/230-create-object-thru-rest-api-response.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/230-create-object-thru-rest-api-response.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/230-create-object-thru-rest-api-response.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/230-create-object-thru-rest-api-response.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/240-retrieve-object-using-rest-api.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/240-retrieve-object-using-rest-api.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/240-retrieve-object-using-rest-api.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/240-retrieve-object-using-rest-api.png
diff --git a/examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/250-retrieve-object-using-rest-api-response.png b/examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/250-retrieve-object-using-rest-api-response.png
similarity index 100%
rename from examples/apps/helloworld/_adoc/modules/ROOT/assets/images/using-hello-world/250-retrieve-object-using-rest-api-response.png
rename to examples/apps/helloworld/_adoc/modules/ROOT/images/using-hello-world/250-retrieve-object-using-rest-api-response.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/_attributes.adoc b/examples/apps/simpleapp/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/examples/apps/simpleapp/_adoc/modules/ROOT/_attributes.adoc
+++ b/examples/apps/simpleapp/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/dockerhub-tags.png b/examples/apps/simpleapp/_adoc/modules/ROOT/images/dockerhub-tags.png
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/dockerhub-tags.png
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/dockerhub-tags.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/simpleapp-webapp-before-launch.png b/examples/apps/simpleapp/_adoc/modules/ROOT/images/simpleapp-webapp-before-launch.png
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/simpleapp-webapp-before-launch.png
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/simpleapp-webapp-before-launch.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/simpleapp-webapp-with-fixtures.png b/examples/apps/simpleapp/_adoc/modules/ROOT/images/simpleapp-webapp-with-fixtures.png
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/simpleapp-webapp-with-fixtures.png
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/simpleapp-webapp-with-fixtures.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/simpleapp-webapp.png b/examples/apps/simpleapp/_adoc/modules/ROOT/images/simpleapp-webapp.png
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/simpleapp-webapp.png
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/simpleapp-webapp.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/030-home-page.png b/examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/030-home-page.png
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/030-home-page.png
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/030-home-page.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/040-run-fixture-script-menu.png b/examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/040-run-fixture-script-menu.png
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/040-run-fixture-script-menu.png
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/040-run-fixture-script-menu.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/050-run-fixture-script-prompt.png b/examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/050-run-fixture-script-prompt.png
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/050-run-fixture-script-prompt.png
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/050-run-fixture-script-prompt.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/060-run-fixture-script-result.png b/examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/060-run-fixture-script-result.png
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/060-run-fixture-script-result.png
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/060-run-fixture-script-result.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/070-home-page.png b/examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/070-home-page.png
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/070-home-page.png
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/070-home-page.png
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/structure/structure.pptx b/examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/structure/structure.pptx
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/structure/structure.pptx
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/structure/structure.pptx
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/structure/structure/Slide1.PNG b/examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/structure/structure/Slide1.PNG
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/structure/structure/Slide1.PNG
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/structure/structure/Slide1.PNG
diff --git a/examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/structure/structure/Slide2.PNG b/examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/structure/structure/Slide2.PNG
similarity index 100%
rename from examples/apps/simpleapp/_adoc/modules/ROOT/assets/images/using-simple-app/structure/structure/Slide2.PNG
rename to examples/apps/simpleapp/_adoc/modules/ROOT/images/using-simple-app/structure/structure/Slide2.PNG
diff --git a/examples/smoketests/_adoc/modules/ROOT/_attributes.adoc b/examples/smoketests/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/examples/smoketests/_adoc/modules/ROOT/_attributes.adoc
+++ b/examples/smoketests/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/testsupport/unittestsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep b/examples/smoketests/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from core/testsupport/unittestsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to examples/smoketests/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/testsupport/integtestsupport/_adoc/modules/mvn/assets/attachments/.gitkeep b/examples/smoketests/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/mvn/assets/attachments/.gitkeep
rename to examples/smoketests/_adoc/modules/ROOT/images/.gitkeep
diff --git a/extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc b/extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/asciidoc/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/testsupport/integtestsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep b/extensions/asciidoc/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from core/testsupport/integtestsupport/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/asciidoc/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/security/shiro/_adoc/modules/realm-ldap/assets/attachments/.gitkeep b/extensions/asciidoc/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from core/security/shiro/_adoc/modules/realm-ldap/assets/attachments/.gitkeep
rename to extensions/asciidoc/_adoc/modules/ROOT/images/.gitkeep
diff --git a/extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc b/extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/fixtures/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/security/shiro/_adoc/modules/realm-jdbc/assets/attachments/.gitkeep b/extensions/fixtures/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from core/security/shiro/_adoc/modules/realm-jdbc/assets/attachments/.gitkeep
rename to extensions/fixtures/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/security/shiro/_adoc/modules/ROOT/assets/attachments/.gitkeep b/extensions/fixtures/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from core/security/shiro/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/fixtures/_adoc/modules/ROOT/images/.gitkeep
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/images/composite.png b/extensions/fixtures/_adoc/modules/ROOT/images/composite.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/images/composite.png
rename to extensions/fixtures/_adoc/modules/ROOT/images/composite.png
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/images/flat-1.png b/extensions/fixtures/_adoc/modules/ROOT/images/flat-1.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/images/flat-1.png
rename to extensions/fixtures/_adoc/modules/ROOT/images/flat-1.png
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/images/flat-2.png b/extensions/fixtures/_adoc/modules/ROOT/images/flat-2.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/images/flat-2.png
rename to extensions/fixtures/_adoc/modules/ROOT/images/flat-2.png
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/images/organizing-fixture-scripts.pptx b/extensions/fixtures/_adoc/modules/ROOT/images/organizing-fixture-scripts.pptx
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/images/organizing-fixture-scripts.pptx
rename to extensions/fixtures/_adoc/modules/ROOT/images/organizing-fixture-scripts.pptx
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/images/prompt-specifying-number.png b/extensions/fixtures/_adoc/modules/ROOT/images/prompt-specifying-number.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/images/prompt-specifying-number.png
rename to extensions/fixtures/_adoc/modules/ROOT/images/prompt-specifying-number.png
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/images/prompt.png b/extensions/fixtures/_adoc/modules/ROOT/images/prompt.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/images/prompt.png
rename to extensions/fixtures/_adoc/modules/ROOT/images/prompt.png
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/images/prototyping-menu.png b/extensions/fixtures/_adoc/modules/ROOT/images/prototyping-menu.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/images/prototyping-menu.png
rename to extensions/fixtures/_adoc/modules/ROOT/images/prototyping-menu.png
diff --git a/extensions/fixtures/_adoc/modules/ROOT/assets/images/result-list.png b/extensions/fixtures/_adoc/modules/ROOT/images/result-list.png
similarity index 100%
rename from extensions/fixtures/_adoc/modules/ROOT/assets/images/result-list.png
rename to extensions/fixtures/_adoc/modules/ROOT/images/result-list.png
diff --git a/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc b/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/security/bypass/_adoc/modules/ROOT/assets/attachments/.gitkeep b/extensions/incubator/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from core/security/bypass/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/incubator/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/security/api/_adoc/modules/ROOT/assets/images/.gitkeep b/extensions/incubator/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from core/security/api/_adoc/modules/ROOT/assets/images/.gitkeep
rename to extensions/incubator/_adoc/modules/ROOT/images/.gitkeep
diff --git a/extensions/markdown/_adoc/modules/ROOT/_attributes.adoc b/extensions/markdown/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/markdown/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/markdown/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/schema/_adoc/modules/ROOT/assets/attachments/.gitkeep b/extensions/markdown/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from core/schema/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/markdown/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/runtime-services/_adoc/modules/ROOT/assets/attachments/.gitkeep b/extensions/markdown/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from core/runtime-services/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/markdown/_adoc/modules/ROOT/images/.gitkeep
diff --git a/extensions/secman/_adoc/modules/ROOT/_attributes.adoc b/extensions/secman/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/secman/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/plugins/jdo/_adoc/modules/ROOT/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from core/plugins/jdo/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/core/config/_adoc/modules/ROOT/assets/images/.gitkeep b/extensions/secman/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from core/config/_adoc/modules/ROOT/assets/images/.gitkeep
rename to extensions/secman/_adoc/modules/ROOT/images/.gitkeep
diff --git a/extensions/secman/_adoc/modules/api/_attributes.adoc b/extensions/secman/_adoc/modules/api/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/secman/_adoc/modules/api/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/api/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/config/_adoc/modules/ROOT/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/api/attachments/.gitkeep
similarity index 100%
rename from core/config/_adoc/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/api/attachments/.gitkeep
diff --git a/core/applib/_adoc/modules/svc/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/api/images/.gitkeep
similarity index 100%
rename from core/applib/_adoc/modules/svc/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/api/images/.gitkeep
diff --git a/extensions/secman/_adoc/modules/encryption-jbcrypt/_attributes.adoc b/extensions/secman/_adoc/modules/encryption-jbcrypt/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/secman/_adoc/modules/encryption-jbcrypt/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/encryption-jbcrypt/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/applib/_adoc/modules/cms/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/encryption-jbcrypt/attachments/.gitkeep
similarity index 100%
rename from core/applib/_adoc/modules/cms/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/encryption-jbcrypt/attachments/.gitkeep
diff --git a/core/applib/_adoc/modules/ant/assets/images/.gitkeep b/extensions/secman/_adoc/modules/encryption-jbcrypt/images/.gitkeep
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/images/.gitkeep
rename to extensions/secman/_adoc/modules/encryption-jbcrypt/images/.gitkeep
diff --git a/extensions/secman/_adoc/modules/model/_attributes.adoc b/extensions/secman/_adoc/modules/model/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/secman/_adoc/modules/model/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/model/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/core/applib/_adoc/modules/ant/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/model/attachments/.gitkeep
similarity index 100%
rename from core/applib/_adoc/modules/ant/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/model/attachments/.gitkeep
diff --git a/antora/components/userguide/modules/btb/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/model/images/.gitkeep
similarity index 100%
rename from antora/components/userguide/modules/btb/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/model/images/.gitkeep
diff --git a/extensions/secman/_adoc/modules/persistence-jdo/_attributes.adoc b/extensions/secman/_adoc/modules/persistence-jdo/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/secman/_adoc/modules/persistence-jdo/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/persistence-jdo/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/toc/modules/module-template/assets/images/.gitkeep b/extensions/secman/_adoc/modules/persistence-jdo/attachments/.gitkeep
similarity index 100%
rename from antora/components/toc/modules/module-template/assets/images/.gitkeep
rename to extensions/secman/_adoc/modules/persistence-jdo/attachments/.gitkeep
diff --git a/antora/components/toc/modules/module-template/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/persistence-jdo/images/.gitkeep
similarity index 100%
rename from antora/components/toc/modules/module-template/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/persistence-jdo/images/.gitkeep
diff --git a/extensions/secman/_adoc/modules/realm-shiro/_attributes.adoc b/extensions/secman/_adoc/modules/realm-shiro/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/secman/_adoc/modules/realm-shiro/_attributes.adoc
+++ b/extensions/secman/_adoc/modules/realm-shiro/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/toc/modules/comguide/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/realm-shiro/attachments/.gitkeep
similarity index 100%
rename from antora/components/toc/modules/comguide/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/realm-shiro/attachments/.gitkeep
diff --git a/antora/components/toc/modules/ROOT/assets/attachments/.gitkeep b/extensions/secman/_adoc/modules/realm-shiro/images/.gitkeep
similarity index 100%
rename from antora/components/toc/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/secman/_adoc/modules/realm-shiro/images/.gitkeep
diff --git a/extensions/secman/_adoc/modules/realm-shiro/assets/images/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG b/extensions/secman/_adoc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
similarity index 100%
rename from extensions/secman/_adoc/modules/realm-shiro/assets/images/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
rename to extensions/secman/_adoc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
diff --git a/extensions/secman/_adoc/modules/realm-shiro/assets/images/configure-shiro-to-use-isisaddons-security-module-realm.PNG b/extensions/secman/_adoc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm.PNG
similarity index 100%
rename from extensions/secman/_adoc/modules/realm-shiro/assets/images/configure-shiro-to-use-isisaddons-security-module-realm.PNG
rename to extensions/secman/_adoc/modules/realm-shiro/images/configure-shiro-to-use-isisaddons-security-module-realm.PNG
diff --git a/extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc b/extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/specsupport/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/testing/modules/ROOT/assets/images/.gitkeep b/extensions/specsupport/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from antora/components/testing/modules/ROOT/assets/images/.gitkeep
rename to extensions/specsupport/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/antora/components/testing/modules/ROOT/assets/attachments/.gitkeep b/extensions/specsupport/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from antora/components/testing/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/specsupport/_adoc/modules/ROOT/images/.gitkeep
diff --git a/extensions/sse/_adoc/modules/ROOT/_attributes.adoc b/extensions/sse/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/sse/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/sse/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/relnotes/modules/ROOT/assets/images/.gitkeep b/extensions/sse/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from antora/components/relnotes/modules/ROOT/assets/images/.gitkeep
rename to extensions/sse/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/antora/components/relnotes/modules/ROOT/assets/attachments/.gitkeep b/extensions/sse/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from antora/components/relnotes/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/sse/_adoc/modules/ROOT/images/.gitkeep
diff --git a/extensions/viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/extensions/viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc
+++ b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/mignotes/modules/ROOT/assets/images/.gitkeep b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from antora/components/mignotes/modules/ROOT/assets/images/.gitkeep
rename to extensions/viewer-wicket-excel/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/antora/components/mignotes/modules/ROOT/assets/attachments/.gitkeep b/extensions/viewer-wicket-excel/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from antora/components/mignotes/modules/ROOT/assets/attachments/.gitkeep
rename to extensions/viewer-wicket-excel/_adoc/modules/ROOT/images/.gitkeep
diff --git a/mavendeps/_adoc/modules/ROOT/_attributes.adoc b/mavendeps/_adoc/modules/ROOT/_attributes.adoc
index 7d698a2..43cb529 100644
--- a/mavendeps/_adoc/modules/ROOT/_attributes.adoc
+++ b/mavendeps/_adoc/modules/ROOT/_attributes.adoc
@@ -1,6 +1,6 @@
ifndef::env-site,env-github[]
-:attachmentsdir: {moduledir}/assets/attachments
+:attachmentsdir: {moduledir}/attachments
:examplesdir: {moduledir}/examples
-:imagesdir: {moduledir}/assets/images
+:imagesdir: {moduledir}/images
:partialsdir: {moduledir}/partials
endif::[]
diff --git a/antora/components/archdesign/modules/ROOT/assets/images/.gitkeep b/mavendeps/_adoc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from antora/components/archdesign/modules/ROOT/assets/images/.gitkeep
rename to mavendeps/_adoc/modules/ROOT/attachments/.gitkeep
diff --git a/antora/components/archdesign/modules/ROOT/assets/attachments/.gitkeep b/mavendeps/_adoc/modules/ROOT/images/.gitkeep
similarity index 100%
rename from antora/components/archdesign/modules/ROOT/assets/attachments/.gitkeep
rename to mavendeps/_adoc/modules/ROOT/images/.gitkeep