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 2020/02/05 07:49:27 UTC
[isis] branch master updated: ISIS-2062: docs
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new fac8aeb ISIS-2062: docs
fac8aeb is described below
commit fac8aeb8bd21b4ac72324f9900857ef612687b41
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Feb 5 07:40:21 2020 +0000
ISIS-2062: docs
---
README.adoc | 63 +-
.../_component-template/antora.yml | 0
.../_component-template/modules/ROOT/nav.adoc | 0
.../modules/ROOT/pages/about.adoc | 0
.../modules/_module-template/attachments}/.gitkeep | 0
.../modules/_module-template/examples}/.gitkeep | 0
.../modules/_module-template/images}/.gitkeep | 0
.../modules/_module-template/nav.adoc | 0
.../modules/_module-template/pages/about.adoc | 0
.../modules/_module-template/partials}/.gitkeep | 0
antora/{toc => components/comguide}/antora.yml | 4 +-
.../ROOT}/images/committers/github-pr-history.png | Bin
.../ROOT}/images/docker/020-docker-nat-public.png | Bin
.../images/docker/022-local-security-policy.png | Bin
.../images/docker/024-unidentified-are-private.png | Bin
.../ROOT}/images/docker/026-docker-nat-private.png | Bin
.../modules/ROOT}/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
antora/components/comguide/modules/ROOT/nav.adoc | 13 +
.../comguide/modules/ROOT}/pages/about.adoc | 54 +-
.../ROOT}/pages/antora-publish-procedure.adoc | 2 +-
.../modules/ROOT}/pages/applying-patches.adoc | 0
.../modules/ROOT}/pages/cutting-a-release.adoc | 20 +-
.../modules/ROOT}/pages/key-generation.adoc | 0
.../ROOT}/pages/merging-a-pull-request.adoc | 0
.../comguide/modules/ROOT}/pages/pmc-notes.adoc | 0
.../comguide/modules/ROOT}/pages/policies.adoc | 2 +
.../modules/ROOT}/pages/policies/git-policy.adoc | 2 +-
.../ROOT}/pages/policies/versioning-policy.adoc | 0
.../ROOT}/pages/post-release-successful.adoc | 6 +-
.../ROOT}/pages/post-release-unsuccessful.adoc | 6 +-
.../release-process-for-interim-releases.adoc | 2 +-
.../ROOT}/pages/release-process-for-snapshots.adoc | 0
.../ROOT}/pages/release-process-prereqs.adoc | 6 +-
.../modules/ROOT}/pages/verifying-releases.adoc | 10 +-
antora/{toc => components/conguide}/antora.yml | 4 +-
.../asciidoc}/asciidoc-syntax-quick-reference.pdf | Bin
.../asciidoc}/asciidoc-writers-guide.pdf | Bin
.../eclipse/Apache-Isis-code-style-cleanup.xml | 0
.../ide/eclipse/Apache-Isis.importorder | 0
.../ide}/eclipse/Apache-code-style-formatting.xml | 0
.../ide}/eclipse/Apache-code-style-template.xml | 0
.../ide/intellij/Apache-Isis-importorder.xml | 0
.../ROOT/attachments}/license-header-java.txt | 0
.../ROOT}/images/asciidoctor/ditaa-demo.png | Bin
.../ROOT}/images/asciidoctor/graphviz-demo.png | Bin
.../ROOT}/images/asciidoctor/plantuml-demo.png | Bin
.../images/building-apache-isis/setting-up-git.png | Bin
.../ROOT}/images/contributing/git-workflow.png | Bin
.../ROOT}/images/contributing/git-workflow.pptx | Bin
.../ROOT}/images/contributing/github-cloning.png | Bin
.../ROOT}/images/contributing/github-forking.png | Bin
antora/components/conguide/modules/ROOT/nav.adoc | 5 +
.../conguide/modules/ROOT}/pages/about.adoc | 5 +-
.../conguide/modules/ROOT}/pages/agilej.adoc | 7 +-
.../modules/ROOT}/pages/asciidoc-syntax.adoc | 75 +--
.../modules/ROOT}/pages/building-apache-isis.adoc | 2 +-
.../ROOT}/pages/building-docs-and-website.adoc | 0
.../conguide/modules/ROOT}/pages/cmd-line.adoc | 0
.../conguide/modules/ROOT}/pages/contributing.adoc | 5 +-
.../conguide/modules/ROOT}/partials/x.sh | 0
antora/{toc => components/relnotes}/antora.yml | 4 +-
antora/components/relnotes/modules/ROOT/nav.adoc | 61 ++
.../modules/ROOT/pages/2012/1.0.0/relnotes.adoc} | 0
.../modules/ROOT/pages/2013/1.0.1/relnotes.adoc} | 0
.../modules/ROOT/pages/2013/1.1.0/relnotes.adoc} | 0
.../modules/ROOT/pages/2013/1.2.0/relnotes.adoc} | 0
.../modules/ROOT/pages/2013/1.3.0/relnotes.adoc} | 0
.../modules/ROOT/pages/2013/1.3.1/relnotes.adoc} | 0
.../modules/ROOT/pages/2014/1.4.0/relnotes.adoc} | 0
.../modules/ROOT/pages/2014/1.4.1/relnotes.adoc} | 0
.../modules/ROOT/pages/2014/1.5.0/relnotes.adoc} | 0
.../modules/ROOT/pages/2014/1.6.0/relnotes.adoc} | 0
.../modules/ROOT/pages/2014/1.7.0/mignotes.adoc} | 0
.../modules/ROOT/pages/2014/1.7.0/relnotes.adoc} | 0
.../modules/ROOT/pages/2015/1.10.0/mignotes.adoc} | 0
.../modules/ROOT/pages/2015/1.10.0/relnotes.adoc} | 0
.../modules/ROOT/pages/2015/1.8.0/mignotes.adoc} | 0
.../modules/ROOT/pages/2015/1.8.0/relnotes.adoc} | 0
.../modules/ROOT/pages/2015/1.9.0/mignotes.adoc} | 13 +-
.../mignotes/bootstrapping-using-AppManifest.adoc} | 0
.../2015/1.9.0/mignotes/exception-recognizer.adoc} | 0
.../fixture-scripts-specification-provider.adoc} | 0
.../1.9.0/mignotes/specify-all-dom-packages.adoc} | 0
.../2015/1.9.0/mignotes/upgrading-to-dn4.adoc} | 0
.../2015/1.9.0/mignotes/upgrading-to-java8.adoc} | 0
.../pages/2015/1.9.0/mignotes/war-packaging.adoc} | 0
.../modules/ROOT/pages/2015/1.9.0/relnotes.adoc} | 7 -
.../modules/ROOT/pages/2016/1.11.0/mignotes.adoc} | 0
.../modules/ROOT/pages/2016/1.11.0/relnotes.adoc} | 0
.../modules/ROOT/pages/2016/1.11.1/relnotes.adoc} | 0
.../modules/ROOT/pages/2016/1.12.0/mignotes.adoc} | 0
.../modules/ROOT/pages/2016/1.12.0/relnotes.adoc} | 0
.../modules/ROOT/pages/2016/1.12.1/relnotes.adoc} | 0
.../modules/ROOT/pages/2016/1.12.2/relnotes.adoc} | 0
.../modules/ROOT/pages/2016/1.13.0/mignotes.adoc} | 0
.../modules/ROOT/pages/2016/1.13.0/relnotes.adoc} | 0
.../modules/ROOT/pages/2016/1.13.1/relnotes.adoc} | 0
.../modules/ROOT/pages/2016/1.13.2/relnotes.adoc} | 0
.../ROOT/pages/2017/1.13.2.1/relnotes.adoc} | 0
.../modules/ROOT/pages/2017/1.14.0/mignotes.adoc} | 0
.../modules/ROOT/pages/2017/1.14.0/relnotes.adoc} | 0
.../modules/ROOT/pages/2017/1.15.0/mignotes.adoc} | 0
.../modules/ROOT/pages/2017/1.15.0/relnotes.adoc} | 0
.../modules/ROOT/pages/2017/1.15.1/relnotes.adoc} | 0
.../modules/ROOT/pages/2018/1.16.0/mignotes.adoc} | 0
.../modules/ROOT/pages/2018/1.16.0/relnotes.adoc} | 0
.../modules/ROOT/pages/2018/1.16.1/relnotes.adoc} | 0
.../modules/ROOT/pages/2018/1.16.2/relnotes.adoc} | 0
.../ROOT/pages/2018/2.0.0-M1/mignotes.adoc} | 33 +-
.../2018/2.0.0-M1/mignotes/legacy-modules.adoc} | 0
.../2018/2.0.0-M1/mignotes/meta-annotations.adoc} | 0
.../pages/2018/2.0.0-M1/mignotes/moved-types.adoc} | 0
.../2018/2.0.0-M1/mignotes/other-changes.adoc} | 0
.../2.0.0-M1/mignotes/removed-annotations.adoc} | 0
.../removed-configuration-properties.adoc} | 0
.../2018/2.0.0-M1/mignotes/removed-types.adoc} | 0
.../2.0.0-M1/mignotes/updated-annotations.adoc} | 0
.../2018/2.0.0-M1/mignotes/updated-classes.adoc} | 0
.../ROOT/pages/2018/2.0.0-M1/relnotes.adoc} | 0
.../modules/ROOT/pages/2019/1.17.0/mignotes.adoc} | 0
.../modules/ROOT/pages/2019/1.17.0/relnotes.adoc} | 0
.../ROOT/pages/2019/2.0.0-M2/relnotes.adoc} | 0
.../pages/2020/2.0.0-M3}/migrating-to-2.0.0.adoc | 0
.../relnotes/modules/ROOT/pages/about.adoc | 422 +++++++++++++
antora/{toc => components/setupguide}/antora.yml | 4 +-
.../ROOT}/attachments/eclipse/isis-templates.xml | 0
.../ROOT}/attachments/eclipse/jmock2-templates.xml | 0
.../ROOT}/attachments/eclipse/junit4-templates.xml | 0
.../modules/ROOT}/attachments/intellij/.gitignore | 0
.../intellij/isis-settings-file-templates.jar | Bin
.../ROOT}/attachments/intellij/other/.gitignore | 0
.../intellij/other/dan-settings-keymaps.jar | 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
.../ROOT}/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
.../015-import-project/010-welcome.png | Bin 0 -> 59688 bytes
.../015-import-project/020-import-pom.png | Bin 0 -> 59790 bytes
.../015-import-project/030-imported.png | Bin 0 -> 186531 bytes
.../015-import-project/040-project-structure.png | Bin 0 -> 106388 bytes
.../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 0 -> 141291 bytes
.../020-annotation-processor.png | Bin 0 -> 162694 bytes
.../010-maven-installation.png | Bin 0 -> 128624 bytes
.../020-maven-configuration.png | Bin 0 -> 167000 bytes
.../044-other-settings-misc/010-auto-import.png | Bin 0 -> 139178 bytes
.../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
.../005-datanucleus-enhance-run-configuration.png | Bin 0 -> 94738 bytes
.../110-running-the-app/010-run-configuration.png | Bin 0 -> 124098 bytes
.../110-running-the-app/030-running-unit-tests.png | Bin 0 -> 94777 bytes
.../040-running-unit-tests-run-configuration.png | Bin 0 -> 128382 bytes
.../045-running-integ-tests.png | Bin 0 -> 97750 bytes
...running-integration-tests-run-configuration.png | Bin 0 -> 149801 bytes
.../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
antora/components/setupguide/modules/ROOT/nav.adoc | 7 +
.../setupguide/modules/ROOT/pages/about.adoc} | 12 +-
.../setupguide/modules/ROOT/pages}/eclipse.adoc | 13 +-
.../modules/ROOT}/pages/git-cookbook.adoc | 8 +-
.../modules/ROOT}/pages/hints-and-tips.adoc | 7 +-
.../pages/hints-and-tips/datanucleus-enhancer.adoc | 2 +-
.../pages/hints-and-tips/enabling-logging.adoc | 1 -
.../ROOT}/pages/hints-and-tips/enhance-only.adoc | 1 -
.../how-run-fixtures-on-app-startup.adoc | 9 +-
.../ROOT/pages/hints-and-tips}/project-lombok.adoc | 13 +-
.../setupguide/modules/ROOT}/pages/ide.adoc | 5 +-
.../setupguide/modules/ROOT/pages/intellij.adoc | 566 ++++++++++++++++++
.../ROOT}/pages/working-with-many-repos.adoc | 1 -
.../setupguide/modules/ROOT}/partials/x.sh | 0
antora/{ => components}/toc/antora.yml | 0
.../toc/modules/ROOT/attachments}/.gitkeep | 0
.../toc/modules/ROOT/examples}/.gitkeep | 0
.../ROOT/images/going-deeper/books/dhnako.jpg | Bin
.../going-deeper/books/nakedobjects-book.jpg | Bin
.../toc/modules/ROOT/images/more-thanks/ecp.png | Bin
.../ROOT/images/more-thanks/ecp_logo_white.png | Bin
.../ROOT/images/more-thanks/ej-technologies.png | Bin
.../ROOT/images/more-thanks/icons8-logo.png | Bin
.../modules/ROOT/images/more-thanks/s101_170.png | Bin
.../toc/modules/ROOT/images/support/slack/010.png | Bin
.../toc/modules/ROOT/images/support/slack/020.png | Bin
.../toc/modules/ROOT/images/support/slack/030.png | Bin
.../toc/modules/ROOT/images/support/slack/040.png | Bin
.../toc/modules/ROOT/images/support/slack/050.png | Bin
.../toc/modules/ROOT/images/support/slack/060.png | Bin
.../toc/modules/ROOT/images/support/slack/070.png | Bin
.../toc/modules/ROOT/images/support/slack/080.png | Bin
.../toc/modules/ROOT/images/support/slack/090.png | Bin
.../toc/modules/ROOT/images/support/slack/100.png | Bin
.../toc/modules/ROOT/images/support/slack/110.png | Bin
...15-HealthAssessmentReport_DRCP594591_138322.pdf | Bin
...9-HealthAssessmentReport_DRCJ1712475_138322.pdf | Bin
.../toc/modules/ROOT/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
antora/components/toc/modules/ROOT/nav.adoc | 1 +
.../toc/modules/ROOT/pages/about.adoc | 93 +--
.../toc/modules/ROOT/pages/downloads/how-to.adoc | 0
.../going-deeper/articles-and-presentations.adoc | 0
.../toc/modules/ROOT/pages/going-deeper/books.adoc | 0
.../modules/ROOT/pages/landing-page/catalogs.adoc | 0
.../ROOT/pages/landing-page/components.adoc | 0
.../modules/ROOT/pages/landing-page/guides.adoc | 25 +-
.../modules/ROOT/pages/landing-page/internal.adoc | 16 +-
.../modules/ROOT/pages/landing-page/releases.adoc | 9 +-
.../modules/ROOT/pages/landing-page/support.adoc | 5 +-
.../ROOT/pages/more-thanks/more-thanks.adoc | 0
.../modules/ROOT/pages/support/mailing-list.adoc | 0
.../modules/ROOT/pages/support/slack-channel.adoc | 0
.../what-is-apache-isis/common-use-cases.adoc | 0
.../what-is-apache-isis/isis-in-pictures.adoc | 0
.../ROOT/pages/what-is-apache-isis/powered-by.adoc | 0
.../what-is-apache-isis/powered-by/commapp.adoc | 0
.../what-is-apache-isis/powered-by/contactapp.adoc | 0
.../pages/what-is-apache-isis/powered-by/cqnz.adoc | 0
.../what-is-apache-isis/powered-by/estatio.adoc | 0
.../powered-by/gesconsultor-grc.adoc | 0
.../powered-by/transport-planner.adoc | 0
.../what-is-apache-isis/screencasts-older.adoc | 4 +-
.../pages/what-is-apache-isis/screencasts.adoc | 2 +-
.../what-is-apache-isis/screencasts/playlists.adoc | 0
.../toc/modules/ROOT/partials/component-nav.adoc | 10 +
.../ROOT/partials/module-nav/components.adoc | 17 +
.../partials/module-nav/demos-and-tutorials.adoc | 5 +
.../ROOT/partials/module-nav/framework.adoc | 7 +
.../modules/ROOT/partials/module-nav/guides.adoc | 11 +
.../ROOT/partials/module-nav/libraries.adoc | 14 +
.../modules/ROOT/partials/module-nav/releases.adoc | 12 +
.../ROOT/partials/module-nav/resources.adoc | 1 +
.../ROOT/partials/module-nav/starter-apps.adoc | 9 +
.../modules/ROOT/partials/module-nav/support.adoc | 8 +
.../partials/module-nav/what-is-apache-isis.adoc | 5 +
.../resources/attachments/IsisCheatSheet.docx | Bin 0 -> 25848 bytes
.../resources/attachments/IsisCheatSheet.pdf | Bin 0 -> 179764 bytes
.../modules/resources/images}/IsisCheatSheet.png | Bin
antora/components/toc/modules/resources/nav.adoc | 1 +
.../toc/modules/resources/pages/about.adoc} | 10 +-
.../toc/modules/resources/pages/cheatsheet.adoc} | 15 +-
.../toc/modules/resources/pages}/icons.adoc | 14 +-
.../toc/modules/resources/partials/module-nav.adoc | 4 +
.../{site-persistence.yml => site-comguide.yml} | 8 +-
.../{site-persistence.yml => site-conguide.yml} | 8 +-
antora/playbooks/site-core.yml | 2 +-
antora/playbooks/site-extensions.yml | 2 +-
antora/playbooks/site-incubator.yml | 2 +-
antora/playbooks/site-legacy.yml | 2 +-
antora/playbooks/site-mappings.yml | 2 +-
antora/playbooks/site-persistence.yml | 2 +-
antora/playbooks/site-refguide.yml | 2 +-
.../{site-persistence.yml => site-relnotes.yml} | 8 +-
antora/playbooks/site-security.yml | 2 +-
.../{site-persistence.yml => site-setupguide.yml} | 6 +-
antora/playbooks/site-starters.yml | 2 +-
antora/playbooks/site-subdomains.yml | 2 +-
antora/playbooks/site-testing.yml | 2 +-
antora/playbooks/site-toc.yml | 6 +-
antora/playbooks/site-userguide.yml | 4 +-
antora/playbooks/site-valuetypes.yml | 2 +-
antora/playbooks/site-vro.yml | 2 +-
antora/playbooks/site-vw.yml | 2 +-
antora/playbooks/site.yml | 17 +-
antora/{toc => redirects/guides}/antora.yml | 4 +-
antora/redirects/guides/modules/ROOT/nav.adoc | 1 +
.../guides}/modules/ROOT/pages/about.adoc | 5 +-
antora/redirects/guides/modules/ugvro/nav.adoc | 3 +
.../guides/modules/ugvro/pages/ugvro.adoc} | 4 +-
antora/redirects/guides/modules/ugvw/nav.adoc | 1 +
.../guides/modules/ugvw/pages/ugvw.adoc} | 4 +-
antora/supplemental-ui/css/home/style.css | 89 +--
antora/supplemental-ui/support.html | 9 +
antora/toc/modules/ROOT/nav.adoc | 1 -
.../toc/modules/ROOT/partials/component-nav.adoc | 2 -
antora/toc/modules/ROOT/partials/module-nav.adoc | 98 ---
antora/toc/modules/comguide/nav.adoc | 1 -
.../devguide/attachments/eclipse/isis.importorder | 7 -
.../attachments/resources/IsisCheatSheet.docx | Bin 26035 -> 0 bytes
.../attachments/resources/IsisCheatSheet.pdf | Bin 177151 -> 0 bytes
.../010-installing/010-welcome-page.png | Bin 29192 -> 0 bytes
.../010-installing/020-choose-location.png | Bin 24433 -> 0 bytes
.../010-installing/030-installation-options.png | Bin 18300 -> 0 bytes
.../010-installing/040-start-menu-folder.png | Bin 26120 -> 0 bytes
.../010-installing/050-completing.png | Bin 26499 -> 0 bytes
.../010-installing/060-import-settings-or-not.png | Bin 11691 -> 0 bytes
.../010-installing/070-set-ui-theme.png | Bin 87739 -> 0 bytes
.../010-new-project-create.png | Bin 14048 -> 0 bytes
.../020-java-project-setup-jdk.png | Bin 29837 -> 0 bytes
.../030-java-project-select-jdk.png | Bin 16597 -> 0 bytes
.../020-create-new-project/040-sdk-selected.png | Bin 24884 -> 0 bytes
.../050-name-and-location.png | Bin 11407 -> 0 bytes
.../020-create-new-project/060-create-dir.png | Bin 8424 -> 0 bytes
.../010-build-automatically.png | Bin 50767 -> 0 bytes
.../020-annotation-processor.png | Bin 67560 -> 0 bytes
.../010-maven-installation.png | Bin 43353 -> 0 bytes
.../020-maven-configuration.png | Bin 53554 -> 0 bytes
.../044-other-settings-misc/010-auto-import.png | Bin 31963 -> 0 bytes
.../110-running-the-app/010-run-configuration.png | Bin 34826 -> 0 bytes
.../020-datanucleus-enhancer-goal.png | Bin 8491 -> 0 bytes
.../110-running-the-app/030-running-unit-tests.png | Bin 29351 -> 0 bytes
.../040-running-unit-tests-run-configuration.png | Bin 37582 -> 0 bytes
...running-integration-tests-run-configuration.png | Bin 40655 -> 0 bytes
.../devguide/images/layouts/estatio-Lease.png | Bin 261553 -> 0 bytes
antora/toc/modules/devguide/nav.adoc | 1 -
antora/toc/modules/devguide/pages/about.adoc | 32 -
.../toc/modules/devguide/pages/ide/intellij.adoc | 663 ---------------------
.../devguide/pages/resources/cheat-sheet.adoc | 18 -
antora/toc/modules/mignotes/nav.adoc | 1 -
antora/toc/modules/mignotes/pages/about.adoc | 22 -
.../mignotes/pages/mn-1.16.0-to-2.0.0-M1.adoc | 15 -
.../modules/mignotes/pages/mn-1.8.0-to-1.9.0.adoc | 19 -
antora/toc/modules/relnotes/nav.adoc | 1 -
antora/toc/modules/relnotes/pages/about.adoc | 411 -------------
api/adoc/userguide/modules/fun/pages/about.adoc | 2 +-
.../core-concepts/philosophy/how-eases-ddd.adoc | 3 +-
.../applib-ant/examples/annotation/Auditing.java | 2 +-
.../examples/annotation/CommandReification.java | 8 +-
.../applib-ant/examples/annotation/Editing.java | 2 +-
.../applib-ant/examples/annotation/Publishing.java | 2 +-
.../main/adoc/modules/applib-ant/pages/Title.adoc | 2 +-
.../examples/services/audit/AuditerService.java | 2 +-
.../persistence-layer-api/IsisJdoSupport.adoc | 2 +-
.../apache/isis/applib/annotation/Auditing.java | 2 +-
.../isis/applib/annotation/CommandReification.java | 8 +-
.../org/apache/isis/applib/annotation/Editing.java | 2 +-
.../apache/isis/applib/annotation/Publishing.java | 2 +-
.../isis/applib/services/audit/AuditerService.java | 2 +-
.../auditing/AuditableFacetFromConfiguration.java | 2 +-
examples/demo/src/main/adoc/antora.yml | 6 +-
examples/demo/src/main/adoc/modules/ROOT/nav.adoc | 1 -
examples/demo/src/main/adoc/modules/demo/nav.adoc | 1 +
.../adoc/modules/{ROOT => demo}/pages/about.adoc | 2 +-
.../adoc/modules/demo/partials/module-nav.adoc | 1 +
mappings/adoc/modules/ROOT/pages/about.adoc | 2 +-
.../ROOT/pages/configuring/persistence-xml.adoc | 3 +-
starters/adoc/modules/helloworld/pages/about.adoc | 11 +-
starters/adoc/modules/simpleapp/pages/about.adoc | 10 +-
subdomains/adoc/modules/ROOT/pages/about.adoc | 2 +-
.../adoc/modules/unittestsupport/pages/about.adoc | 2 +-
valuetypes/adoc/modules/ROOT/pages/about.adoc | 2 +-
viewers/wicket/adoc/modules/ROOT/pages/about.adoc | 2 +
.../ROOT/pages/configuration-properties.adoc | 36 +-
439 files changed, 1617 insertions(+), 1784 deletions(-)
diff --git a/README.adoc b/README.adoc
index b1b97a2..cb829cb 100644
--- a/README.adoc
+++ b/README.adoc
@@ -14,21 +14,22 @@ _http://isis.apache.org[Apache Isis] software is a framework for rapidly develop
Start learning about Apache Isis using the http://github.com/apache/isis-app-helloworld["Hello World"] starter app.
Build your own apps using our http://github.com/apache/isis-app-simpleapp["SimpleApp"] starter app.
-For help and support, join the http://isis.apache.org/support.html[mailing lists].
-To contribute to our documentation, see our https://github.com/apache/isis/tree/master/adocs/documentation[Asciidoctor source].
+For help and support, join our https://cwiki.apache.org/confluence/display/ISIS/Signing+up+to+Slack[Slack channel] or http://isis.apache.org/support.html[mailing list].
toc::[]
== Core Features
-Isis automatically generates the UI from the domain classes.
+Apache Isis automatically generates the UI from the domain classes.
=== Sign-in
Apache Isis integrates with http://shiro.apache.org[Apache Shiro].
The core framework supports file-based realms, while the xref:security:ROOT:about.adoc[SecMan extension] provides a well-features subdomain of users, roles and permissions against features derived from the Apache Isis metamodel.
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/010-login.png[link="https://raw.githubusercontent.com/apache/isis/master/adocs/documentation/src/main/asciidoc/images/what-is-apache-isis/isis-in-pictures/010-login.png"]
+
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/010-login.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/010-login.png"]
+
=== Install Fixtures
@@ -37,14 +38,14 @@ One such are fixture scripts, which allow pre-canned data to be installed in the
This is great to act as the starting point for identifying new stories; later on when the feature is being implemented, the same fixture script can be re-used within that feature's integration tests.
(More on tests later).
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/020-install-fixtures.png[link="https://raw.githubusercontent.com/apache/isis/master/adocs/documentation/src/main/asciidoc/images/what-is-apache-isis/isis-in-pictures/020-install-fixtures.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/020-install-fixtures.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/020-install-fixtures.png"]
=== Dashboard and View Models
Most of the time the end-user interacts with representations of persistent domain entities, but Isis also supports view models which can aggregate data from multiple sources.
The todoapp example uses a "dashboard" view model to list todo items not yet done vs those completed.
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/030-dashboard-view-model.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/030-dashboard-view-model.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/030-dashboard-view-model.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/030-dashboard-view-model.png"]
In general we recommend to initially focus only on domain entities; this will help drive out a good domain model.
Later on view models can be introduced in support of specific use cases.
@@ -55,7 +56,7 @@ The screenshot below is of the todoapp's `ToDoItem` domain entity.
Like all web pages, this UI is generated at runtime, directly from the domain object itself.
There are no controllers or HTML to write.
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/040-domain-entity.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/040-domain-entity.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/040-domain-entity.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/"]
In addition to the domain entity, Apache Isis allows layout metadata hints to be provided, for example to specify the grouping of properties, the positioning of those groups into columns, the association of actions (the buttons) with properties or collections, the icons on the buttons, and so on.
This metadata can be specified either as annotations or in JSON form; the benefit of the latter is that it can be updated (and the UI redrawn) without restarting the app.
@@ -67,7 +68,7 @@ Any production-ready app will require this metadata but (like the view models di
By default properties on domain entities are editable, meaning they can be changed directly.
In the todoapp example, the `ToDoItem`'s description is one such editable property:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/050-edit-property.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/050-edit-property.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/050-edit-property.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/050-edit-property.png"]
Note that some of the properties are read-only even in edit mode; individual properties can be made non-editable.
It is also possible to make all properties disabled and thus enforce changes only through actions (below).
@@ -77,7 +78,7 @@ It is also possible to make all properties disabled and thus enforce changes onl
The other way to modify an entity is to an invoke an action.
In the screenshot below the `ToDoItem`'s category and subcategory can be updated together using an action:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/060-invoke-action.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/060-invoke-action.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/060-invoke-action.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/060-invoke-action.png"]
There are no limitations on what an action can do; it might just update a single object, it could update multiple objects.
Or, it might not update any objects at all, but could instead perform some other activity, such as sending out email or printing a document.
@@ -92,11 +93,11 @@ When an object is rendered by Apache Isis, the mixin "contributes" its behaviour
In the screenshot below the highlighted "export as xml" action, the "relative priority" property (and "previous" and "next" actions) the "similar to" collection and the two "as DTO" actions are all contributed by mixins:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/065-contributions.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/065-contributions.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/065-contributions.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/065-contributions.png"]
The code snippet below shows how this works for the "as DTO v1.0" action:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/067-contributed-action.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/067-contributed-action.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/067-contributed-action.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/067-contributed-action.png"]
@@ -106,26 +107,26 @@ image::https://raw.githubusercontent.com/apache/isis/master/antora/components/to
The Apache Isis viewer is implemented using http://wicket.apache.org[Apache Wicket], and has been architected to be extensible.
For example, when a collection of objects is rendered, this is just one several views, as shown in the selector drop-down:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/070-pluggable-views.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/070-pluggable-views.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/070-pluggable-views.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/070-pluggable-views.png"]
The (non-ASF) link:https://platform.incode.org/modules/wkt/gmap3/wkt-gmap3.html[gmap3 component] will render any domain entity (such as `ToDoItem`) that implements its `Locatable` interface:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/080-gmap3-view.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/080-gmap3-view.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/080-gmap3-view.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/080-gmap3-view.png"]
Similarly the (non-ASF) link:https://platform.incode.org/modules/wkt/fullcalendar2/wkt-fullcalendar2.html[fullcalendar2 component] will render any domain entity (such as `ToDoItem`) that implements its `Calendarable` interface:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/090-fullcalendar2-view.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/090-fullcalendar2-view.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/090-fullcalendar2-view.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/090-fullcalendar2-view.png"]
Yet another "view" (though this one is rather simpler) is that provided by the (non-ASF) link:https://platform.incode.org/modules/wkt/excel/wkt-excel.html[excel component].
This provides a download button to the table as a spreadsheet:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/100-excel-view-and-docx.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/100-excel-view-and-docx.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/100-excel-view-and-docx.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/100-excel-view-and-docx.png"]
The screenshot above also shows an "export to Word" action.
This is _not_ a view but instead is a (contributed) action that uses the (non-ASF) link:https://platform.incode.org/modules/lib/docx/lib-docx.html[docx library] module to perform a "mail-merge":
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/110-docx.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/110-docx.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/110-docx.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/110-docx.png"]
@@ -136,21 +137,21 @@ As well as providing extensions to the UI, the (non-ASF) Incode Platform provide
Under the activity menu are four sets of services which provide support for link:https://platform.incode.org/modules/spi/sessionlogger/spi-sessionlogger.html[user session logging/auditing], link:https://platform.incode.org/modules/spi/command/spi-command[command profiling], link:https://platform.incode.org/modules/spi/audit/spi-audit.html[(object change) auditing] (shown) and (inter-system) link:https://platform.incode.org/modules/spi/publishmq/spi-publishmq[event publishing]:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/120-auditing.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/120-auditing.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/120-auditing.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/120-auditing.png"]
In the security menu is access to the rich set of functionality provided by the xref:security:ROOT:about.adoc[SecMan extension]:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/130-security.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/130-security.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/130-security.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/130-security.png"]
In the prototyping menu is the ability to download a GNU gettext `.po` file for translation.
This file can then be translated into multiple languages so that your app can support different locales. Note that this feature is part of Apache Isis core:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/140-i18n.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/140-i18n.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/140-i18n.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/140-i18n.png"]
The Incode Platform also provides a module for managing link:https://platform.incode.org/modules/dom/settings/dom-settings.html[application and user settings].
Most apps (the todoapp example included) won't expose these services directly, but will usually wrap them in their own app-specific settings service that trivially delegates to the settings module's services:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/150-appsettings.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/150-appsettings.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/150-appsettings.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/150-appsettings.png"]
=== Multi-tenancy support
@@ -162,7 +163,7 @@ One significant feature of the is the ability to associate users and objects wit
The todoapp uses this feature so that different users' list of todo items are kept separate from one another.
A user with administrator is able to switch their own "tenancy" to the tenancy of some other user, in order to access the objects in that tenancy:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/160-switch-tenancy.png"]
For more details, see the security module's link:https://platform.incode.org/modules/spi/security/spi-security.html[README] (or xref:security:ROOT:about.adoc[SecMan extension])..
@@ -171,11 +172,11 @@ For more details, see the security module's link:https://platform.incode.org/mod
Most of the security module's domain services are on the "security" menu, which would normally be accessible only to administrators.
Kept separate is the "me" action:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/170-me.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/170-me.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/170-me.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/170-me.png"]
Assuming they have been granted permissions, this allows a user to access an entity representing their own user account:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/180-app-user-entity.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/180-app-user-entity.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/180-app-user-entity.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/180-app-user-entity.png"]
If not all of these properties are required, then they can be hidden either using security or though Isis' internal event bus (described below).
Conversely, additional properties can be "grafted onto" the user using the contributed properties/collections discussed previously.
@@ -185,7 +186,7 @@ Conversely, additional properties can be "grafted onto" the user using the contr
Apache Isis' Wicket viewer uses link:http://getbootstrap.com[Twitter Bootstrap], which means that it can be themed.
If more than one theme has been configured for the app, then the viewer allows the end-user to switch their theme:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/190-switch-theme.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/190-switch-theme.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/190-switch-theme.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/190-switch-theme.png"]
@@ -194,7 +195,7 @@ image::https://raw.githubusercontent.com/apache/isis/master/antora/components/to
In addition to Isis' Wicket viewer, it also provides a fully fledged REST API, as an implementation of the http://restfulobjects.org[Restful Objects] specification.
The screenshot below shows accessing this REST API using a Chrome plugin:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/200-rest-api.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/200-rest-api.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/200-rest-api.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/200-rest-api.png"]
Like the Wicket viewer, the REST API is generated automatically from the domain objects (entities and view models).
@@ -206,19 +207,19 @@ Earlier on we noted that Apache Isis allows fixtures to be installed through the
These same fixture scripts can be reused within integration tests.
For example, the code snippet below shows how the `FixtureScripts` service injected into an integration test can then be used to set up data:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/210-fixture-scripts.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/210-fixture-scripts.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/210-fixture-scripts.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/210-fixture-scripts.png"]
The tests themselves are run in junit.
While these are integration tests (so talking to a real database), they are no more complex than a regular unit test:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/220-testing-happy-case.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/220-testing-happy-case.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/220-testing-happy-case.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/220-testing-happy-case.png"]
To simulate the business rules enforced by Apache Isis, the domain object can be "wrapped" in a proxy.
For example, if using the Wicket viewer then Apache Isis will enforce the rule (implemented in the `ToDoItem` class itself) that a completed item cannot have the "completed" action invoked upon it.
The wrapper simulates this by throwing an appropriate exception:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/230-testing-wrapper-factory.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/230-testing-wrapper-factory.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/230-testing-wrapper-factory.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/230-testing-wrapper-factory.png"]
@@ -230,15 +231,15 @@ Contributions, discussed earlier, are an important tool in ensuring that the pac
Another important tool to ensure your codebase remains maintainable is Isis' internal event bus.
It is probably best explained by example; the code below says that the "complete" action should emit a `ToDoItem.Completed` event:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/240-domain-events.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/240-domain-events.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/240-domain-events.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/240-domain-events.png"]
Domain service (application-scoped, stateless) can then subscribe to this event:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/250-domain-event-subscriber.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/250-domain-event-subscriber.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/250-domain-event-subscriber.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/250-domain-event-subscriber.png"]
And this test verifies that completing an action causes the subscriber to be called:
-image::https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/260-domain-event-test.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/components/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/260-domain-event-test.png"]
+image::https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/260-domain-event-test.png[link="https://raw.githubusercontent.com/apache/isis/master/antora/toc/modules/ROOT/images/what-is-apache-isis/isis-in-pictures/260-domain-event-test.png"]
In fact, the domain event is fired not once, but (up to) 5 times.
It is called 3 times prior to execution, to check that the action is visible, enabled and that arguments are valid.
diff --git a/antora/_component-template/antora.yml b/antora/components/_component-template/antora.yml
similarity index 100%
rename from antora/_component-template/antora.yml
rename to antora/components/_component-template/antora.yml
diff --git a/antora/_component-template/modules/ROOT/nav.adoc b/antora/components/_component-template/modules/ROOT/nav.adoc
similarity index 100%
rename from antora/_component-template/modules/ROOT/nav.adoc
rename to antora/components/_component-template/modules/ROOT/nav.adoc
diff --git a/antora/_component-template/modules/ROOT/pages/about.adoc b/antora/components/_component-template/modules/ROOT/pages/about.adoc
similarity index 100%
copy from antora/_component-template/modules/ROOT/pages/about.adoc
copy to antora/components/_component-template/modules/ROOT/pages/about.adoc
diff --git a/antora/toc/modules/ROOT/examples/.gitkeep b/antora/components/_component-template/modules/_module-template/attachments/.gitkeep
similarity index 100%
rename from antora/toc/modules/ROOT/examples/.gitkeep
rename to antora/components/_component-template/modules/_module-template/attachments/.gitkeep
diff --git a/antora/toc/modules/ROOT/attachments/.gitkeep b/antora/components/_component-template/modules/_module-template/examples/.gitkeep
similarity index 100%
rename from antora/toc/modules/ROOT/attachments/.gitkeep
rename to antora/components/_component-template/modules/_module-template/examples/.gitkeep
diff --git a/antora/_component-template/modules/_module-template/partials/.gitkeep b/antora/components/_component-template/modules/_module-template/images/.gitkeep
similarity index 100%
rename from antora/_component-template/modules/_module-template/partials/.gitkeep
rename to antora/components/_component-template/modules/_module-template/images/.gitkeep
diff --git a/antora/_component-template/modules/_module-template/nav.adoc b/antora/components/_component-template/modules/_module-template/nav.adoc
similarity index 100%
rename from antora/_component-template/modules/_module-template/nav.adoc
rename to antora/components/_component-template/modules/_module-template/nav.adoc
diff --git a/antora/_component-template/modules/_module-template/pages/about.adoc b/antora/components/_component-template/modules/_module-template/pages/about.adoc
similarity index 100%
copy from antora/_component-template/modules/_module-template/pages/about.adoc
copy to antora/components/_component-template/modules/_module-template/pages/about.adoc
diff --git a/antora/_component-template/modules/_module-template/images/.gitkeep b/antora/components/_component-template/modules/_module-template/partials/.gitkeep
similarity index 100%
rename from antora/_component-template/modules/_module-template/images/.gitkeep
rename to antora/components/_component-template/modules/_module-template/partials/.gitkeep
diff --git a/antora/toc/antora.yml b/antora/components/comguide/antora.yml
similarity index 63%
copy from antora/toc/antora.yml
copy to antora/components/comguide/antora.yml
index 76c1eaa..b7b4925 100644
--- a/antora/toc/antora.yml
+++ b/antora/components/comguide/antora.yml
@@ -1,5 +1,5 @@
-name: toc
-title: " "
+name: comguide
+title: "Committers' Guide"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/antora/toc/modules/comguide/images/committers/github-pr-history.png b/antora/components/comguide/modules/ROOT/images/committers/github-pr-history.png
similarity index 100%
rename from antora/toc/modules/comguide/images/committers/github-pr-history.png
rename to antora/components/comguide/modules/ROOT/images/committers/github-pr-history.png
diff --git a/antora/toc/modules/comguide/images/docker/020-docker-nat-public.png b/antora/components/comguide/modules/ROOT/images/docker/020-docker-nat-public.png
similarity index 100%
rename from antora/toc/modules/comguide/images/docker/020-docker-nat-public.png
rename to antora/components/comguide/modules/ROOT/images/docker/020-docker-nat-public.png
diff --git a/antora/toc/modules/comguide/images/docker/022-local-security-policy.png b/antora/components/comguide/modules/ROOT/images/docker/022-local-security-policy.png
similarity index 100%
rename from antora/toc/modules/comguide/images/docker/022-local-security-policy.png
rename to antora/components/comguide/modules/ROOT/images/docker/022-local-security-policy.png
diff --git a/antora/toc/modules/comguide/images/docker/024-unidentified-are-private.png b/antora/components/comguide/modules/ROOT/images/docker/024-unidentified-are-private.png
similarity index 100%
rename from antora/toc/modules/comguide/images/docker/024-unidentified-are-private.png
rename to antora/components/comguide/modules/ROOT/images/docker/024-unidentified-are-private.png
diff --git a/antora/toc/modules/comguide/images/docker/026-docker-nat-private.png b/antora/components/comguide/modules/ROOT/images/docker/026-docker-nat-private.png
similarity index 100%
rename from antora/toc/modules/comguide/images/docker/026-docker-nat-private.png
rename to antora/components/comguide/modules/ROOT/images/docker/026-docker-nat-private.png
diff --git a/antora/toc/modules/comguide/images/docker/docker-daemon.png b/antora/components/comguide/modules/ROOT/images/docker/docker-daemon.png
similarity index 100%
rename from antora/toc/modules/comguide/images/docker/docker-daemon.png
rename to antora/components/comguide/modules/ROOT/images/docker/docker-daemon.png
diff --git a/antora/toc/modules/comguide/images/release-process/jira-create-release-notes.png b/antora/components/comguide/modules/ROOT/images/release-process/jira-create-release-notes.png
similarity index 100%
rename from antora/toc/modules/comguide/images/release-process/jira-create-release-notes.png
rename to antora/components/comguide/modules/ROOT/images/release-process/jira-create-release-notes.png
diff --git a/antora/toc/modules/comguide/images/release-process/nexus-release-1.png b/antora/components/comguide/modules/ROOT/images/release-process/nexus-release-1.png
similarity index 100%
rename from antora/toc/modules/comguide/images/release-process/nexus-release-1.png
rename to antora/components/comguide/modules/ROOT/images/release-process/nexus-release-1.png
diff --git a/antora/toc/modules/comguide/images/release-process/nexus-staging-0.png b/antora/components/comguide/modules/ROOT/images/release-process/nexus-staging-0.png
similarity index 100%
rename from antora/toc/modules/comguide/images/release-process/nexus-staging-0.png
rename to antora/components/comguide/modules/ROOT/images/release-process/nexus-staging-0.png
diff --git a/antora/toc/modules/comguide/images/release-process/nexus-staging-1.png b/antora/components/comguide/modules/ROOT/images/release-process/nexus-staging-1.png
similarity index 100%
rename from antora/toc/modules/comguide/images/release-process/nexus-staging-1.png
rename to antora/components/comguide/modules/ROOT/images/release-process/nexus-staging-1.png
diff --git a/antora/toc/modules/comguide/images/release-process/nexus-staging-2.png b/antora/components/comguide/modules/ROOT/images/release-process/nexus-staging-2.png
similarity index 100%
rename from antora/toc/modules/comguide/images/release-process/nexus-staging-2.png
rename to antora/components/comguide/modules/ROOT/images/release-process/nexus-staging-2.png
diff --git a/antora/toc/modules/comguide/images/release-process/nexus-staging-2a.png b/antora/components/comguide/modules/ROOT/images/release-process/nexus-staging-2a.png
similarity index 100%
rename from antora/toc/modules/comguide/images/release-process/nexus-staging-2a.png
rename to antora/components/comguide/modules/ROOT/images/release-process/nexus-staging-2a.png
diff --git a/antora/toc/modules/comguide/images/release-process/nexus-staging-3.png b/antora/components/comguide/modules/ROOT/images/release-process/nexus-staging-3.png
similarity index 100%
rename from antora/toc/modules/comguide/images/release-process/nexus-staging-3.png
rename to antora/components/comguide/modules/ROOT/images/release-process/nexus-staging-3.png
diff --git a/antora/toc/modules/comguide/images/release-process/nexus-staging-4.png b/antora/components/comguide/modules/ROOT/images/release-process/nexus-staging-4.png
similarity index 100%
rename from antora/toc/modules/comguide/images/release-process/nexus-staging-4.png
rename to antora/components/comguide/modules/ROOT/images/release-process/nexus-staging-4.png
diff --git a/antora/components/comguide/modules/ROOT/nav.adoc b/antora/components/comguide/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..1cb1278
--- /dev/null
+++ b/antora/components/comguide/modules/ROOT/nav.adoc
@@ -0,0 +1,13 @@
+* xref:applying-patches.adoc[Applying Patches]
+* xref:merging-a-pull-request.adoc[Merging a Pull Request]
+* xref:cutting-a-release.adoc[Cutting a Release]
+* xref:verifying-releases.adoc[Verifying Releases]
+* xref:post-release-successful.adoc[Post Release (Successful)]
+* xref:post-release-unsuccessful.adoc[Post Release (Unsuccessful)]
+* xref:release-process-for-snapshots.adoc[Release Process for Snapshots]
+* xref:release-process-for-interim-releases.adoc[Release Process for Interim Releases]
+* xref:antora-publish-procedure.adoc[Antora Publish Procedure]
+* xref:key-generation.adoc[Key Generation]
+* xref:release-process-prereqs.adoc[Appendix: Release Process Prereqs]
+* xref:policies.adoc[Appendix: Policies]
+* xref:pmc-notes.adoc[Appendix: PMC Notes]
diff --git a/antora/toc/modules/comguide/pages/about.adoc b/antora/components/comguide/modules/ROOT/pages/about.adoc
similarity index 52%
rename from antora/toc/modules/comguide/pages/about.adoc
rename to antora/components/comguide/modules/ROOT/pages/about.adoc
index 7a531fe..756d259 100644
--- a/antora/toc/modules/comguide/pages/about.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/about.adoc
@@ -5,32 +5,32 @@
This committers' guide is for committers of Apache Isis itself who want guidance on release process, publishing documents and other related procedures.
-include::applying-patches.adoc[leveloffset=+1]
-
-include::merging-a-pull-request.adoc[leveloffset=+1]
-
-include::cutting-a-release.adoc[leveloffset=+1]
-
-include::verifying-releases.adoc[leveloffset=+1]
-
-include::post-release-successful.adoc[leveloffset=+1]
-
-include::post-release-unsuccessful.adoc[leveloffset=+1]
-
-include::release-process-for-snapshots.adoc[leveloffset=+1]
-
-include::release-process-for-interim-releases.adoc[leveloffset=+1]
-
-include::antora-publish-procedure.adoc[leveloffset=+1]
-
-include::key-generation.adoc[leveloffset=+1]
-
-include::release-process-prereqs.adoc[leveloffset=+1]
-
-include::policies.adoc[leveloffset=+1]
-include::policies/versioning-policy.adoc[leveloffset=+2]
-include::policies/git-policy.adoc[leveloffset=+2]
-
-include::pmc-notes.adoc[leveloffset=+1]
+//include::applying-patches.adoc[leveloffset=+1]
+//
+//include::merging-a-pull-request.adoc[leveloffset=+1]
+//
+//include::cutting-a-release.adoc[leveloffset=+1]
+//
+//include::verifying-releases.adoc[leveloffset=+1]
+//
+//include::post-release-successful.adoc[leveloffset=+1]
+//
+//include::post-release-unsuccessful.adoc[leveloffset=+1]
+//
+//include::release-process-for-snapshots.adoc[leveloffset=+1]
+//
+//include::release-process-for-interim-releases.adoc[leveloffset=+1]
+//
+//include::antora-publish-procedure.adoc[leveloffset=+1]
+//
+//include::key-generation.adoc[leveloffset=+1]
+//
+//include::release-process-prereqs.adoc[leveloffset=+1]
+//
+//include::policies.adoc[leveloffset=+1]
+//include::policies/versioning-policy.adoc[leveloffset=+2]
+//include::policies/git-policy.adoc[leveloffset=+2]
+//
+//include::pmc-notes.adoc[leveloffset=+1]
diff --git a/antora/toc/modules/comguide/pages/antora-publish-procedure.adoc b/antora/components/comguide/modules/ROOT/pages/antora-publish-procedure.adoc
similarity index 99%
rename from antora/toc/modules/comguide/pages/antora-publish-procedure.adoc
rename to antora/components/comguide/modules/ROOT/pages/antora-publish-procedure.adoc
index c0a2008..565de32 100644
--- a/antora/toc/modules/comguide/pages/antora-publish-procedure.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/antora-publish-procedure.adoc
@@ -12,7 +12,7 @@ Apache Isis' documentation (meaning the website and the users' guide, the refere
The website and guides are created by running build tools (documented below) which create the HTML version of the site and guides.
You can therefore easily check the documentation before raising a pull request (as a contributor) or publishing the site (if a committer).
-For details of authoring/updating the documents and website, see the xref:toc:devguide:asciidoc.adoc[developers' guide].
+For details of authoring/updating the documents and website, see the xref:conguide:ROOT:asciidoc.adoc[Contributors' Guide].
Publishing is performed by copying the generated HTML to a different git repository (link:https://github.com/apache/isis-site.git[isis-site]).
This is synced by ASF infrastructure over to link:http://isis.apache.org[isis.apache.org].
diff --git a/antora/toc/modules/comguide/pages/applying-patches.adoc b/antora/components/comguide/modules/ROOT/pages/applying-patches.adoc
similarity index 100%
rename from antora/toc/modules/comguide/pages/applying-patches.adoc
rename to antora/components/comguide/modules/ROOT/pages/applying-patches.adoc
diff --git a/antora/toc/modules/comguide/pages/cutting-a-release.adoc b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
similarity index 91%
rename from antora/toc/modules/comguide/pages/cutting-a-release.adoc
rename to antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
index 6bd36fa..d5495a9 100644
--- a/antora/toc/modules/comguide/pages/cutting-a-release.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
@@ -6,15 +6,15 @@
The release process consists of:
* the release manager cutting the release (documented below)
-* Members of the Apache Isis PMC xref:toc:comguide:about.adoc#verifying-releases[verifying] and voting on the release
-* the release manager performing post-release tasks, for either a xref:toc:comguide:about.adoc#post-release-successful.adoc[successful] or an xref:toc:comguide:post-release-unsuccessful[unsuccessful] vote.
+* Members of the Apache Isis PMC xref:comguide:ROOT:verifying-releases.adoc[verifying] and voting on the release
+* the release manager performing post-release tasks, for either a xref:comguide:ROOT:post-release-successful.adoc.adoc[successful] or an xref:comguide:ROOT:post-release-unsuccessful[unsuccessful] vote.
Apache Isis itself is released in one go, everything is ultimately a child of `core-parent/pom.xml` (relative to the link:https://github.com/apache/isis[source code root]).
This section details the process for formally releasing this module.
-The subsequent sections describe how other committers can xref:toc:comguide:about.adoc#verifying-releases.adoc[verify a release] and how the release manager can then perform xref:toc:comguide:post-release[post-release] activities and set up for the next development iteration.
+The subsequent sections describe how other committers can xref:comguide:ROOT:verifying-releases.adoc.adoc[verify a release] and how the release manager can then perform xref:comguide:ROOT:post-release[post-release] activities and set up for the next development iteration.
-If you've not performed a release before, then note that there are some configuration xref:toc:comguide:about.adoc#release-process-prereqs[prerequisites] that must be configured first.
+If you've not performed a release before, then note that there are some configuration xref:comguide:ROOT:release-process-prereqs.adoc[prerequisites] that must be configured first.
In particular, you'll need signed public/private keys, and the ASF Nexus staging repo inlocal `~/.m2/settings.xml` file.
These release notes using bash command line tools.
@@ -26,7 +26,7 @@ Before releasing the framework, ensure there is consensus on the xref:toc:ROOT:s
The discussion should include confirming the version number to be used, and to confirm content.
These discussions should also confirm the version number of the module being released.
-This should be in line with our xref:toc:comguide:about.adoc#versioning-policy[semantic versioning policy].
+This should be in line with our xref:comguide:ROOT:versioning-policy.adoc[semantic versioning policy].
Make sure you have a JIRA ticket open against which to perform all commits.
In most cases a JIRA ticket will have been created at the beginning of the previous release cycle.
@@ -49,9 +49,9 @@ env | grep ISIS | sort
----
<1> adjust by platform
<2> set to an "umbrella" ticket for all release activities.
-(One should exist already, xref:toc:comguide:post-release-successful.adoc#create-new-jira[created at] the beginning of the development cycle now completing).
+(One should exist already, xref:comguide:ROOT:post-release-successful.adoc#create-new-jira[created at] the beginning of the development cycle now completing).
-Obviously, alter ``$ISISREL`` as required, and bump ``$ISISRC`` for re-releasing following an xref:toc:comguide:about.adoc#post-release-unsuccessful[unsuccessful] release.
+Obviously, alter ``$ISISREL`` as required, and bump ``$ISISRC`` for re-releasing following an xref:comguide:ROOT:post-release-unsuccessful.adoc[unsuccessful] release.
[IMPORTANT]
====
@@ -115,7 +115,7 @@ so that they should read:
</properties>
----
-NOTE: After release, there is a xref:toc:comguide:cutting-a-release.adoc#reset-revision[similar step at the end] to reset back to `2.0.0-SNAPSHOT`.
+NOTE: After release, there is a xref:comguide:ROOT:cutting-a-release.adoc#reset-revision[similar step at the end] to reset back to `2.0.0-SNAPSHOT`.
@@ -281,7 +281,7 @@ Use `gpg --keyserver hkp://pgp.mit.edu --recv-keys nnnnnnnn` to confirm that the
[NOTE]
====
Unfortunately, Nexus does not seem to allow subkeys to be used for signing.
-See xref:toc:comguide:about.adoc#key-generation[Key Generation] for more details.
+See xref:comguide:ROOT:key-generation.adoc[Key Generation] for more details.
====
== Reset `revision` property
@@ -444,7 +444,7 @@ Remember to update:
* the release candidate number (`RC1` or whatever)
* the `NEXUSREPONUM` to the repository id as provided by Nexus earlier (`10xx` or whatever)
-Note that the email also references the procedure for other committers to xref:toc:comguide:about.adoc#verifying-releases[verify the release].
+Note that the email also references the procedure for other committers to xref:comguide:ROOT:verifying-releases.adoc[verify the release].
diff --git a/antora/toc/modules/comguide/pages/key-generation.adoc b/antora/components/comguide/modules/ROOT/pages/key-generation.adoc
similarity index 100%
rename from antora/toc/modules/comguide/pages/key-generation.adoc
rename to antora/components/comguide/modules/ROOT/pages/key-generation.adoc
diff --git a/antora/toc/modules/comguide/pages/merging-a-pull-request.adoc b/antora/components/comguide/modules/ROOT/pages/merging-a-pull-request.adoc
similarity index 100%
rename from antora/toc/modules/comguide/pages/merging-a-pull-request.adoc
rename to antora/components/comguide/modules/ROOT/pages/merging-a-pull-request.adoc
diff --git a/antora/toc/modules/comguide/pages/pmc-notes.adoc b/antora/components/comguide/modules/ROOT/pages/pmc-notes.adoc
similarity index 100%
rename from antora/toc/modules/comguide/pages/pmc-notes.adoc
rename to antora/components/comguide/modules/ROOT/pages/pmc-notes.adoc
diff --git a/antora/toc/modules/comguide/pages/policies.adoc b/antora/components/comguide/modules/ROOT/pages/policies.adoc
similarity index 89%
rename from antora/toc/modules/comguide/pages/policies.adoc
rename to antora/components/comguide/modules/ROOT/pages/policies.adoc
index 1f80929..9744cc9 100644
--- a/antora/toc/modules/comguide/pages/policies.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/policies.adoc
@@ -11,3 +11,5 @@
This chapter pulls together various policy documents relating to the development of Apache Isis'.
+include::policies/versioning-policy.adoc[leveloffset=+1]
+include::policies/git-policy.adoc[leveloffset=+1]
diff --git a/antora/toc/modules/comguide/pages/policies/git-policy.adoc b/antora/components/comguide/modules/ROOT/pages/policies/git-policy.adoc
similarity index 96%
rename from antora/toc/modules/comguide/pages/policies/git-policy.adoc
rename to antora/components/comguide/modules/ROOT/pages/policies/git-policy.adoc
index fb8222e..ea19041 100644
--- a/antora/toc/modules/comguide/pages/policies/git-policy.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/policies/git-policy.adoc
@@ -96,4 +96,4 @@ ISIS-nnn: brief summary here
where `ISIS-nnn` is a ticket raised in our https://issues.apache.org/jira/browse/ISIS[JIRA issue tracker].
-For non-committers we typically expect more detail again; see the xref:toc:devguide:contributing.adoc[contributing] page for the longer format recommended for contributors to use.
+For non-committers we typically expect more detail again; see the xref:conguide:ROOT:contributing.adoc[contributing] page for the longer format recommended for contributors to use.
diff --git a/antora/toc/modules/comguide/pages/policies/versioning-policy.adoc b/antora/components/comguide/modules/ROOT/pages/policies/versioning-policy.adoc
similarity index 100%
rename from antora/toc/modules/comguide/pages/policies/versioning-policy.adoc
rename to antora/components/comguide/modules/ROOT/pages/policies/versioning-policy.adoc
diff --git a/antora/toc/modules/comguide/pages/post-release-successful.adoc b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
similarity index 98%
rename from antora/toc/modules/comguide/pages/post-release-successful.adoc
rename to antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
index 0fc4987..abbf63f 100644
--- a/antora/toc/modules/comguide/pages/post-release-successful.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
@@ -10,11 +10,11 @@
The release process consists of:
-* the release manager xref:toc:comguide:about.adoc#cutting-a-release[cutting the release]
+* the release manager xref:comguide:ROOT:cutting-a-release.adoc[cutting the release]
-* members of the Apache Isis PMC xref:toc:comguide:about.adoc#verifying-releases[verifying] and voting on the release
+* members of the Apache Isis PMC xref:comguide:ROOT:verifying-releases.adoc[verifying] and voting on the release
-* the release manager performing post-release tasks, for either a successful or an xref:toc:comguide:about.adoc#post-release-unsuccessful[unsuccessful] vote (former documented below)
+* the release manager performing post-release tasks, for either a successful or an xref:comguide:ROOT:post-release-unsuccessful.adoc[unsuccessful] vote (former documented below)
For a vote to succeed, there must be +3 votes from PMC members, and the vote must have been open at least 72 hours.
If there are not +3 votes after this time then it is perfectly permissible to keep the vote open longer.
diff --git a/antora/toc/modules/comguide/pages/post-release-unsuccessful.adoc b/antora/components/comguide/modules/ROOT/pages/post-release-unsuccessful.adoc
similarity index 88%
rename from antora/toc/modules/comguide/pages/post-release-unsuccessful.adoc
rename to antora/components/comguide/modules/ROOT/pages/post-release-unsuccessful.adoc
index b1f7450..6ee5256 100644
--- a/antora/toc/modules/comguide/pages/post-release-unsuccessful.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/post-release-unsuccessful.adoc
@@ -10,9 +10,9 @@
The release process consists of:
-* the release manager xref:toc:comguide:about.adoc#cutting-a-release[cutting the release]
-* members of the Apache Isis PMC xref:toc:comguide:about.adoc#verifying-releases[verifying] and voting on the release
-* the release manager performing post-release tasks, for either a xref:toc:comguide:about.adoc#post-release-successful[successful] or an unsuccessful vote (latter documented below).
+* the release manager xref:comguide:ROOT:cutting-a-release.adoc[cutting the release]
+* members of the Apache Isis PMC xref:comguide:ROOT:verifying-releases.adoc[verifying] and voting on the release
+* the release manager performing post-release tasks, for either a xref:comguide:ROOT:post-release-successful.adoc[successful] or an unsuccessful vote (latter documented below).
If the vote did not succeed (did not achieve +3 votes after 72 hours and/or is unlikely to do so), then the vote should be closed and the following steps performed.
diff --git a/antora/toc/modules/comguide/pages/release-process-for-interim-releases.adoc b/antora/components/comguide/modules/ROOT/pages/release-process-for-interim-releases.adoc
similarity index 90%
rename from antora/toc/modules/comguide/pages/release-process-for-interim-releases.adoc
rename to antora/components/comguide/modules/ROOT/pages/release-process-for-interim-releases.adoc
index 9736853..5afe168 100644
--- a/antora/toc/modules/comguide/pages/release-process-for-interim-releases.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/release-process-for-interim-releases.adoc
@@ -11,7 +11,7 @@
The intent of an "interim" release is to allow a developer team to release their application based on a `-SNAPSHOT` version of the framework.
Since `-SNAPSHOT` changes on a day-to-day basis, the idea is to tag a particular revision and to release this, thereby providing stability/traceability for the application being developed.
-Whereas xref:toc:comguide:about.adoc#cutting-a-release.adoc[formal release]s and xref:toc:comguide:release-process-for-snapshots[snapshot release]s are public (released through the Maven repository maintained by Apache Software Foundation), interim releases are non-public and rely on infrastructure provided by a developer team.
+Whereas xref:comguide:ROOT:cutting-a-release.adoc.adoc[formal release]s and xref:comguide:ROOT:release-process-for-snapshots[snapshot release]s are public (released through the Maven repository maintained by Apache Software Foundation), interim releases are non-public and rely on infrastructure provided by a developer team.
The tagged release resides __not__ in the xref:toc:ROOT:downloads.adoc#\__downloads_source_code[official Apache Isis git repository], but instead in a fork/clone maintained by the developer team.
== Prerequisites
diff --git a/antora/toc/modules/comguide/pages/release-process-for-snapshots.adoc b/antora/components/comguide/modules/ROOT/pages/release-process-for-snapshots.adoc
similarity index 100%
rename from antora/toc/modules/comguide/pages/release-process-for-snapshots.adoc
rename to antora/components/comguide/modules/ROOT/pages/release-process-for-snapshots.adoc
diff --git a/antora/toc/modules/comguide/pages/release-process-prereqs.adoc b/antora/components/comguide/modules/ROOT/pages/release-process-prereqs.adoc
similarity index 92%
rename from antora/toc/modules/comguide/pages/release-process-prereqs.adoc
rename to antora/components/comguide/modules/ROOT/pages/release-process-prereqs.adoc
index e5d78e6..b8d520d 100644
--- a/antora/toc/modules/comguide/pages/release-process-prereqs.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/release-process-prereqs.adoc
@@ -9,14 +9,14 @@
-This section (appendix) describes the prerequisites for the xref:toc:comguide:about.adoc#release-process[release process].
+This section (appendix) describes the prerequisites for the xref:comguide:ROOT:release-process.adoc[release process].
== Configure toolchains plugin
Apache Isis releases are built using Java 7, enforced using the maven toolchains plugin.
-Ensure that Java 7 is installed and the toolchains plugin is configured, as described in the xref:toc:devguide:building-apache-isis.adoc#configure-maven-toolchains-plugin[developers' guide].
+Ensure that Java 7 is installed and the toolchains plugin is configured, as described in the xref:conguide:ROOT:building-apache-isis.adoc#configure-maven-toolchains-plugin[contributors' guide].
@@ -24,7 +24,7 @@ Ensure that Java 7 is installed and the toolchains plugin is configured, as desc
The most important configuration you require is to set up public/private key pair.
This is used by the `maven-release-plugin` to sign the code artifacts.
-See the page on xref:toc:comguide:about.adoc#key-generation[key generation] for more details.
+See the page on xref:comguide:ROOT:key-generation.adoc[key generation] for more details.
In order to prepare the release, you'll (need to) have a `~/.gnupg` directory with the relevant files (`gpg.conf`, `pubring.gpg`, `secring.gpg` etc), and have `gpg` on your operating system PATH.
diff --git a/antora/toc/modules/comguide/pages/verifying-releases.adoc b/antora/components/comguide/modules/ROOT/pages/verifying-releases.adoc
similarity index 91%
rename from antora/toc/modules/comguide/pages/verifying-releases.adoc
rename to antora/components/comguide/modules/ROOT/pages/verifying-releases.adoc
index 794dc1e..b6a093a 100644
--- a/antora/toc/modules/comguide/pages/verifying-releases.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/verifying-releases.adoc
@@ -10,9 +10,9 @@
The release process consists of:
-* the release manager xref:toc:comguide:about.adoc#cutting-a-release[cutting the release]
+* the release manager xref:comguide:ROOT:cutting-a-release.adoc[cutting the release]
* members of the Apache Isis PMC verifying and voting on the release (documented below)
-* the release manager performing post-release tasks, for either a xref:toc:comguide:about.adoc#post-release-successful.adoc[successful] or an xref:toc:comguide:post-release-unsuccessful[unsuccessful] vote.
+* the release manager performing post-release tasks, for either a xref:comguide:ROOT:post-release-successful.adoc.adoc[successful] or an xref:comguide:ROOT:post-release-unsuccessful[unsuccessful] vote.
This section describes some guidance on what a voter (members of the Apache Isis PMC and anyone else who wishes) is expected to do before casting their vote in order to verify a release.
@@ -20,7 +20,7 @@ This section describes some guidance on what a voter (members of the Apache Isis
== Background
-Whenever a release manager announces a vote on a release (as per the xref:toc:comguide:about.adoc#release-process[release process]) on the xref:toc:ROOT:support.adoc#[dev mailing list], it is the responsibility of the project's PMC to cast their vote on the release.
+Whenever a release manager announces a vote on a release (as per the xref:comguide:ROOT:release-process.adoc[release process]) on the xref:toc:ROOT:support.adoc#[dev mailing list], it is the responsibility of the project's PMC to cast their vote on the release.
Anyone else can also vote, but only members of the Apache Isis PMC's vote are binding.
Per this http://www.apache.org/dev/release.html[ASF documentation], the legal requirements for an ASF release are:
@@ -104,7 +104,7 @@ Assuming this completes successfully, you can then test the two starter applicat
You can if you wish perform some additional optional checks, listed in the sections below.
-Alternatively, you can xref:toc:comguide:verifying-releases.adoc#casting-a-vote[cast your vote].
+Alternatively, you can xref:comguide:ROOT:verifying-releases.adoc#casting-a-vote[cast your vote].
@@ -157,7 +157,7 @@ If you forget to deactive the profile, there should be no adverse effects; Maven
The http://creadur.apache.org[Apache Creadur] project exists to provide a set of tools to ensure compliance with Apache's licensing standards.
-The main release auditing tool, http://creadur.apache.org/rat[Apache RAT] is used in the xref:toc:comguide:about.adoc#cutting-a-release[release process].
+The main release auditing tool, http://creadur.apache.org/rat[Apache RAT] is used in the xref:comguide:ROOT:cutting-a-release.adoc[release process].
Creadur's remaining tools - link:http://creadur.apache.org/tentacles/[Tentacles] and link:http://creadur.apache.org/whisker/[Whisker] - are to support the verification process.
diff --git a/antora/toc/antora.yml b/antora/components/conguide/antora.yml
similarity index 62%
copy from antora/toc/antora.yml
copy to antora/components/conguide/antora.yml
index 76c1eaa..b7979b3 100644
--- a/antora/toc/antora.yml
+++ b/antora/components/conguide/antora.yml
@@ -1,5 +1,5 @@
-name: toc
-title: " "
+name: conguide
+title: "Contributors' Guide"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/antora/toc/modules/devguide/attachments/asciidoc-syntax-quick-reference.pdf b/antora/components/conguide/modules/ROOT/attachments/asciidoc/asciidoc-syntax-quick-reference.pdf
similarity index 100%
rename from antora/toc/modules/devguide/attachments/asciidoc-syntax-quick-reference.pdf
rename to antora/components/conguide/modules/ROOT/attachments/asciidoc/asciidoc-syntax-quick-reference.pdf
diff --git a/antora/toc/modules/devguide/attachments/asciidoc-writers-guide.pdf b/antora/components/conguide/modules/ROOT/attachments/asciidoc/asciidoc-writers-guide.pdf
similarity index 100%
rename from antora/toc/modules/devguide/attachments/asciidoc-writers-guide.pdf
rename to antora/components/conguide/modules/ROOT/attachments/asciidoc/asciidoc-writers-guide.pdf
diff --git a/antora/toc/modules/devguide/attachments/eclipse/Apache-Isis-code-style-cleanup.xml b/antora/components/conguide/modules/ROOT/attachments/ide/eclipse/Apache-Isis-code-style-cleanup.xml
similarity index 100%
rename from antora/toc/modules/devguide/attachments/eclipse/Apache-Isis-code-style-cleanup.xml
rename to antora/components/conguide/modules/ROOT/attachments/ide/eclipse/Apache-Isis-code-style-cleanup.xml
diff --git a/ide-settings/eclipse/eclipse-settings.importorder b/antora/components/conguide/modules/ROOT/attachments/ide/eclipse/Apache-Isis.importorder
similarity index 100%
rename from ide-settings/eclipse/eclipse-settings.importorder
rename to antora/components/conguide/modules/ROOT/attachments/ide/eclipse/Apache-Isis.importorder
diff --git a/antora/toc/modules/devguide/attachments/eclipse/Apache-code-style-formatting.xml b/antora/components/conguide/modules/ROOT/attachments/ide/eclipse/Apache-code-style-formatting.xml
similarity index 100%
rename from antora/toc/modules/devguide/attachments/eclipse/Apache-code-style-formatting.xml
rename to antora/components/conguide/modules/ROOT/attachments/ide/eclipse/Apache-code-style-formatting.xml
diff --git a/antora/toc/modules/devguide/attachments/eclipse/Apache-code-style-template.xml b/antora/components/conguide/modules/ROOT/attachments/ide/eclipse/Apache-code-style-template.xml
similarity index 100%
rename from antora/toc/modules/devguide/attachments/eclipse/Apache-code-style-template.xml
rename to antora/components/conguide/modules/ROOT/attachments/ide/eclipse/Apache-code-style-template.xml
diff --git a/ide-settings/intellij/Apache-Isis.xml b/antora/components/conguide/modules/ROOT/attachments/ide/intellij/Apache-Isis-importorder.xml
similarity index 100%
rename from ide-settings/intellij/Apache-Isis.xml
rename to antora/components/conguide/modules/ROOT/attachments/ide/intellij/Apache-Isis-importorder.xml
diff --git a/ide-settings/license-header-java.txt b/antora/components/conguide/modules/ROOT/attachments/license-header-java.txt
similarity index 100%
rename from ide-settings/license-header-java.txt
rename to antora/components/conguide/modules/ROOT/attachments/license-header-java.txt
diff --git a/antora/toc/modules/devguide/images/asciidoctor/ditaa-demo.png b/antora/components/conguide/modules/ROOT/images/asciidoctor/ditaa-demo.png
similarity index 100%
rename from antora/toc/modules/devguide/images/asciidoctor/ditaa-demo.png
rename to antora/components/conguide/modules/ROOT/images/asciidoctor/ditaa-demo.png
diff --git a/antora/toc/modules/devguide/images/asciidoctor/graphviz-demo.png b/antora/components/conguide/modules/ROOT/images/asciidoctor/graphviz-demo.png
similarity index 100%
rename from antora/toc/modules/devguide/images/asciidoctor/graphviz-demo.png
rename to antora/components/conguide/modules/ROOT/images/asciidoctor/graphviz-demo.png
diff --git a/antora/toc/modules/devguide/images/asciidoctor/plantuml-demo.png b/antora/components/conguide/modules/ROOT/images/asciidoctor/plantuml-demo.png
similarity index 100%
rename from antora/toc/modules/devguide/images/asciidoctor/plantuml-demo.png
rename to antora/components/conguide/modules/ROOT/images/asciidoctor/plantuml-demo.png
diff --git a/antora/toc/modules/devguide/images/building-apache-isis/setting-up-git.png b/antora/components/conguide/modules/ROOT/images/building-apache-isis/setting-up-git.png
similarity index 100%
rename from antora/toc/modules/devguide/images/building-apache-isis/setting-up-git.png
rename to antora/components/conguide/modules/ROOT/images/building-apache-isis/setting-up-git.png
diff --git a/antora/toc/modules/devguide/images/contributing/git-workflow.png b/antora/components/conguide/modules/ROOT/images/contributing/git-workflow.png
similarity index 100%
rename from antora/toc/modules/devguide/images/contributing/git-workflow.png
rename to antora/components/conguide/modules/ROOT/images/contributing/git-workflow.png
diff --git a/antora/toc/modules/devguide/images/contributing/git-workflow.pptx b/antora/components/conguide/modules/ROOT/images/contributing/git-workflow.pptx
similarity index 100%
rename from antora/toc/modules/devguide/images/contributing/git-workflow.pptx
rename to antora/components/conguide/modules/ROOT/images/contributing/git-workflow.pptx
diff --git a/antora/toc/modules/devguide/images/contributing/github-cloning.png b/antora/components/conguide/modules/ROOT/images/contributing/github-cloning.png
similarity index 100%
rename from antora/toc/modules/devguide/images/contributing/github-cloning.png
rename to antora/components/conguide/modules/ROOT/images/contributing/github-cloning.png
diff --git a/antora/toc/modules/devguide/images/contributing/github-forking.png b/antora/components/conguide/modules/ROOT/images/contributing/github-forking.png
similarity index 100%
rename from antora/toc/modules/devguide/images/contributing/github-forking.png
rename to antora/components/conguide/modules/ROOT/images/contributing/github-forking.png
diff --git a/antora/components/conguide/modules/ROOT/nav.adoc b/antora/components/conguide/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..ea2a65f
--- /dev/null
+++ b/antora/components/conguide/modules/ROOT/nav.adoc
@@ -0,0 +1,5 @@
+* xref:contributing.adoc[Contributing]
+* xref:building-apache-isis.adoc[Building Apache Isis]
+* xref:building-docs-and-website.adoc[Building Docs and Website]
+* xref:asciidoc-syntax.adoc[Asciidoc Syntax]
+* xref:agilej.adoc[AgileJ]
diff --git a/antora/_component-template/modules/_module-template/pages/about.adoc b/antora/components/conguide/modules/ROOT/pages/about.adoc
similarity index 84%
rename from antora/_component-template/modules/_module-template/pages/about.adoc
rename to antora/components/conguide/modules/ROOT/pages/about.adoc
index c6c0c9d..2669c9b 100644
--- a/antora/_component-template/modules/_module-template/pages/about.adoc
+++ b/antora/components/conguide/modules/ROOT/pages/about.adoc
@@ -1,6 +1,5 @@
-= About
+= Contributors' Guide
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-This doc module is empty, intended for use as a template when creating new modules.
-
+This guide provides guidance to anyone in the community wanting to contribute to Apache Isis' ongoing development.
diff --git a/antora/toc/modules/devguide/pages/agilej.adoc b/antora/components/conguide/modules/ROOT/pages/agilej.adoc
similarity index 84%
rename from antora/toc/modules/devguide/pages/agilej.adoc
rename to antora/components/conguide/modules/ROOT/pages/agilej.adoc
index 9dcde98..667c472 100644
--- a/antora/toc/modules/devguide/pages/agilej.adoc
+++ b/antora/components/conguide/modules/ROOT/pages/agilej.adoc
@@ -5,12 +5,9 @@
-[NOTE]
-====
-This material does not constitute an endorsement; AgileJ Structure Views is not affiliated to Apache Software Foundation in any way. AgileJ has however provided a complimentary copy of its software to Apache Isis committers.
-====
+link:http://www.agilej.com/[AgileJ Structure Views] is a free product to reverse engineer and visualize Java classes from source code.
-link:http://www.agilej.com/[AgileJ Structure Views] is a commercial product to reverse engineer and visualize Java classes from source code.
+NOTE: This material does not constitute an endorsement; AgileJ Structure Views is not affiliated to Apache Software Foundation in any way.
The key to using the tool is in developing a suitable filter script, a DSL. You can use the following script as a starting point for visualizing Apache Isis domain models:
diff --git a/antora/toc/modules/devguide/pages/asciidoc-syntax.adoc b/antora/components/conguide/modules/ROOT/pages/asciidoc-syntax.adoc
similarity index 89%
rename from antora/toc/modules/devguide/pages/asciidoc-syntax.adoc
rename to antora/components/conguide/modules/ROOT/pages/asciidoc-syntax.adoc
index 70ebd5a..e0db4bd 100644
--- a/antora/toc/modules/devguide/pages/asciidoc-syntax.adoc
+++ b/antora/components/conguide/modules/ROOT/pages/asciidoc-syntax.adoc
@@ -230,9 +230,9 @@ link:http://ciserver:8080[CI Server^]
|Link to an external hyperlink, with `target=blank`
|....
-xref:toc:devguide:about.adoc#links-and-xrefs[background]
+xref:conguide:ROOT:about.adoc#links-and-xrefs[background]
....
-|xref:toc:devguide:about.adoc#links-and-xrefs[background]
+|xref:conguide:ROOT:about.adoc#links-and-xrefs[background]
|Cross-reference to section in Antora document
@@ -734,80 +734,9 @@ image:_images/vscode.png[link="_images/vscode.png",width="800px"]
Use the `include:` macro to break up a document into multiple sections.
-For example, this xref:toc:devguide:about.adoc[developers' guide] document is broken into several files:
-
-....
-dg.adoc
-_dg_ide.adoc
-_dg_hints-and-tips.adoc
-_dg_building-apache-isis.adoc
-...
-....
-
-and so on.
-
-These are included using:
-
-[source,asciidoc]
-----
-\include::_dg_ide.adoc[leveloffset=+1]
-\include::_dg_hints-and-tips.adoc[leveloffset=+1]
-\include::_dg_building-apache-isis.adoc[leveloffset=+1]
-...
-----
-
The `leveloffset=+1` means that each included file's heading levels are automatically adjusted.
The net effect is that all documents can and should use heading 1 as their top-level.
-Child documents should have '_' as prefix.
-This ensures that they are ignored by the build; only .html and PDF files are created for the top-level parent documents.
-
-The CI/documentation platform also supports the "Improve this doc" button, allowing any document to be edited via the TFS portal; very useful for small fixes.
-To make this work, it relies upon the following naming conventions:
-
-* every document should have an id anchor for its level heading corresponding to its file name
-* every child document's name should be an '_ followed by the name of its parent.
-
-For example, `dg.adoc` is:
-
-[source,asciidoc]
-----
-[[dg]]
-= Developers' Guide
-...
-----
-
-while its child document `_dg_ide.adoc` starts with:
-
-[source,asciidoc]
-----
-= Using an IDE
-...
-----
-
-In general, we use '_' to separate out the logical hierarchy:
-
-[source]
-----
-xxx-xxx/xxx-xxx.adoc
- _xxx-xxx_ppp-ppp.adoc
- _xxx-xxx_qqq-qqq.adoc
- _xxx-xxx_qqq-qqq_mmm-mmm.adoc
- _xxx-xxx_qqq-qqq_nnn-nnn.adoc
-----
-
-Any referenced images should be in subdirectories of the `_images` directory:
-
-[source]
-----
-xxx-xxx/_images/.
- /ppp-ppp/.
- /qqq-qqq/.
- /mmm-mmm
- /nnn-nnn
-----
-
-
== Metadata
diff --git a/antora/toc/modules/devguide/pages/building-apache-isis.adoc b/antora/components/conguide/modules/ROOT/pages/building-apache-isis.adoc
similarity index 97%
rename from antora/toc/modules/devguide/pages/building-apache-isis.adoc
rename to antora/components/conguide/modules/ROOT/pages/building-apache-isis.adoc
index ff36923..d8a4b45 100644
--- a/antora/toc/modules/devguide/pages/building-apache-isis.adoc
+++ b/antora/components/conguide/modules/ROOT/pages/building-apache-isis.adoc
@@ -129,7 +129,7 @@ For further reading, see:
Apache Isis is compatible with Java 7 and Java 8. For every-day use, the framework is usually compiled against Java 8.
-Releases however are xref:toc:comguide:about.adoc#cutting-a-release[cut] using Java 7, leveraging the link:http://maven.apache.org/plugins/maven-toolchains-plugin/[Maven toolchains plugin]).
+Releases however are xref:comguide:ROOT:cutting-a-release.adoc[cut] using Java 7, leveraging the link:http://maven.apache.org/plugins/maven-toolchains-plugin/[Maven toolchains plugin]).
Therefore install either/both of Java 7 JDK and Java 8 JDK. Note that the JRE is _not_ sufficient.
diff --git a/antora/toc/modules/devguide/pages/building-docs-and-website.adoc b/antora/components/conguide/modules/ROOT/pages/building-docs-and-website.adoc
similarity index 100%
rename from antora/toc/modules/devguide/pages/building-docs-and-website.adoc
rename to antora/components/conguide/modules/ROOT/pages/building-docs-and-website.adoc
diff --git a/antora/toc/modules/devguide/pages/cmd-line.adoc b/antora/components/conguide/modules/ROOT/pages/cmd-line.adoc
similarity index 100%
rename from antora/toc/modules/devguide/pages/cmd-line.adoc
rename to antora/components/conguide/modules/ROOT/pages/cmd-line.adoc
diff --git a/antora/toc/modules/devguide/pages/contributing.adoc b/antora/components/conguide/modules/ROOT/pages/contributing.adoc
similarity index 97%
rename from antora/toc/modules/devguide/pages/contributing.adoc
rename to antora/components/conguide/modules/ROOT/pages/contributing.adoc
index 081bdd5..af3c176 100644
--- a/antora/toc/modules/devguide/pages/contributing.adoc
+++ b/antora/components/conguide/modules/ROOT/pages/contributing.adoc
@@ -6,7 +6,8 @@
-This page explains how you can contribute to Apache Isis. You'll probably also want xref:toc:devguide:ide.adoc[set up your IDE] and learn xref:toc:devguide:building-apache-isis.adoc[how to build Apache Isis].
+This page explains how you can contribute to Apache Isis.
+You'll probably also want xref:setupguide:ROOT:ide.adoc[set up your IDE] and learn xref:conguide:ROOT:building-apache-isis.adoc[how to build Apache Isis].
Thanks for considering to help out, your contributions are appreciated!
@@ -159,7 +160,7 @@ The command line prompt should also indicate you are on a branch, isolated from
=== Make File Changes and Commit
-Next, make changes to your files using the usual commands (see also our xref:toc:devguide:git-cookbook.adoc[git cookbook] section):
+Next, make changes to your files using the usual commands (see also our xref:setupguide:ROOT:git-cookbook.adoc[git cookbook] section):
* `git add`
* `git mv`
diff --git a/antora/toc/modules/devguide/partials/x.sh b/antora/components/conguide/modules/ROOT/partials/x.sh
similarity index 100%
copy from antora/toc/modules/devguide/partials/x.sh
copy to antora/components/conguide/modules/ROOT/partials/x.sh
diff --git a/antora/toc/antora.yml b/antora/components/relnotes/antora.yml
similarity index 65%
copy from antora/toc/antora.yml
copy to antora/components/relnotes/antora.yml
index 76c1eaa..ea4f922 100644
--- a/antora/toc/antora.yml
+++ b/antora/components/relnotes/antora.yml
@@ -1,5 +1,5 @@
-name: toc
-title: " "
+name: relnotes
+title: "Release Notes"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/antora/components/relnotes/modules/ROOT/nav.adoc b/antora/components/relnotes/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..f418012
--- /dev/null
+++ b/antora/components/relnotes/modules/ROOT/nav.adoc
@@ -0,0 +1,61 @@
+* 2019
+
+** xref:relnotes:ROOT:2019/2.0.0-M2/relnotes.adoc[2.0.0-M2]
+** xref:relnotes:ROOT:2019/1.17.0/relnotes.adoc[1.17.0]
+
+* 2018
+
+** xref:relnotes:ROOT:2018/2.0.0-M1/relnotes.adoc[2.0.0-M1]
+** xref:relnotes:ROOT:2018/1.16.2/relnotes.adoc[1.16.2]
+** xref:relnotes:ROOT:2018/1.16.1/relnotes.adoc[1.16.1]
+** xref:relnotes:ROOT:2018/1.16.0/relnotes.adoc[1.16.0]
+
+
+* 2017
+
+** xref:relnotes:ROOT:2017/1.15.1/relnotes.adoc[1.15.1]
+** xref:relnotes:ROOT:2017/1.15.0/relnotes.adoc[1.15.0]
+** xref:relnotes:ROOT:2017/1.14.0/relnotes.adoc[1.14.0]
+** xref:relnotes:ROOT:2017/1.13.2.1/relnotes.adoc[1.13.2.1]
+
+
+* 2016
+
+** xref:relnotes:ROOT:2016/1.13.2/relnotes.adoc[1.13.2]
+** xref:relnotes:ROOT:2016/1.13.1/relnotes.adoc[1.13.1]
+** xref:relnotes:ROOT:2016/1.13.0/relnotes.adoc[1.13.0]
+** xref:relnotes:ROOT:2016/1.12.2/relnotes.adoc[1.12.2]
+** xref:relnotes:ROOT:2016/1.12.1/relnotes.adoc[1.12.1]
+** xref:relnotes:ROOT:2016/1.12.0/relnotes.adoc[1.12.0]
+** xref:relnotes:ROOT:2016/1.11.1/relnotes.adoc[1.11.1]
+** xref:relnotes:ROOT:2016/1.11.0/relnotes.adoc[1.11.0]
+
+
+* 2015
+
+** xref:relnotes:ROOT:2015/1.10.0/relnotes.adoc[1.10.0]
+** xref:relnotes:ROOT:2015/1.9.0/relnotes.adoc[1.9.0]
+** xref:relnotes:ROOT:2014/1.8.0/relnotes.adoc[1.8.0]
+
+
+* 2014
+
+** xref:relnotes:ROOT:2014/1.7.0/relnotes.adoc[1.7.0]
+** xref:relnotes:ROOT:2014/1.6.0/relnotes.adoc[1.6.0]
+** xref:relnotes:ROOT:2014/1.5.0/relnotes.adoc[1.5.0]
+** xref:relnotes:ROOT:2014/1.4.1/relnotes.adoc[1.4.1]
+** xref:relnotes:ROOT:2014/1.4.0/relnotes.adoc[1.4.0]
+
+
+* 2013
+
+** xref:relnotes:ROOT:2013/1.3.1/relnotes.adoc[1.3.1]
+** xref:relnotes:ROOT:2013/1.3.0/relnotes.adoc[1.3.0]
+** xref:relnotes:ROOT:2013/1.2.0/relnotes.adoc[1.2.0]
+** xref:relnotes:ROOT:2013/1.1.0/relnotes.adoc[1.1.0]
+** xref:relnotes:ROOT:2013/1.0.1/relnotes.adoc[1.0.1]
+
+
+* 2012
+
+** xref:relnotes:ROOT:2012/1.0.0/relnotes.adoc[1.0.0]
diff --git a/antora/toc/modules/relnotes/pages/rn-1.0.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2012/1.0.0/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.0.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2012/1.0.0/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.0.1.adoc b/antora/components/relnotes/modules/ROOT/pages/2013/1.0.1/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.0.1.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2013/1.0.1/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.1.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2013/1.1.0/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.1.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2013/1.1.0/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.2.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2013/1.2.0/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.2.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2013/1.2.0/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.3.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2013/1.3.0/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.3.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2013/1.3.0/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.3.1.adoc b/antora/components/relnotes/modules/ROOT/pages/2013/1.3.1/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.3.1.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2013/1.3.1/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.4.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2014/1.4.0/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.4.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2014/1.4.0/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.4.1.adoc b/antora/components/relnotes/modules/ROOT/pages/2014/1.4.1/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.4.1.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2014/1.4.1/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.5.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2014/1.5.0/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.5.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2014/1.5.0/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.6.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2014/1.6.0/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.6.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2014/1.6.0/relnotes.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.6.0-to-1.7.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2014/1.7.0/mignotes.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.6.0-to-1.7.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2014/1.7.0/mignotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.7.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2014/1.7.0/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.7.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2014/1.7.0/relnotes.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.9.0-to-1.10.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2015/1.10.0/mignotes.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.9.0-to-1.10.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2015/1.10.0/mignotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.10.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2015/1.10.0/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.10.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2015/1.10.0/relnotes.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.7.0-to-1.8.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2015/1.8.0/mignotes.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.7.0-to-1.8.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2015/1.8.0/mignotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.8.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2015/1.8.0/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.8.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2015/1.8.0/relnotes.adoc
diff --git a/antora/toc/modules/devguide/pages/ide.adoc b/antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/mignotes.adoc
similarity index 62%
copy from antora/toc/modules/devguide/pages/ide.adoc
copy to antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/mignotes.adoc
index 73d2466..96a029e 100644
--- a/antora/toc/modules/devguide/pages/ide.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/mignotes.adoc
@@ -1,15 +1,18 @@
-[[ide]]
-= Using an IDE
+= Migrating from v1.8.0 to 1.9.0
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
+include::mignotes/upgrading-to-dn4.adoc[leveloffset=+1]
+include::mignotes/specify-all-dom-packages.adoc[leveloffset=+1]
+include::mignotes/upgrading-to-java8.adoc[leveloffset=+1]
+include::mignotes/exception-recognizer.adoc[leveloffset=+1]
+include::mignotes/fixture-scripts-specification-provider.adoc[leveloffset=+1]
+include::mignotes/war-packaging.adoc[leveloffset=+1]
+include::mignotes/bootstrapping-using-AppManifest.adoc[leveloffset=+1]
-The vast majority of Java developers use an IDE to assist with developing their code, and we highly recommend that you do likewise as you develop your Apache Isis applications using an IDE.
-Apache Isis is built with Maven, and all modern IDEs can import Maven projects.
-This chapter shows how to setup and use two of the most popular IDEs, IntelliJ IDEA and Eclipse.
diff --git a/antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc b/antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/mignotes/bootstrapping-using-AppManifest.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/mignotes/bootstrapping-using-AppManifest.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_exception-recognizer.adoc b/antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/mignotes/exception-recognizer.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_exception-recognizer.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/mignotes/exception-recognizer.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_fixture-scripts-specification-provider.adoc b/antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/mignotes/fixture-scripts-specification-provider.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_fixture-scripts-specification-provider.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/mignotes/fixture-scripts-specification-provider.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_specify-all-dom-packages.adoc b/antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/mignotes/specify-all-dom-packages.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_specify-all-dom-packages.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/mignotes/specify-all-dom-packages.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_upgrading-to-dn4.adoc b/antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/mignotes/upgrading-to-dn4.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_upgrading-to-dn4.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/mignotes/upgrading-to-dn4.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_upgrading-to-java8.adoc b/antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/mignotes/upgrading-to-java8.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_upgrading-to-java8.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/mignotes/upgrading-to-java8.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_war-packaging.adoc b/antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/mignotes/war-packaging.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_war-packaging.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/mignotes/war-packaging.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.9.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/relnotes.adoc
similarity index 99%
rename from antora/toc/modules/relnotes/pages/rn-1.9.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/relnotes.adoc
index 7f7f387..6285c30 100644
--- a/antora/toc/modules/relnotes/pages/rn-1.9.0.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2015/1.9.0/relnotes.adoc
@@ -9,8 +9,6 @@ It also updates the DataNucleus version to DN 4.1.x.
This release was also the first to include the updated Asciidoc website.
-
-
== New Feature
* link:https://issues.apache.org/jira/browse/ISIS-1167[ISIS-1167] - NullPrintStream in unittestsupport to reduce the noise of unit tests that log to stdout or stderr
@@ -32,7 +30,6 @@ This release was also the first to include the updated Asciidoc website.
* link:https://issues.apache.org/jira/browse/ISIS-1028[ISIS-1028] - Create Event Bus Service based on Axon
* link:https://issues.apache.org/jira/browse/ISIS-940[ISIS-940] - Extend the CommandService so that both the editing and also the rendering of an entity are shown as commands.
-
== Improvement
* link:https://issues.apache.org/jira/browse/ISIS-1191[ISIS-1191] - Broken links
@@ -86,7 +83,6 @@ This release was also the first to include the updated Asciidoc website.
* link:https://issues.apache.org/jira/browse/ISIS-1077[ISIS-1077] - Use the provided 'cssClass' for action menu items
* link:https://issues.apache.org/jira/browse/ISIS-1068[ISIS-1068] - Rationalize menuOrder for domain services that appear in UI
-
== Bug
* link:https://issues.apache.org/jira/browse/ISIS-1190[ISIS-1190] - If an referenced object cannot be loaded (not found in the database), then this should be handled gracefully
@@ -115,13 +111,11 @@ This release was also the first to include the updated Asciidoc website.
* link:https://issues.apache.org/jira/browse/ISIS-1057[ISIS-1057] - WebRequestCycleForIsis should use the configured SignIn page
* link:https://issues.apache.org/jira/browse/ISIS-1004[ISIS-1004] - Infitinite recursion in updating() callback when call setter
-
== Dependency upgrade
* link:https://issues.apache.org/jira/browse/ISIS-1163[ISIS-1163] - Update Jetty (as used by our IsisWebServer launcher) to 9.x
* link:https://issues.apache.org/jira/browse/ISIS-1140[ISIS-1140] - Now that JDK7 is eol, we should build using Java8; retain source and target compiler level set to 1.7.
-
== Task
* link:https://issues.apache.org/jira/browse/ISIS-1187[ISIS-1187] - Mothball the legacy (never documented) integration testing support
@@ -129,7 +123,6 @@ This release was also the first to include the updated Asciidoc website.
* link:https://issues.apache.org/jira/browse/ISIS-1058[ISIS-1058] - Upgrade embedded Jetty to latest 8.x
* link:https://issues.apache.org/jira/browse/ISIS-1052[ISIS-1052] - Isis 1.9.0 release tasks
-
== Wish
* link:https://issues.apache.org/jira/browse/ISIS-1060[ISIS-1060] - An exception is logged when the provided credentials are invalid
diff --git a/antora/toc/modules/mignotes/pages/mn-1.10.0-to-1.11.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2016/1.11.0/mignotes.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.10.0-to-1.11.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2016/1.11.0/mignotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.11.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2016/1.11.0/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.11.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2016/1.11.0/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.11.1.adoc b/antora/components/relnotes/modules/ROOT/pages/2016/1.11.1/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.11.1.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2016/1.11.1/relnotes.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.11.0-to-1.12.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2016/1.12.0/mignotes.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.11.0-to-1.12.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2016/1.12.0/mignotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.12.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2016/1.12.0/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.12.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2016/1.12.0/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.12.1.adoc b/antora/components/relnotes/modules/ROOT/pages/2016/1.12.1/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.12.1.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2016/1.12.1/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.12.2.adoc b/antora/components/relnotes/modules/ROOT/pages/2016/1.12.2/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.12.2.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2016/1.12.2/relnotes.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.12.0-to-1.13.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2016/1.13.0/mignotes.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.12.0-to-1.13.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2016/1.13.0/mignotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.13.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2016/1.13.0/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.13.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2016/1.13.0/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.13.1.adoc b/antora/components/relnotes/modules/ROOT/pages/2016/1.13.1/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.13.1.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2016/1.13.1/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.13.2.adoc b/antora/components/relnotes/modules/ROOT/pages/2016/1.13.2/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.13.2.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2016/1.13.2/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.13.2.1.adoc b/antora/components/relnotes/modules/ROOT/pages/2017/1.13.2.1/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.13.2.1.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2017/1.13.2.1/relnotes.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.13.0-to-1.14.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2017/1.14.0/mignotes.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.13.0-to-1.14.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2017/1.14.0/mignotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.14.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2017/1.14.0/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.14.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2017/1.14.0/relnotes.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.14.0-to-1.15.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2017/1.15.0/mignotes.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.14.0-to-1.15.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2017/1.15.0/mignotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.15.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2017/1.15.0/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.15.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2017/1.15.0/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.15.1.adoc b/antora/components/relnotes/modules/ROOT/pages/2017/1.15.1/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.15.1.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2017/1.15.1/relnotes.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.15.0-to-1.16.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2018/1.16.0/mignotes.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.15.0-to-1.16.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2018/1.16.0/mignotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.16.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2018/1.16.0/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.16.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2018/1.16.0/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.16.1.adoc b/antora/components/relnotes/modules/ROOT/pages/2018/1.16.1/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.16.1.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2018/1.16.1/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.16.2.adoc b/antora/components/relnotes/modules/ROOT/pages/2018/1.16.2/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.16.2.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2018/1.16.2/relnotes.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-configuration-properties.adoc b/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes.adoc
similarity index 59%
copy from antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-configuration-properties.adoc
copy to antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes.adoc
index 161f19c..39728bd 100644
--- a/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-configuration-properties.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes.adoc
@@ -1,28 +1,15 @@
-= Removed configuration properties
+= From v1.16.x to 2.0.0-M1
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
-
-
-The following configuration properties are no longer recognised.
-
-
-.Removed configuration properties
-[cols="3a,3a", options="header"]
-|===
-
-| Configuration property
-| Description
-
-|`isis.persistor. +
-datanucleus. +
-PublishingService. +
-serializedForm`
-|`PublishingService` has been removed.
-Use link:https://isis.apache.org/versions/2.0.0-M1/guides/rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`] instead.
-
-|===
-
-
+include::mignotes/meta-annotations.adoc[leveloffset=+1]
+include::mignotes/updated-annotations.adoc[leveloffset=+1]
+include::mignotes/removed-annotations.adoc[leveloffset=+1]
+include::mignotes/moved-types.adoc[leveloffset=+1]
+include::mignotes/removed-configuration-properties.adoc[leveloffset=+1]
+include::mignotes/updated-classes.adoc[leveloffset=+1]
+include::mignotes/removed-types.adoc[leveloffset=+1]
+include::mignotes/legacy-modules.adoc[leveloffset=+1]
+include::mignotes/other-changes.adoc[leveloffset=+1]
diff --git a/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_legacy-modules.adoc b/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/legacy-modules.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_legacy-modules.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/legacy-modules.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_meta-annotations.adoc b/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/meta-annotations.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_meta-annotations.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/meta-annotations.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_moved-types.adoc b/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/moved-types.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_moved-types.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/moved-types.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_other-changes.adoc b/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/other-changes.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_other-changes.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/other-changes.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-annotations.adoc b/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/removed-annotations.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-annotations.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/removed-annotations.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-configuration-properties.adoc b/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/removed-configuration-properties.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-configuration-properties.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/removed-configuration-properties.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-types.adoc b/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/removed-types.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-types.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/removed-types.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_updated-annotations.adoc b/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/updated-annotations.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_updated-annotations.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/updated-annotations.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_updated-classes.adoc b/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/updated-classes.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_updated-classes.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/mignotes/updated-classes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-2.0.0-M1.adoc b/antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-2.0.0-M1.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2018/2.0.0-M1/relnotes.adoc
diff --git a/antora/toc/modules/mignotes/pages/mn-1.16.0-to-1.17.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2019/1.17.0/mignotes.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/mn-1.16.0-to-1.17.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2019/1.17.0/mignotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-1.17.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2019/1.17.0/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-1.17.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2019/1.17.0/relnotes.adoc
diff --git a/antora/toc/modules/relnotes/pages/rn-2.0.0-M2.adoc b/antora/components/relnotes/modules/ROOT/pages/2019/2.0.0-M2/relnotes.adoc
similarity index 100%
rename from antora/toc/modules/relnotes/pages/rn-2.0.0-M2.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2019/2.0.0-M2/relnotes.adoc
diff --git a/antora/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M3/migrating-to-2.0.0.adoc
similarity index 100%
rename from antora/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc
rename to antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M3/migrating-to-2.0.0.adoc
diff --git a/antora/components/relnotes/modules/ROOT/pages/about.adoc b/antora/components/relnotes/modules/ROOT/pages/about.adoc
new file mode 100644
index 0000000..7dd3769
--- /dev/null
+++ b/antora/components/relnotes/modules/ROOT/pages/about.adoc
@@ -0,0 +1,422 @@
+= Release Notes
+:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or ag [...]
+:page-role: -toc
+
+
+This table summarises all releases of Apache Isis to date.
+
+[cols="2,2,4a,>1,>1,>1,3a"]
+|===
+| Version
+| Date
+| Summary
+| Features
+| Improves
+| Bugs
+| Detail
+
+
+| 2.0.0-M2
+| 22-01-2019
+| Second milestone release for Apache Isis 2.0.0: tree support, initial work on simplifying bootstrapping and configuration, removing dependencies
+| 2
+| 36
+| 13
+|
+* xref:relnotes:ROOT:2019/2.0.0-M2/relnotes.adoc[Release Notes]
+* https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342393[JIRA Rel Notes]
+
+|1.17.0
+| 06-01-2019
+| Sidebar dialogs, metamodel export
+| 4
+| 17
+| 9
+|
+* xref:relnotes:ROOT:2019/1.17.0/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2019/1.17.0/mignotes.adoc[Migration Notes]
+* https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342854[JIRA Rel Notes]
+
+|2.0.0-M1
+| 31-07-2018
+| First milestone release for Apache Isis 2.0.0: Java 8 support, DataNucleus 5.1, Wicket 8, meta-annotations, breadcrumbs
+| 6
+| 55
++ 4 tasks
++ 13 sub-tasks
+| 22
+|
+* xref:relnotes:ROOT:2018/2.0.0-M1/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2018/2.0.0-M1/mignotes.adoc[Migration Notes]
+* https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342392[JIRA Rel Notes]
+
+
+| 1.16.2
+| 05-03-2018
+| RO viewer support, performance improvement, fix of severe bug for parented checkboxes
+| 1
+| 6
+| 1
+|
+* xref:relnotes:ROOT:2018/1.16.2/relnotes.adoc[Release Notes]
+* https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342822[JIRA Rel Notes]
+
+| 1.16.1
+| 22-02-2018
+| Parented collections with checkboxes, replay module
+| 4
+| 10
+| 17
+|
+* xref:relnotes:ROOT:2018/1.16.1/relnotes.adoc[Release Notes]
+* https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342424[JIRA Rel Notes]
+
+| 1.16.0
+| 08-01-2018
+| Modules, simplified bootstrapping, menubars.layout.xml
+| 13
+| 16
+| 26
+|
+* xref:relnotes:ROOT:2018/1.16.0/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2018/1.16.0/mignotes.adoc[Migration Notes]
+* https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342073[JIRA Rel Notes]
+
+| 1.15.1
+| 25-09-2017
+| Bug fixes, Wicket 7.9.0, Markup valuetype
+| 5
+| 4
+| 9
+|
+* xref:relnotes:ROOT:2017/1.15.1/relnotes.adoc[Release Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12341577[JIRA Rel Notes]
+
+| 1.15.0
+| 14-08-2017
+| Inline prompts, Wicket 7.x
+| 7
+| 25
+| 34
+|
+* xref:relnotes:ROOT:2017/1.15.0/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2017/1.15.0/mignotes.adoc[Migration Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12338577[JIRA Rel Notes]
+
+| 1.14.0
+| 19-02-2017
+| Actions with collection parameters, metamodel validations.
+| 3
+| 11
+| 11
+|
+* xref:relnotes:ROOT:2017/1.14.0/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2017/1.14.0/mignotes.adoc[Migration Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12338898[JIRA Rel Notes]
+
+| 1.13.2.1
+| 03-jan-2017
+| Patch release for simpleapp archetype only (docker images, regular actions instead of mixins)
+| 0
+| 2
+| 0
+|
+* xref:relnotes:ROOT:2017/1.13.2.1/relnotes.adoc[Release Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12338937[JIRA Rel Notes]
+
+| 1.13.2
+| 14-dec-2016
+| Patch release, modular simpleapp archetype
+| 2
+| 9
+| 5
+|
+* xref:relnotes:ROOT:2016/1.13.2/relnotes.adoc[Release Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12338744[JIRA Rel Notes]
+
+| 1.13.1
+| 30-oct-2016
+| Patch release, better support for docker
+| 1
+| 13
+| 21
+|
+* xref:relnotes:ROOT:2016/1.13.1/relnotes.adoc[Release Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12337967[JIRA Rel Notes]
+
+| 1.13.0
+| 11-jul-2016
+| Commands, interactions and internal refactorings
+| 27
+| 50
+| 23
+|
+* xref:relnotes:ROOT:2016/1.13.0/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2016/1.13.0/mignotes.adoc[Migration Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12335362[JIRA Rel Notes]
+
+| 1.12.2
+| 06-jun-2016
+| Bug-fix release
+| 0
+| 0
+| 2
+|
+* xref:relnotes:ROOT:2016/1.12.2/relnotes.adoc[Release Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12335949[JIRA Rel Notes]
+
+| 1.12.1
+| 12-apr-2016
+| Bug-fix release
+| 0
+| 0
+| 4
+|
+* xref:relnotes:ROOT:2016/1.12.1/relnotes.adoc[Release Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12335484[JIRA Rel Notes]
+
+| 1.12.0
+| 29-mar-2016
+| Dynamic XML layouts
+| 7
+| 21
+| 21
+|
+* xref:relnotes:ROOT:2016/1.12.0/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2016/1.12.0/mignotes.adoc[Migration Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12327483[JIRA Rel Notes]
+
+| 1.11.1
+| 17-jan-2016
+| Re-release under Java 1.7 (using toolchains plugin).
+| 0
+| 0
+| 1
+|
+* xref:relnotes:ROOT:2016/1.11.1/relnotes.adoc[Release Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12334640[JIRA Rel Notes]
+
+| 1.11.0
+| 02-jan-2016
+| More flexible REST API, view models using JAXB.
+| 9
+| 19
+| 12
+|
+* xref:relnotes:ROOT:2016/1.11.0/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2016/1.11.0/mignotes.adoc[Migration Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12333974[JIRA Rel Notes]
+
+| 1.10.0
+| 10-nov-2015
+| New domain services, multi-tenancy support and mixins.
+| 7
+| 18
+| 12
+|
+* xref:relnotes:ROOT:2015/1.10.0/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2015/1.10.0/mignotes.adoc[Migration Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12333354[JIRA Rel Notes]
+
+| 1.9.0
+| 1-sep-2015
+| AppManifest, Restful Objects representations and other "under-the-cover" improvements.
+| 18
+| 50
+| 25
+|
+* xref:relnotes:ROOT:2015/1.9.0/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2015/1.9.0/mignotes.adoc[Migration Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12332806[JIRA Rel Notes]
+
+| 1.8.0
+| 24-feb-2015
+| Wicket viewer moved into core; todoapp archetype moved to link:http://www.isisaddons.org[Isis Addons] (non-ASF).
+| 27
+| 41
+| 20
+|
+* xref:relnotes:ROOT:2015/1.8.0/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2015/1.8.0/mignotes.adoc[Migration Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12328845[JIRA Rel Notes (core)]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12328847[JIRA Rel Notes (archetype)]
+
+| 1.7.0
+| 18-oct-2014
+| Module functionality previously in 1.6.0 now retired; use link:http://www.isisaddons.org[Isis Addons] (non-ASF) instead.
+| 4
+| 9
+| 20
+|
+* xref:relnotes:ROOT:2014/1.7.0/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2014/1.7.0/mignotes.adoc[Migration Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326453[JIRA Rel Notes (core)]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326460[JIRA Rel Notes (viewer-wicket)]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12327441[JIRA Rel Notes (archetype-simpleapp)]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12327440[JIRA Rel Notes (archetype-todoapp)]
+
+| 1.6.0
+| 28-jul-2014
+| Restful Objects viewer, JDO/Datanucleus Objectstore and Shiro Security all moved into core. Quickstart-wrj archetype renamed to todoapp; simple-wrj archetype renamed to simpleapp. Some functionality copied/refactored as link:http://www.isisaddons.org[Isis Addons] (non-ASF).
+| 6
+| 12
+| 15
+|
+* xref:relnotes:ROOT:2014/1.6.0/relnotes.adoc[Release Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12325314[JIRA Rel Notes (core)]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12325318[JIRA Rel Notes (viewer-wicket)]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326462[JIRA Rel Notes (archetype-simpleapp)]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326461[JIRA Rel Notes (archetype-todoapp)]
+
+| 1.5.0
+| 08-jun-2014
+| No longer releasing security-file
+| 3
+| 19
+| 13
+|
+* xref:relnotes:ROOT:2014/1.5.0/relnotes.adoc[Release Notes]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326524[JIRA Rel Notes (core)]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326525[JIRA Rel Notes (objectstore-jdo)]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326529[JIRA Rel Notes (security-shiro)]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326947[JIRA Rel Notes (viewer-restfulobjects)]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326526[JIRA Rel Notes (viewer-wicket)]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326528[JIRA Rel Notes (archetype-simple-wrj)]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326527[JIRA Rel Notes (archetype-quickstart-wrj)]
+
+| 1.4.1
+| 14-mar-2014
+| Patch release
+| 0
+| 2
+| 2
+|
+* xref:relnotes:ROOT:2014/1.4.1/relnotes.adoc[Release Notes]
+* objectstore-jdo-1.4.1
+* viewer-wicket-1.4.1
+* archetype-simple-wrj-1.4.1
+* archetype-quickstart-wrj-1.4.1
+
+| 1.4.0
+| 11-mar-2014
+|
+| 56
+| 62
+| 26
+|
+* xref:relnotes:ROOT:2014/1.4.0/relnotes.adoc[Release Notes]
+* core-1.4.0
+* objectstore-jdo-1.4.0
+* security-file-1.4.0
+* security-shiro-1.4.0
+* viewer-restfulobjects-2.2.0
+* viewer-wicket-1.4.0
+* archetype-simple-wrj-1.4.0
+* archetype-quickstart-wrj-1.4.0
+
+| 1.3.1
+| 7-nov-2013
+| Patch release
+| 1
+| 0
+| 3
+|
+* xref:relnotes:ROOT:2013/1.3.1/relnotes.adoc[Release Notes]
+* viewer-wicket-1.3.1
+* archetype-simple-wrj-1.3.1
+* archetype-quickstart-wrj-1.3.1
+
+| 1.3.0
+| 25-oct-2013
+| WRJ archetype renamed to Quickstart WRJ. Simple WRJ archetype added.
+| 52
+| 61
+| 30
+|
+* xref:relnotes:ROOT:2013/1.3.0/relnotes.adoc[Release Notes]
+* core-1.3.0
+* objectstore-jdo-1.3.0
+* security-file-1.0.2
+* security-shiro-1.3.0
+* viewer-restfulobjects-2.1.0
+* viewer-wicket-1.3.0
+* archetype-simple-wrj-1.3.0
+* archetype-quickstart-wrj-1.3.0
+
+| 1.2.0
+| 30-may-2013
+|
+| 22
+| 41
+| 15
+|
+* xref:relnotes:ROOT:2013/1.2.0/relnotes.adoc[Release Notes]
+* core-1.2.0
+* objectstore-jdo-1.2.0
+* security-file-1.0.1
+* security-shiro-1.1.1
+* viewer-restfulobjects-2.0.0
+* viewer-wicket-1.2.0
+* archetype-wrj-1.0.3
+
+| 1.1.0
+| 31-jan-2013
+|
+| 9
+| 18
+| 8
+|
+* xref:relnotes:ROOT:2013/1.1.0/relnotes.adoc[Release Notes]
+* core-1.1.0
+* security-shiro-1.1.0
+* viewer-wicket-1.1.0
+* archetype-wrj-1.0.2
+
+| 1.0.1
+| 10-jan-2013
+| Combining RestfulObjects and Wicket viewers into a single webapp, along with Shiro security
+| 1
+|
+|
+|
+* xref:relnotes:ROOT:2013/1.0.1/relnotes.adoc[Release Notes]
+* security-shiro-1.0.0
+* archetype-wrj-1.0.1
+
+| 1.0.0
+| 24-dec-2012
+| First release having graduated
+| 8
+| 33
+| 6
+|
+* xref:relnotes:ROOT:2013/1.0.0/relnotes.adoc[Release Notes]
+* core-1.0.0
+* security-file-1.0.0
+* viewer-wicket-1.0.0
+* viewer-restfulobjects-1.0.0
+* archetype-wrj-1.0.0
+
+
+| 0.2.0-incubating
+| 20-feb-2012
+|
+|
+|
+|
+| * 0.2.0-incubating
+
+| 0.1.2-incubating
+| 13-jul-2011
+| First release in the ASF incubator
+|
+|
+|
+| * 0.1.2-incubating
+|===
+
+
+
+
+
+
diff --git a/antora/toc/antora.yml b/antora/components/setupguide/antora.yml
similarity index 65%
copy from antora/toc/antora.yml
copy to antora/components/setupguide/antora.yml
index 76c1eaa..db3719b 100644
--- a/antora/toc/antora.yml
+++ b/antora/components/setupguide/antora.yml
@@ -1,5 +1,5 @@
-name: toc
-title: " "
+name: setupguide
+title: "Setup Guide"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/antora/toc/modules/devguide/attachments/eclipse/isis-templates.xml b/antora/components/setupguide/modules/ROOT/attachments/eclipse/isis-templates.xml
similarity index 100%
rename from antora/toc/modules/devguide/attachments/eclipse/isis-templates.xml
rename to antora/components/setupguide/modules/ROOT/attachments/eclipse/isis-templates.xml
diff --git a/antora/toc/modules/devguide/attachments/eclipse/jmock2-templates.xml b/antora/components/setupguide/modules/ROOT/attachments/eclipse/jmock2-templates.xml
similarity index 100%
rename from antora/toc/modules/devguide/attachments/eclipse/jmock2-templates.xml
rename to antora/components/setupguide/modules/ROOT/attachments/eclipse/jmock2-templates.xml
diff --git a/antora/toc/modules/devguide/attachments/eclipse/junit4-templates.xml b/antora/components/setupguide/modules/ROOT/attachments/eclipse/junit4-templates.xml
similarity index 100%
rename from antora/toc/modules/devguide/attachments/eclipse/junit4-templates.xml
rename to antora/components/setupguide/modules/ROOT/attachments/eclipse/junit4-templates.xml
diff --git a/antora/toc/modules/devguide/attachments/intellij/.gitignore b/antora/components/setupguide/modules/ROOT/attachments/intellij/.gitignore
similarity index 100%
rename from antora/toc/modules/devguide/attachments/intellij/.gitignore
rename to antora/components/setupguide/modules/ROOT/attachments/intellij/.gitignore
diff --git a/antora/toc/modules/devguide/attachments/intellij/isis-settings-file-templates.jar b/antora/components/setupguide/modules/ROOT/attachments/intellij/isis-settings-file-templates.jar
similarity index 100%
rename from antora/toc/modules/devguide/attachments/intellij/isis-settings-file-templates.jar
rename to antora/components/setupguide/modules/ROOT/attachments/intellij/isis-settings-file-templates.jar
diff --git a/antora/toc/modules/devguide/attachments/intellij/other/.gitignore b/antora/components/setupguide/modules/ROOT/attachments/intellij/other/.gitignore
similarity index 100%
rename from antora/toc/modules/devguide/attachments/intellij/other/.gitignore
rename to antora/components/setupguide/modules/ROOT/attachments/intellij/other/.gitignore
diff --git a/antora/toc/modules/devguide/attachments/intellij/other/dan-settings-keymaps.jar b/antora/components/setupguide/modules/ROOT/attachments/intellij/other/dan-settings-keymaps.jar
similarity index 100%
rename from antora/toc/modules/devguide/attachments/intellij/other/dan-settings-keymaps.jar
rename to antora/components/setupguide/modules/ROOT/attachments/intellij/other/dan-settings-keymaps.jar
diff --git a/antora/toc/modules/devguide/images/eclipse/2017-oxygen/010-lombok-locate-jar.png b/antora/components/setupguide/modules/ROOT/images/eclipse/2017-oxygen/010-lombok-locate-jar.png
similarity index 100%
rename from antora/toc/modules/devguide/images/eclipse/2017-oxygen/010-lombok-locate-jar.png
rename to antora/components/setupguide/modules/ROOT/images/eclipse/2017-oxygen/010-lombok-locate-jar.png
diff --git a/antora/toc/modules/devguide/images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png b/antora/components/setupguide/modules/ROOT/images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png
similarity index 100%
rename from antora/toc/modules/devguide/images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png
rename to antora/components/setupguide/modules/ROOT/images/eclipse/2017-oxygen/020-lombok-install-into-eclipse.png
diff --git a/antora/toc/modules/devguide/images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png b/antora/components/setupguide/modules/ROOT/images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png
similarity index 100%
rename from antora/toc/modules/devguide/images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png
rename to antora/components/setupguide/modules/ROOT/images/eclipse/2017-oxygen/030-datanucleus-install-new-software.png
diff --git a/antora/toc/modules/devguide/images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png b/antora/components/setupguide/modules/ROOT/images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png
similarity index 100%
rename from antora/toc/modules/devguide/images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png
rename to antora/components/setupguide/modules/ROOT/images/eclipse/2017-oxygen/040-datanucleus-specify-repository.png
diff --git a/antora/toc/modules/devguide/images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png b/antora/components/setupguide/modules/ROOT/images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png
similarity index 100%
rename from antora/toc/modules/devguide/images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png
rename to antora/components/setupguide/modules/ROOT/images/eclipse/2017-oxygen/050-datanucleus-select-plugin.png
diff --git a/antora/toc/modules/devguide/images/eclipse/2017-oxygen/060-enable-annotation-processor.png b/antora/components/setupguide/modules/ROOT/images/eclipse/2017-oxygen/060-enable-annotation-processor.png
similarity index 100%
rename from antora/toc/modules/devguide/images/eclipse/2017-oxygen/060-enable-annotation-processor.png
rename to antora/components/setupguide/modules/ROOT/images/eclipse/2017-oxygen/060-enable-annotation-processor.png
diff --git a/antora/toc/modules/devguide/images/eclipse/eclipse-010-windows-preferences.png b/antora/components/setupguide/modules/ROOT/images/eclipse/eclipse-010-windows-preferences.png
similarity index 100%
rename from antora/toc/modules/devguide/images/eclipse/eclipse-010-windows-preferences.png
rename to antora/components/setupguide/modules/ROOT/images/eclipse/eclipse-010-windows-preferences.png
diff --git a/antora/toc/modules/devguide/images/eclipse/eclipse-025-project-properties.png b/antora/components/setupguide/modules/ROOT/images/eclipse/eclipse-025-project-properties.png
similarity index 100%
rename from antora/toc/modules/devguide/images/eclipse/eclipse-025-project-properties.png
rename to antora/components/setupguide/modules/ROOT/images/eclipse/eclipse-025-project-properties.png
diff --git a/antora/toc/modules/devguide/images/eclipse/eclipse-100-project-support.png b/antora/components/setupguide/modules/ROOT/images/eclipse/eclipse-100-project-support.png
similarity index 100%
rename from antora/toc/modules/devguide/images/eclipse/eclipse-100-project-support.png
rename to antora/components/setupguide/modules/ROOT/images/eclipse/eclipse-100-project-support.png
diff --git a/antora/toc/modules/devguide/images/eclipse/eclipse-110-project-support.png b/antora/components/setupguide/modules/ROOT/images/eclipse/eclipse-110-project-support.png
similarity index 100%
rename from antora/toc/modules/devguide/images/eclipse/eclipse-110-project-support.png
rename to antora/components/setupguide/modules/ROOT/images/eclipse/eclipse-110-project-support.png
diff --git a/antora/toc/modules/devguide/images/eclipse/eclipse-120-console.png b/antora/components/setupguide/modules/ROOT/images/eclipse/eclipse-120-console.png
similarity index 100%
rename from antora/toc/modules/devguide/images/eclipse/eclipse-120-console.png
rename to antora/components/setupguide/modules/ROOT/images/eclipse/eclipse-120-console.png
diff --git a/antora/toc/modules/devguide/images/eclipse/eclipse-200-enhancer-fails-duplicates.png b/antora/components/setupguide/modules/ROOT/images/eclipse/eclipse-200-enhancer-fails-duplicates.png
similarity index 100%
rename from antora/toc/modules/devguide/images/eclipse/eclipse-200-enhancer-fails-duplicates.png
rename to antora/components/setupguide/modules/ROOT/images/eclipse/eclipse-200-enhancer-fails-duplicates.png
diff --git a/antora/toc/modules/devguide/images/eclipse/eclipse-210-enhancer-fails-duplicates.png b/antora/components/setupguide/modules/ROOT/images/eclipse/eclipse-210-enhancer-fails-duplicates.png
similarity index 100%
rename from antora/toc/modules/devguide/images/eclipse/eclipse-210-enhancer-fails-duplicates.png
rename to antora/components/setupguide/modules/ROOT/images/eclipse/eclipse-210-enhancer-fails-duplicates.png
diff --git a/antora/toc/modules/devguide/images/eclipse/eclipse-220-enhancer-fails-duplicates.png b/antora/components/setupguide/modules/ROOT/images/eclipse/eclipse-220-enhancer-fails-duplicates.png
similarity index 100%
rename from antora/toc/modules/devguide/images/eclipse/eclipse-220-enhancer-fails-duplicates.png
rename to antora/components/setupguide/modules/ROOT/images/eclipse/eclipse-220-enhancer-fails-duplicates.png
diff --git a/antora/components/setupguide/modules/ROOT/images/intellij-idea/015-import-project/010-welcome.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/015-import-project/010-welcome.png
new file mode 100644
index 0000000..cf8cccb
Binary files /dev/null and b/antora/components/setupguide/modules/ROOT/images/intellij-idea/015-import-project/010-welcome.png differ
diff --git a/antora/components/setupguide/modules/ROOT/images/intellij-idea/015-import-project/020-import-pom.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/015-import-project/020-import-pom.png
new file mode 100644
index 0000000..9663977
Binary files /dev/null and b/antora/components/setupguide/modules/ROOT/images/intellij-idea/015-import-project/020-import-pom.png differ
diff --git a/antora/components/setupguide/modules/ROOT/images/intellij-idea/015-import-project/030-imported.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/015-import-project/030-imported.png
new file mode 100644
index 0000000..35e2450
Binary files /dev/null and b/antora/components/setupguide/modules/ROOT/images/intellij-idea/015-import-project/030-imported.png differ
diff --git a/antora/components/setupguide/modules/ROOT/images/intellij-idea/015-import-project/040-project-structure.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/015-import-project/040-project-structure.png
new file mode 100644
index 0000000..1f3b7bc
Binary files /dev/null and b/antora/components/setupguide/modules/ROOT/images/intellij-idea/015-import-project/040-project-structure.png differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/030-import-settings/010-settings-import-jar.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/030-import-settings/010-settings-import-jar.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/030-import-settings/010-settings-import-jar.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/030-import-settings/010-settings-import-jar.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/030-import-settings/020-select-all.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/030-import-settings/020-select-all.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/030-import-settings/020-select-all.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/030-import-settings/020-select-all.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/030-import-settings/030-restart.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/030-import-settings/030-restart.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/030-import-settings/030-restart.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/030-import-settings/030-restart.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/030-import-settings/040-file-templates.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/030-import-settings/040-file-templates.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/030-import-settings/040-file-templates.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/030-import-settings/040-file-templates.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/030-import-settings/050-live-templates.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/030-import-settings/050-live-templates.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/030-import-settings/050-live-templates.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/030-import-settings/050-live-templates.png
diff --git a/antora/components/setupguide/modules/ROOT/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png
new file mode 100644
index 0000000..429d1fd
Binary files /dev/null and b/antora/components/setupguide/modules/ROOT/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png differ
diff --git a/antora/components/setupguide/modules/ROOT/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png
new file mode 100644
index 0000000..9c2a95c
Binary files /dev/null and b/antora/components/setupguide/modules/ROOT/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png differ
diff --git a/antora/components/setupguide/modules/ROOT/images/intellij-idea/042-other-settings-maven/010-maven-installation.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/042-other-settings-maven/010-maven-installation.png
new file mode 100644
index 0000000..b1d5b98
Binary files /dev/null and b/antora/components/setupguide/modules/ROOT/images/intellij-idea/042-other-settings-maven/010-maven-installation.png differ
diff --git a/antora/components/setupguide/modules/ROOT/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png
new file mode 100644
index 0000000..7c203ce
Binary files /dev/null and b/antora/components/setupguide/modules/ROOT/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png differ
diff --git a/antora/components/setupguide/modules/ROOT/images/intellij-idea/044-other-settings-misc/010-auto-import.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/044-other-settings-misc/010-auto-import.png
new file mode 100644
index 0000000..1cdacec
Binary files /dev/null and b/antora/components/setupguide/modules/ROOT/images/intellij-idea/044-other-settings-misc/010-auto-import.png differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/010-some-plugins.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/050-some-plugins/010-some-plugins.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/010-some-plugins.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/050-some-plugins/010-some-plugins.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/060-troubleshooting/010-duplicate-classes.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/060-troubleshooting/010-duplicate-classes.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/060-troubleshooting/010-duplicate-classes.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/060-troubleshooting/010-duplicate-classes.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/070-advanced/002-compiler-exclude.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/070-advanced/002-compiler-exclude.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/070-advanced/002-compiler-exclude.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/070-advanced/002-compiler-exclude.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/070-advanced/004-gradle-output.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/070-advanced/004-gradle-output.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/070-advanced/004-gradle-output.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/070-advanced/004-gradle-output.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/070-advanced/005-gradle-output.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/070-advanced/005-gradle-output.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/070-advanced/005-gradle-output.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/070-advanced/005-gradle-output.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/070-advanced/006-livereload-js.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/070-advanced/006-livereload-js.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/070-advanced/006-livereload-js.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/070-advanced/006-livereload-js.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/070-advanced/020-dcevm-once-installed.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/070-advanced/020-dcevm-once-installed.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/070-advanced/020-dcevm-once-installed.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/070-advanced/020-dcevm-once-installed.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/070-advanced/040-dcevm-run-configuration.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/070-advanced/040-dcevm-run-configuration.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/070-advanced/040-dcevm-run-configuration.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/070-advanced/040-dcevm-run-configuration.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/030-other-module-added.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/100-maven-module-mgmt/030-other-module-added.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/030-other-module-added.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/100-maven-module-mgmt/030-other-module-added.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png
diff --git a/antora/components/setupguide/modules/ROOT/images/intellij-idea/110-running-the-app/005-datanucleus-enhance-run-configuration.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/110-running-the-app/005-datanucleus-enhance-run-configuration.png
new file mode 100644
index 0000000..bb56f9d
Binary files /dev/null and b/antora/components/setupguide/modules/ROOT/images/intellij-idea/110-running-the-app/005-datanucleus-enhance-run-configuration.png differ
diff --git a/antora/components/setupguide/modules/ROOT/images/intellij-idea/110-running-the-app/010-run-configuration.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/110-running-the-app/010-run-configuration.png
new file mode 100644
index 0000000..dfd06d1
Binary files /dev/null and b/antora/components/setupguide/modules/ROOT/images/intellij-idea/110-running-the-app/010-run-configuration.png differ
diff --git a/antora/components/setupguide/modules/ROOT/images/intellij-idea/110-running-the-app/030-running-unit-tests.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/110-running-the-app/030-running-unit-tests.png
new file mode 100644
index 0000000..2422f8a
Binary files /dev/null and b/antora/components/setupguide/modules/ROOT/images/intellij-idea/110-running-the-app/030-running-unit-tests.png differ
diff --git a/antora/components/setupguide/modules/ROOT/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png
new file mode 100644
index 0000000..467c619
Binary files /dev/null and b/antora/components/setupguide/modules/ROOT/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png differ
diff --git a/antora/components/setupguide/modules/ROOT/images/intellij-idea/110-running-the-app/045-running-integ-tests.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/110-running-the-app/045-running-integ-tests.png
new file mode 100644
index 0000000..b870dc6
Binary files /dev/null and b/antora/components/setupguide/modules/ROOT/images/intellij-idea/110-running-the-app/045-running-integ-tests.png differ
diff --git a/antora/components/setupguide/modules/ROOT/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png
new file mode 100644
index 0000000..d77f851
Binary files /dev/null and b/antora/components/setupguide/modules/ROOT/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/010-file-project-structure.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/200-project-sdk/010-file-project-structure.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/010-file-project-structure.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/200-project-sdk/010-file-project-structure.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/020-select-jdk.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/200-project-sdk/020-select-jdk.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/020-select-jdk.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/200-project-sdk/020-select-jdk.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/030-select-jdk-directory.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/200-project-sdk/030-select-jdk-directory.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/030-select-jdk-directory.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/200-project-sdk/030-select-jdk-directory.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/040-set-project-level.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/200-project-sdk/040-set-project-level.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/040-set-project-level.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/200-project-sdk/040-set-project-level.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/050-isis-language-level-7.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/200-project-sdk/050-isis-language-level-7.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/050-isis-language-level-7.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/200-project-sdk/050-isis-language-level-7.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/060-app-language-level-8.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/200-project-sdk/060-app-language-level-8.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/200-project-sdk/060-app-language-level-8.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/200-project-sdk/060-app-language-level-8.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/250-new-project/010-new-project.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/010-new-project.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/250-new-project/010-new-project.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/010-new-project.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/250-new-project/020-new-project-name.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/020-new-project-name.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/250-new-project/020-new-project-name.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/020-new-project-name.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/250-new-project/030-new-project-new-window.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/030-new-project-new-window.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/250-new-project/030-new-project-new-window.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/030-new-project-new-window.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/250-new-project/040-new-module-from-existing-sources.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/040-new-module-from-existing-sources.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/250-new-project/040-new-module-from-existing-sources.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/040-new-module-from-existing-sources.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/250-new-project/050-specify-source-folder.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/050-specify-source-folder.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/250-new-project/050-specify-source-folder.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/050-specify-source-folder.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/250-new-project/060-import-using-maven.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/060-import-using-maven.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/250-new-project/060-import-using-maven.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/060-import-using-maven.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/250-new-project/070-import-module-settings.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/070-import-module-settings.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/250-new-project/070-import-module-settings.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/070-import-module-settings.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/250-new-project/080-maven-profiles.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/080-maven-profiles.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/250-new-project/080-maven-profiles.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/080-maven-profiles.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/250-new-project/090-maven-coordinates.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/090-maven-coordinates.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/250-new-project/090-maven-coordinates.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/090-maven-coordinates.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/250-new-project/100-annotation-processing.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/100-annotation-processing.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/250-new-project/100-annotation-processing.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/100-annotation-processing.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/250-new-project/110-parameter8.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/110-parameter8.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/250-new-project/110-parameter8.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/110-parameter8.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/250-new-project/120-clean-generate-sources.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/120-clean-generate-sources.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/250-new-project/120-clean-generate-sources.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/250-new-project/120-clean-generate-sources.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/300-paraname8-support/010-configuring-the-compiler.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/300-paraname8-support/010-configuring-the-compiler.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/300-paraname8-support/010-configuring-the-compiler.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/300-paraname8-support/010-configuring-the-compiler.png
diff --git a/antora/toc/modules/devguide/images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png b/antora/components/setupguide/modules/ROOT/images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png
similarity index 100%
rename from antora/toc/modules/devguide/images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png
rename to antora/components/setupguide/modules/ROOT/images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png
diff --git a/antora/components/setupguide/modules/ROOT/nav.adoc b/antora/components/setupguide/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..6098e74
--- /dev/null
+++ b/antora/components/setupguide/modules/ROOT/nav.adoc
@@ -0,0 +1,7 @@
+* xref:intellij.adoc[Using IntelliJ]
+//* xref:eclipse.adoc[Using Eclipse]
+* xref:hints-and-tips.adoc[Hints and Tips]
+* xref:git-cookbook.adoc[Git Cookbook]
+* xref:working-with-many-repos.adoc[Working with Many Repos]
+* xref:resources/cheat-sheet.adoc[Cheat Sheet]
+* xref:resources/icons.adoc[Icons]
diff --git a/antora/toc/modules/devguide/pages/ide.adoc b/antora/components/setupguide/modules/ROOT/pages/about.adoc
similarity index 81%
copy from antora/toc/modules/devguide/pages/ide.adoc
copy to antora/components/setupguide/modules/ROOT/pages/about.adoc
index 73d2466..6fad8a6 100644
--- a/antora/toc/modules/devguide/pages/ide.adoc
+++ b/antora/components/setupguide/modules/ROOT/pages/about.adoc
@@ -1,15 +1,11 @@
-[[ide]]
-= Using an IDE
+= Setup Guide
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-:page-partial:
-
-
+:page-role: -toc
The vast majority of Java developers use an IDE to assist with developing their code, and we highly recommend that you do likewise as you develop your Apache Isis applications using an IDE.
-Apache Isis is built with Maven, and all modern IDEs can import Maven projects.
-
-This chapter shows how to setup and use two of the most popular IDEs, IntelliJ IDEA and Eclipse.
+This guide explains how to setup your IDE so you can effectively and efficiently develop your Apache Isis apps.
+The guide also provides a number of general hints-n-tips.
diff --git a/antora/toc/modules/devguide/pages/ide/eclipse.adoc b/antora/components/setupguide/modules/ROOT/pages/eclipse.adoc
similarity index 94%
rename from antora/toc/modules/devguide/pages/ide/eclipse.adoc
rename to antora/components/setupguide/modules/ROOT/pages/eclipse.adoc
index 591417a..932f6c3 100644
--- a/antora/toc/modules/devguide/pages/ide/eclipse.adoc
+++ b/antora/components/setupguide/modules/ROOT/pages/eclipse.adoc
@@ -3,13 +3,10 @@
:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or ag [...]
:page-partial:
-[NOTE]
-====
-This material does not constitute an endorsement; Eclipse foundation is not affiliated to Apache Software Foundation in any way.
-====
-
If you are an http://www.eclipse.org[Eclipse] user, then we recommend you download the "Eclipse JEE package" configuration.
+NOTE: This material does not constitute an endorsement; Eclipse foundation is not affiliated to Apache Software Foundation in any way.
+
When running an Apache Isis application, it's necessary to setup the development environment so that the Java bytecode can be enhanced by the link:http://www.datanucleus.org[DataNucleus] enhancer.
If working in Eclipse, then JDO enhancement is most easily done by installing the http://www.datanucleus.org/products/accessplatform/jpa/tools.html#eclipse[DataNucleus' Eclipse plugin].
This hooks the bytecode enhancement of your domain objects into Eclipse's normal incremental compilation.
@@ -20,7 +17,7 @@ This plugin needs to be configured for each of your domain modules (usually just
We provide a set of editor templates.
These are used to add new methods to existing classes.
-(These are equivalent to the xref:toc:devguide:about.adoc#live-templates[IntelliJ live templates]):
+(These are equivalent to the xref:setupguide:ROOT:intellij.adoc#live-templates[IntelliJ live templates]):
* `is` (Apache Isis domain objects). link:./resources/eclipse/isis-templates.xml[Download]
* `ju` (for JUnit tests) link:./resources/eclipse/junit4-templates.xml[Download]
@@ -106,7 +103,7 @@ image::eclipse/eclipse-110-project-support.png[width="600px",link="{imagesdir}/e
DataNucleus' enhancer uses the domain object model's own classpath to reference DataNucleus JARs.
So, even though your domain objects are unlikely to depend on DataNucleus, these references must still be present.
-See the section in xref:toc:devguide:hints-and-tips/datanucleus-enhancer.adoc[DataNucleus enhancer] for details of the contents of the `pom.xml`.
+See the section in xref:setupguide:ROOT:hints-and-tips.adoc#datanucleus-enhancer[DataNucleus enhancer] for details of the contents of the `pom.xml`.
If you've based your app on either the xref:starters:helloworld:about.adoc[HelloWorld] or the xref:starters:simpleapp:about.adoc[SimpleApp] starter app, then it'll be set up already.
Then, tell DataNucleus to use the project classpath:
@@ -181,5 +178,5 @@ In the context of Apache Isis, this is very useful for contributed actions and m
Changing persisting domain entities is more problematic, for two reasons: the JDO/DataNucleus enhancer needs to run on domain entities, and also at runtime JDO/DataNucleus would need to rebuild its own metamodel.
You may find that adding actions will work, but adding new properties or collections is much less likely to.
-For details of setting up DCEVM, see the xref:toc:devguide:about.adoc#advanced_dcevm[corresponding section] in the IntelliJ documentation.
+For details of setting up DCEVM, see the xref:setupguide:ROOT:intellij.adoc#setting-up-dcevm[corresponding section] in the IntelliJ documentation.
diff --git a/antora/toc/modules/devguide/pages/git-cookbook.adoc b/antora/components/setupguide/modules/ROOT/pages/git-cookbook.adoc
similarity index 94%
rename from antora/toc/modules/devguide/pages/git-cookbook.adoc
rename to antora/components/setupguide/modules/ROOT/pages/git-cookbook.adoc
index cebe6c0..19e11ac 100644
--- a/antora/toc/modules/devguide/pages/git-cookbook.adoc
+++ b/antora/components/setupguide/modules/ROOT/pages/git-cookbook.adoc
@@ -9,9 +9,9 @@
This appendix describes the commands often used while working with git. In addition to these basic commands, please make sure you have read:
-* xref:toc:devguide:building-apache-isis.adoc[building Apache Isis]
-* xref:toc:devguide:contributing.adoc[Contributing]
-* xref:toc:comguide:about.adoc#policies/git-policy[Git policy]
+* xref:conguide:ROOT:building-apache-isis.adoc[building Apache Isis]
+* xref:conguide:ROOT:contributing.adoc[Contributing]
+* xref:comguide:ROOT:policies/git-policy.adoc[Git policy]
@@ -84,7 +84,7 @@ git commit -m "ISIS-nnn: yada yada"
== Common Workflows
-The xref:toc:devguide:contributing.adoc[contributing] page describes the workflow for non-committers. The xref:toc:comguide:about.adoc#policies/git-policy[Git policy] page describes a workflow for Apache Isis **committers**.
+The xref:conguide:ROOT:contributing.adoc[contributing] page describes the workflow for non-committers. The xref:comguide:ROOT:policies/git-policy.adoc[Git policy] page describes a workflow for Apache Isis **committers**.
diff --git a/antora/toc/modules/devguide/pages/hints-and-tips.adoc b/antora/components/setupguide/modules/ROOT/pages/hints-and-tips.adoc
similarity index 74%
copy from antora/toc/modules/devguide/pages/hints-and-tips.adoc
copy to antora/components/setupguide/modules/ROOT/pages/hints-and-tips.adoc
index 612936e..d9105a6 100644
--- a/antora/toc/modules/devguide/pages/hints-and-tips.adoc
+++ b/antora/components/setupguide/modules/ROOT/pages/hints-and-tips.adoc
@@ -1,4 +1,3 @@
-[[hints-and-tips]]
= Hints and Tips
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
@@ -8,3 +7,9 @@
This chapter provides some solutions for problems we've encountered ourselves or have been raised on the Apache Isis mailing lists.
+
+include::hints-and-tips/datanucleus-enhancer.adoc[leveloffset=+1]
+include::hints-and-tips/enhance-only.adoc[leveloffset=+1]
+include::hints-and-tips/project-lombok.adoc[leveloffset=+1]
+include::hints-and-tips/enabling-logging.adoc[leveloffset=+1]
+include::hints-and-tips/how-run-fixtures-on-app-startup.adoc[leveloffset=+1]
diff --git a/antora/toc/modules/devguide/pages/hints-and-tips/datanucleus-enhancer.adoc b/antora/components/setupguide/modules/ROOT/pages/hints-and-tips/datanucleus-enhancer.adoc
similarity index 97%
rename from antora/toc/modules/devguide/pages/hints-and-tips/datanucleus-enhancer.adoc
rename to antora/components/setupguide/modules/ROOT/pages/hints-and-tips/datanucleus-enhancer.adoc
index c3e1900..5a515a6 100644
--- a/antora/toc/modules/devguide/pages/hints-and-tips/datanucleus-enhancer.adoc
+++ b/antora/components/setupguide/modules/ROOT/pages/hints-and-tips/datanucleus-enhancer.adoc
@@ -48,7 +48,7 @@ If running on Windows, then there's a good chance you'll hit the http://msdn.mic
In this case the `persistence.xml` file is mandatory rather than optional.
This file is also required if you are using developing in Eclipse and relying on the DataNucleus plugin for Eclipse rather than the DataNucleus plugin for Maven.
-More information can be found xref:toc:devguide:about.adoc#eclipse[here].
+More information can be found xref:setupguide:ROOT:eclipse.adoc[here].
====
diff --git a/antora/toc/modules/devguide/pages/hints-and-tips/enabling-logging.adoc b/antora/components/setupguide/modules/ROOT/pages/hints-and-tips/enabling-logging.adoc
similarity index 98%
rename from antora/toc/modules/devguide/pages/hints-and-tips/enabling-logging.adoc
rename to antora/components/setupguide/modules/ROOT/pages/hints-and-tips/enabling-logging.adoc
index f631630..7b69f02 100644
--- a/antora/toc/modules/devguide/pages/hints-and-tips/enabling-logging.adoc
+++ b/antora/components/setupguide/modules/ROOT/pages/hints-and-tips/enabling-logging.adoc
@@ -1,4 +1,3 @@
-[[enabling-logging]]
= Enabling Logging
:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or ag [...]
:page-partial:
diff --git a/antora/toc/modules/devguide/pages/hints-and-tips/enhance-only.adoc b/antora/components/setupguide/modules/ROOT/pages/hints-and-tips/enhance-only.adoc
similarity index 98%
rename from antora/toc/modules/devguide/pages/hints-and-tips/enhance-only.adoc
rename to antora/components/setupguide/modules/ROOT/pages/hints-and-tips/enhance-only.adoc
index 4734ff0..1140ecf 100644
--- a/antora/toc/modules/devguide/pages/hints-and-tips/enhance-only.adoc
+++ b/antora/components/setupguide/modules/ROOT/pages/hints-and-tips/enhance-only.adoc
@@ -1,4 +1,3 @@
-[[enhance-only]]
= Enhance only (IntelliJ)
:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or ag [...]
:page-partial:
diff --git a/antora/toc/modules/devguide/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc b/antora/components/setupguide/modules/ROOT/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc
similarity index 59%
rename from antora/toc/modules/devguide/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc
rename to antora/components/setupguide/modules/ROOT/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc
index e96b159..ffd5209 100644
--- a/antora/toc/modules/devguide/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc
+++ b/antora/components/setupguide/modules/ROOT/pages/hints-and-tips/how-run-fixtures-on-app-startup.adoc
@@ -1,4 +1,3 @@
-[[how-run-fixtures-on-app-startup]]
= How run fixtures on startup?
:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or ag [...]
:page-partial:
@@ -13,11 +12,7 @@ Use events?_
The standard approach is to use xref:fixtures:ROOT:about.adoc[fixture scripts].
-These can be run in on start-up typically by being specified in the xref:refguide:applib-cm:classes/AppManifest-bootstrapping.adoc[`AppManifest`], see for example the xref:starters:simpleapp:about.adoc[SimpleApp] starter app.
+These can be run in on start-up for example using the `@PostConstruct` of a seed domain service.
-Alternatively just set `isis.fixtures` and `isis.persistor.datanucleus.install-fixtures` properties.
-
-In terms of implementations, you might also want to check out the (non-ASF) link:https://platform.incode.org[Incode Platform^]'s excel module, by using `ExcelFixture` and overriding `ExcelFixtureRowHandler`.
-
-An example can be found in this (non ASF) link:https://github.com/incodehq/contactapp[contactapp], see link:https://github.com/incodehq/contactapp/blob/master/backend/fixture/src/main/java/org/incode/eurocommercial/contactapp/fixture/scenarios/demo/ContactImport.java[`ContactRowHandler`].
+The xref:subdomains:excel:about.adoc[Excel subdomain] library also provides `ExcelFixture`, which is an implementation of `FixtureScript`; it works by providing an implementation of `ExcelFixtureRowHandler`, to handle each row.
diff --git a/antora/toc/modules/devguide/pages/project-lombok.adoc b/antora/components/setupguide/modules/ROOT/pages/hints-and-tips/project-lombok.adoc
similarity index 79%
rename from antora/toc/modules/devguide/pages/project-lombok.adoc
rename to antora/components/setupguide/modules/ROOT/pages/hints-and-tips/project-lombok.adoc
index 983e271..08fe5b2 100644
--- a/antora/toc/modules/devguide/pages/project-lombok.adoc
+++ b/antora/components/setupguide/modules/ROOT/pages/hints-and-tips/project-lombok.adoc
@@ -1,5 +1,4 @@
-[[project-lombok]]
-= Appendix: Project Lombok
+= Project Lombok
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
@@ -30,8 +29,8 @@ private String name;
----
Under the covers it is implemented as an annotation processor; it basically hooks into the Java compiler
-so that it can emit additional bytecode (eg for the getter and setter). See xref:toc:devguide:about.adoc#other-settings-compiler[here] for details of setting up in IntelliJ (Eclipse has very similar support).
-
+so that it can emit additional bytecode (eg for the getter and setter).
+See xref:setupguide:ROOT:intellij.adoc#other-settings-compiler[here] for details of setting up in IntelliJ (Eclipse has very similar support).
Apache Isis supports link:https://projectlombok.org/[Project Lombok], in that the annotations that would normally be placed on the getter (namely xref:refguide:applib-ant:Property.adoc[`Property`], xref:refguide:applib-ant:PropertyLayout.adoc[`@PropertyLayout`], xref:refguide:applib-ant:Collection.adoc[`@Collection`], xref:refguide:applib-ant:CollectionLayout.adoc[`@CollectionLayout`] and xref:refguide:applib-ant:MemberOrder.adoc[`@MemberOrder`]) can be placed on the field instead.
@@ -41,9 +40,3 @@ Lombok plugin appropriate to that IDE. See the link:https://projectlombok.org/d
-== Future thoughts
-
-In the future we might extend/fork Lombok so that it understands Isis' own annotations (ie xref:refguide:applib-ant:Property.adoc[`@Property`] and xref:refguide:applib-ant:Collection.adoc[`@Collection`])
-rather than Lombok's own `@Getter` and `@Setter.
-
-It might also be possible to use Lombok to generate the domain event classes for each member.
diff --git a/antora/toc/modules/devguide/pages/ide.adoc b/antora/components/setupguide/modules/ROOT/pages/ide.adoc
similarity index 88%
copy from antora/toc/modules/devguide/pages/ide.adoc
copy to antora/components/setupguide/modules/ROOT/pages/ide.adoc
index 73d2466..151d51e 100644
--- a/antora/toc/modules/devguide/pages/ide.adoc
+++ b/antora/components/setupguide/modules/ROOT/pages/ide.adoc
@@ -9,7 +9,8 @@
The vast majority of Java developers use an IDE to assist with developing their code, and we highly recommend that you do likewise as you develop your Apache Isis applications using an IDE.
Apache Isis is built with Maven, and all modern IDEs can import Maven projects.
-This chapter shows how to setup and use two of the most popular IDEs, IntelliJ IDEA and Eclipse.
-
+This chapter shows how to setup and use the IntelliJ IDEA.
+include::intellij.adoc[leveloffset=+1]
+//include::eclipse.adoc[leveloffset=+1]
diff --git a/antora/components/setupguide/modules/ROOT/pages/intellij.adoc b/antora/components/setupguide/modules/ROOT/pages/intellij.adoc
new file mode 100644
index 0000000..1deb04e
--- /dev/null
+++ b/antora/components/setupguide/modules/ROOT/pages/intellij.adoc
@@ -0,0 +1,566 @@
+= Developing using IntelliJ IDEA
+:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+:page-partial:
+
+This section describes how to install and setup JetBrains' IntelliJ IDEA, then how to import an application into IntelliJ and run it.
+
+NOTE: This material does not constitute an endorsement; JetBrains is not affiliated to Apache Software Foundation in any way.
+JetBrains does however provide complimentary copies of the IntelliJ IDE to Apache committers.
+
+== Installing and Setting up
+
+This section covers installation and setup.
+These notes/screenshots were prepared using IntelliJ IDEA Community Edition 2019.3, but is believed to be compatible with more recent versions/other editions of the IDE.
+
+=== Download and Install
+
+https://www.jetbrains.com/idea/download/[Download] latest version of IntelliJ Community Edition, and install.
+
+
+=== Import Project
+
+In IntelliJ a project can contain multiple modules; these need not be physically located together.
+
+Download either the xref:starters:helloworld:about.adoc[HelloWorld] or xref:starters:simpleapp:about.adoc[SimpleApp] starter app to your filesystem.
+
+From the welcome screen, select "import project":
+
+image::intellij-idea/015-import-project/010-welcome.png[width="400px",link="{imagesdir}/intellij-idea/015-import-project/010-welcome.png"]
+
+Navigate to the top-level pom.xml of the starter app:
+
+image::intellij-idea/015-import-project/020-import-pom.png[width="300px",link="{imagesdir}/intellij-idea/015-import-project/020-import-pom.png"]
+
+Project imported:
+
+image::intellij-idea/015-import-project/030-imported.png[width="800px",link="{imagesdir}/intellij-idea/015-import-project/030-imported.png"]
+Start off by creating a new project:
+
+
+Use menu:File[Project Structure] to confirm that JDK 8 is configured:
+
+image::intellij-idea/015-import-project/040-project-structure.png[width="400px",link="{imagesdir}/intellij-idea/015-import-project/040-project-structure.png"]
+
+
+//=== File templates
+//
+//Next we recommend you import a set of standard file templates.
+//These are used to create new classes or supporting files:
+//
+//.File templates
+//image::intellij-idea/030-import-settings/040-file-templates.png[width="400px",link="{imagesdir}/intellij-idea/030-import-settings/040-file-templates.png"]
+//
+//The file templates are provided as a settings JAR file, namely *link:{attachmentsdir}/intellij/isis-settings-file-templates.jar[isis-settings-file-templates.jar]*.
+//Download this file.
+//
+//Next, import using `File > Import Settings`, specifying the directory that you have downloaded the file to:
+//
+//.IntelliJ Import Settings - Specify JAR file
+//image::intellij-idea/030-import-settings/010-settings-import-jar.png[width="400px",link="{imagesdir}/intellij-idea/030-import-settings/010-settings-import-jar.png"]
+//
+//Select all the categories (there should just be one), and hit OK. then hit restart.
+//
+//[WARNING]
+//====
+//If importing into IntelliJ 2017.2.3 two categories are shown - "File templates" and "File templates (schemes)".
+//Select all the categories.
+//
+//Apparently no categories are shown if importing into IntelliJ 2016.1.1 Community Edition (and perhaps other 2016 versions).
+//The file does import ok into IntelliJ 15.0.x, so we think this is a bug in the 2016 version.
+//
+//The workaround is to extract the `.jar` file locally and copy the files into IntelliJ's `config` directory, somewhere in your home directory:
+//
+//* Windows `<User home>\.IdeaIC2016\config`
+//* Linux `~/..IdeaIC2016/config`
+//* Mac OS `~/Library/Preferences/IdeaIC2016`
+//
+//====
+
+//=== Live templates
+//
+//We also recommend you import a set of live templates.
+//These are used to add new methods to existing classes:
+//
+//.Live templates
+//image::intellij-idea/030-import-settings/050-live-templates.png[width="600px",link="{imagesdir}/intellij-idea/030-import-settings/050-live-templates.png"]
+//
+//The live templates have a prefix of either:
+//
+//* `is` : for Apache Isis domain objects
+//* `ju` : for JUnit tests
+//* `jm` : for JMock mocks or libraries
+//
+//The live templates are also provided as a settings JAR file, namely *link:{attachmentsdir}/resources/intellij/isis-settings-live-templates.jar[isis-settings-live-templates.jar]*.
+//Download and import (as for the previous settings JAR files).
+
+//=== Coding Standards
+//
+//Next, we suggest you import settings for standard ASF/Apache Isis coding conventions.
+//This file is also provided as a settings file, namely *link:{attachmentsdir}/intellij/isis-settings-code-style.jar[isis-settings-code-style.jar]*.
+//Download and import (as for the above settings JAR files).
+
+=== Other Settings (Compiler)
+
+There are a number of compiler settings that influence the compiler.
+We highly recommend you set these.
+
+On the *Compiler* Settings page, ensure that `build automatically` is enabled (and optionally `compile independent modules in parallel`):
+
+.IntelliJ Compiler Settings
+image::intellij-idea/040-other-settings-compiler/010-build-automatically.png[width="700px",link="{imagesdir}/intellij-idea/040-other-settings-compiler/010-build-automatically.png"]
+
+
+On the *Annotation Processors* page, confirm that these are enabled for all of the `packaging=jar` modules (in other words, those that contain Java and have a `src/main/java` directory):
+
+.IntelliJ Annotation Processor Settings
+image::intellij-idea/040-other-settings-compiler/020-annotation-processor.png[width="700px",link="{imagesdir}/intellij-idea/040-other-settings-compiler/020-annotation-processor.png"]
+
+This setting enables the generation of the `Q*` classes for DataNucleus type-safe queries, as well as being required for frameworks such as xref:setupguide:ROOT:hints-and-tips.adoc#project-lombok[Project Lombok].
+
+
+=== Other Settings (Maven)
+
+There are also some other settings for Maven that we recommend you adjust (though these are less critical):
+
+On the Maven settings page:
+
+.IntelliJ Maven Settings - Installation
+image::intellij-idea/042-other-settings-maven/010-maven-installation.png[width="700px",link="{imagesdir}/intellij-idea/042-other-settings-maven/010-maven-installation.png"]
+
+Still on the Maven settings page, configure as follows:
+
+.IntelliJ Maven Settings - Configuration
+image::intellij-idea/042-other-settings-maven/020-maven-configuration.png[width="700px",link="{imagesdir}/intellij-idea/042-other-settings-maven/020-maven-configuration.png"]
+
+=== Other Settings (Misc)
+
+These settings are optional but also recommended.
+
+On the *Auto Import* settings page, check the `optimize imports on the fly` and `add unambiguous imports on the fly`
+
+.IntelliJ Auto Import Setting
+image::intellij-idea/044-other-settings-misc/010-auto-import.png[width="700px",link="{imagesdir}/intellij-idea/044-other-settings-misc/010-auto-import.png"]
+
+
+
+== Running
+
+Let's see how to run both the app and the tests.
+
+=== Running the App
+
+We run the application by creating a Run configuration, using `Run > Edit Configurations`.
+
+There is one complication.
+DataNucleus requires that all entities are bytecode enhanced.
+When building from the command line using Maven, the `datanucleus:enhance` Maven plugin takes care of this.
+When building within IntelliJ, though, there is no similar plugin.
+
+However, this is easily solved: we can just have IntelliJ run the enhance as a separate run configuration before the run configuration that runs the app itself.
+
+First, set up the run configuration to do the enhance:
+
+.Run Configuration to enhance the entities
+image::intellij-idea/110-running-the-app/005-datanucleus-enhance-run-configuration.png[width="700px",link="{imagesdir}/intellij-idea/110-running-the-app/005-datanucleus-enhance-run-configuration.png"]
+
+TIP: Check "work offline" (on the General tab) to speed this up slightly.
+
+[WARNING]
+====
+If on Windows you encounter a "The command line is too long" error, then set '-Dfork=false' as a VM option (on the Runner tab).
+====
+
+Then, set up the run configuration for the app.
+Note how it runs the enhance configuration first:
+
+.Run Configuration to run the app
+image::intellij-idea/110-running-the-app/010-run-configuration.png[width="700px",link="{imagesdir}/intellij-idea/110-running-the-app/010-run-configuration.png"]
+
+You should now be able to run the app using `Run > Run Configuration`.
+The same configuration can also be used to debug the app if you so need.
+
+
+=== Running the Unit Tests
+
+The easiest way to run the unit tests is just to right click on the relevant package in the _Project Window_, and choose run unit tests.
+Hopefully your tests will pass (!).
+
+.Running Unit Tests from Project Explorer
+image::intellij-idea/110-running-the-app/030-running-unit-tests.png[width="300px",link="{imagesdir}/intellij-idea/110-running-the-app/030-running-unit-tests.png"]
+
+As a side-effect, this will create a run configuration, very similar to the one we manually created for the main app:
+
+.Unit Tests Run Configuration
+image::intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png[width="700px",link="{imagesdir}/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png"]
+
+Thereafter, you should run units by selecting this configuration (if you use the right click approach you'll end up with lots of run configurations, all similar).
+
+=== Running the Integration Tests
+
+Integration tests can be run in the same way as unit tests, however the module must also have been enhanced.
+
+One approach is to initially run the tests use the right click on the `integtests` module:
+
+.Running Integ Tests from Project Explorer
+image::intellij-idea/110-running-the-app/045-running-integ-tests.png[width="400px",link="{imagesdir}/intellij-idea/110-running-the-app/045-running-integ-tests.png"]
+
+The tests might fail because the entities won't have been enhanced.
+However, we can then easily update the run configuration to run the datanucleus enhancer goal (same as when running the application):
+
+.Integration Tests Run Configuration
+image::intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png[width="700px",link="{imagesdir}/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png"]
+
+
+CAUTION: Make sure that the `search for tests` radio button is set to `In single module`.
+If this radio button is set to one of the other options then you may obtain class loading issues.
+
+
+
+== Hints and Tips
+
+=== Keyboard Cheat Sheets
+
+You can download 1-page PDFs cheat sheets for IntelliJ's keyboard shortcuts:
+* for link:https://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard.pdf[Windows]
+* for link:https://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard_Mac.pdf[MacOS]
+
+Probably the most important shortcut on them is for `Find Action`:
+- `ctrl-shift-A` on Windows
+- `cmd-shift-A` on MacOS.
+
+This will let you search for any action just by typing its name.
+
+=== Switch between Tools & Editors
+
+The Tool Windows are the views around the editor (to left, bottom and right).
+It's possible to move these around to your preferred locations.
+
+* Use `alt-1` through `alt-9` (or `cmd-1` through `alt-9`) to select the tool windows
+** Press it twice and the tool window will hide itself; so can use to toggle
+* If in the _Project Window_ (say) and hit enter on a file, then it will be shown in the editor, but (conveniently) the focus remains in the tool window.
+To switch to the editor, just press `Esc`.
+** If in the _Terminal Window_, you'll need to press `Shift-Esc`.
+* If on the editor and want to locate the file in (say) the _Project Window_, use `alt-F1`.
+* To change the size of any tool window, use `ctrl-shift-arrow`
+
+Using these shortcuts you can easily toggle between the tool windows and the editor, without using the mouse.
+Peachy!
+
+=== Navigating Around
+
+For all of the following, you don't need to type every letter, typing "ab" will actually search for ".*a.*b.*".
+
+* to open classes or files or methods that you know the name of:
+** `ctrl-N` to open class
+** `ctrl-shift-N` to open a file
+** (bit fiddly this) `ctrl-shift-alt-N` to search for any symbol.
+* open up dialog of recent files: `ctrl-E`
+* search for any file: `shift-shift`
+
+Navigating around:
+
+* find callers of a method (the call hierarchy): `ctrl-alt-H`
+* find subclasses or overrides: `ctrl-alt-B`
+* find superclasses/interface/declaration: `ctrl-B`
+
+Viewing the structure (ie outline) of a class
+* `ctrl-F12` will pop-up a dialog showing all members
+** hit `ctrl-F12` again to also see inherited members
+
+=== Editing
+
+* Extend selection using `ctrl-W`
+** and contract it down again using `ctrl-shift-W`
+* to duplicate a line, it's `ctrl-D`
+** if you have some text selected (or even some lines), it'll actually duplicate the entire selection
+* to delete a line, it's `ctrl-X`
+* to move a line up or down: `shift-alt-up` and `shift-alt-down`
+** if you have selected several lines, it'll move them all togethe
+* `ctrl-shift-J` can be handy for joining lines together
+** just hit enter to split them apart (even in string quotes; IntelliJ will "do the right thing")
+
+=== Intentions and Code Completion
+
+Massively useful is the "Intentions" popup; IntelliJ tries to guess what you might want to do.
+You can activate this using`alt-enter`, whenever you see a lightbulb/tooltip in the margin of the current line.
+
+Code completion usually happens whenever you type '.'.
+You can also use `ctrl-space` to bring these up.
+
+In certain circumstances (eg in methods0) you can also type `ctrl-shift-space` to get a smart list of methods etc that you might want to call.
+Can be useful.
+
+Last, when invoking a method, use `ctrl-P` to see the parameter types.
+
+=== Refactoring
+
+Loads of good stuff on the `Refactor` menu; most used are:
+
+* Rename (`shift-F6`)
+* Extract
+** method: `ctrl-alt-M`
+** variable: `ctrl-alt-V`
+* Inline method/variable: `ctrl-alt-N`
+* Change signature
+
+If you can't remember all those shortcuts, just use `ctrl-shift-alt-T` (might want to rebind that to something else!) and get a context-sensitive list of refactorings available for the currently selected object
+
+=== Plugins
+
+You might want to set up some additional plugins.
+You can do this using `File > Settings > Plugins` (or equivalently `File > Other Settings > Configure Plugins`).
+
+Recommended are:
+
+* link:https://plugins.jetbrains.com/plugin/7179?pr=idea[Maven Helper] plugin
+//+
+//More on this below.
+
+* link:https://github.com/asciidoctor/asciidoctor-intellij-plugin[AsciiDoctor] plugin
++
+Extremely useful if you are doing any authoring of documents.
+
+//Some others you might like to explore are:
+//
+//.IntelliJ Plugins
+//image::intellij-idea/050-some-plugins/020-some-plugins-confirmation.png[width="600px",link="{imagesdir}/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png"]
+
+//==== Maven Helper Plugin
+//
+//This plugin provides a couple of great features.
+//One is better visualization of dependency trees (similar to Eclipse).
+//
+//If you open a `pom.xml` file, you'll see an additional "Dependencies" tab:
+//
+//image::intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png[width="600px",link="{imagesdir}/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png"]
+//
+//Clicking on this gives a graphical tree representation of the dependencies, similar to that obtained by `mvn dependency:tree`, but filterable.
+//
+//image::intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png[width="600px",link="{imagesdir}/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png"]
+//
+//The plugin also provides the ability to easily run a Maven goal on a project:
+//
+//image::intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png[width="600px",link="{imagesdir}/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png"]
+//
+//This menu can also be bound to a keystroke so that it is available as a pop-up:
+//
+//image::intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png[width="600px",link="{imagesdir}/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png"]
+
+
+=== Troubleshooting
+
+When a Maven module is imported, IntelliJ generates its own project files (suffix `.ipr`), and the application is actually built from that.
+
+Occasionally these don't keep in sync (even if auto-import of Maven modules has been enabled).
+
+To fix the issue, try:
+
+* reimport module
+* rebuild selected modules/entire project
+* remove and then re-add the project
+* restart, invalidating caches
+* hit StackOverflow (!)
+
+One thing worth knowing; IntelliJ actively scans the filesystem all the time.
+It's therefore (almost always) fine to build the app from the Maven command line; IntelliJ will detect the changes and keep in sync.
+If you want to force that, use `File > Synchronize`, `ctrl-alt-Y`.
+
+//If you hit an error of "duplicate classes":
+//
+//image::intellij-idea/060-troubleshooting/010-duplicate-classes.png[width="600px",link="{imagesdir}/intellij-idea/060-troubleshooting/010-duplicate-classes.png"]
+//
+//then make sure you have correctly configured the xref:setupguide:ROOT:intellij.adoc#other-settings-compiler[annotation processor] settings.
+//Pay attention in particular to the "Production sources directory" and "Test sources directory", that these are set up correctly.
+
+== Faster turnaround times
+
+In this section are several options that will reduce the time it takes between making a source code edit and seeing the results in the running app. code/build/deploy/review feedback loop.
+
+//=== Using Grade to compile/enhance
+//
+//Running an Apache Isis application requires that the DataNucleus enhancer runs on the compiled bytecode.
+//As described xref:setupguide:ROOT:intellij.adoc#running-the-app[above], the recommended way to do this with IntelliJ is to use a Run configuration that runs the enhancer goal prior to launch.
+//
+//Alternative, you can use the following `build.gradle` script in your `dom` module:
+//
+//[source,groovy]
+//.`build.gradle`
+//----
+//apply plugin: 'java'
+//apply plugin: 'tangram.tools'
+//sourceCompatibility = 1.8
+//targetCompatibility = 1.8
+//version = (new XmlParser()).parse('pom.xml').parent.version.text()
+//buildscript {
+// repositories {
+// maven { url "http://oss.jfrog.org/artifactory/oss-snapshot-local" }
+// jcenter()
+// }
+// dependencies {
+// classpath 'tangram:gradle-plugin:1.1.2'
+// }
+//}
+//repositories {
+// mavenLocal()
+// maven { url "http://oss.jfrog.org/artifactory/oss-snapshot-local" }
+// jcenter()
+//}
+//dependencies {
+// compile group: 'org.apache.isis.core', name: 'isis-core-applib', version: version
+//}
+//task copyClasses << {
+// copy {
+// from 'build/classes/main'
+// into 'target/classes'
+// }
+//}
+//----
+//
+//The script is intended to be in the background as a daemon while editing/developing; whenever a change is made to any source code, gradle will automatically compile _and_ enhance the code.
+//In this way it eliminates the need to start up Maven and run the enhancer goal.
+//
+//To use, you must disable the IntelliJ's automatic building of the 'dom' project.
+//This is done using:
+//`File > Settings > Build, Execution, Deployment > Compiler > Excludes`, and then exclude the `.../dom/src/main/java`
+//directory:
+//
+//image::intellij-idea/070-advanced/002-compiler-exclude.png[width="800px",link="{imagesdir}/intellij-idea/070-advanced/002-compiler-exclude.png"]
+//
+//
+//The script can be run in the background using:
+//
+//[source,bash]
+//----
+//gradle -t --offline &
+//----
+//
+//from the command line (in the `dom` module).
+//
+//image::intellij-idea/070-advanced/004-gradle-output.png[width="600px",link="{imagesdir}/intellij-idea/070-advanced/004-gradle-output.png"]
+//
+//=== Using Gradle for liveReload
+//
+//Similarly, gradle can be run to reduce the turn-around time when tweaking the UI (defined by the
+//xref:vw:ROOT:layout.adoc#file-based[`*.layout.xml`] file for each domain class), when the app is running.
+//
+//The framework will automatically notice any changes to `.layout.xml` files, but these are read from the classpath (the `target/classes` directory), not the source path.
+//With IntelliJ these can be copied over manually by invoking `Run > Reload Changed Classes`.
+//Once the browser is refreshed, the new layout will be rendered.
+//
+//[NOTE]
+//====
+//We've occasionally noticed that this interferes with Wicket's own javascript - switching tabs becomes unresponsive.
+//The work-around is just to reload the page.
+//====
+//
+//To reduce the turn-around time there are therefore two steps to be automated:
+//
+//* the copying of the `.layout.xml` files over to the `target/classes` directory
+//* the triggering of a page refresh by the browser.
+//
+//The `layouts.gradle` script takes care of the first of these; whenever a change is made to any `.layout.xml` file, gradle will automatically copy over the file to the `target/classes` directory:
+//
+//[source,groovy]
+//.`layouts.gradle`
+//----
+//defaultTasks 'copyLayouts'
+//task copyLayouts(type:Copy) {
+// from 'src/main/java'
+// into 'target/classes'
+// include '**/*.layout.xml'
+//}
+//----
+//
+//Similarly, the `liveReload.gradle` script takes care of the browser refresh:
+//
+//[source,groovy]
+//.`liveReload.gradle`
+//----
+//defaultTasks 'liveReload'
+//buildscript {
+// repositories {
+// jcenter()
+// }
+// dependencies {
+// classpath 'org.kordamp.gradle:livereload-gradle-plugin:0.2.1'
+// }
+//}
+//apply plugin: 'org.kordamp.gradle.livereload'
+//liveReload {
+// docRoot new File('target/classes').canonicalPath
+//}
+//----
+//
+//These scripts can be run together using:
+//
+//[source,bash]
+//----
+//gradle -t --offline -b layouts.gradle &
+//gradle -t --offline -b liveReload.gradle &
+//----
+//
+//from the command line (in the `dom` module):
+//
+//
+//image::intellij-idea/070-advanced/005-gradle-output.png[width="600px",link="{imagesdir}/intellij-idea/070-advanced/005-gradle-output.png"]
+//
+//
+//Live reload also requires that the `isis.viewer.wicket.liveReloadUrl` configuration property is set appropriately:
+//
+//[source,ini]
+//.`viewer_wicket.properties`
+//----
+//isis.viewer.wicket.liveReloadUrl=http://localhost:35729/livereload.js?snipver=1
+//----
+//
+//You can confirm the script is loaded correctly using the web browser's development tools, eg:
+//
+//
+//image::intellij-idea/070-advanced/006-livereload-js.png[width="800px",link="{imagesdir}/intellij-idea/070-advanced/006-livereload-js.png"]
+//
+//=== Setting up DCEVM
+//
+//link:http://github.com/dcevm/dcevm[DCEVM] enhances the JVM with true hot-swap adding/removing of methods as well as more reliable hot swapping of the implementation of existing methods.
+//
+//In the context of Apache Isis, this is very useful for contributed actions and mixins and also view models; you should then be able to write these actions and have them be picked up without restarting the application.
+//
+//Changing persisting domain entities is more problematic, for two reasons: the JDO/DataNucleus enhancer needs to run on domain entities, and also at runtime JDO/DataNucleus would need to rebuild its own metamodel.
+//You may find that adding actions will work, but adding new properties or collections is much less likely to.
+//
+//To set up DCEVM, download the appropriate JAR from the link:https://dcevm.github.io/[github page], and run the installer.
+//For example:
+//
+//[source,bash]
+//----
+//java -jar DCEVM-light-8u51-installer.jar
+//----
+//
+//[TIP]
+//====
+//Be sure to run with appropriate privileges to be able to write to the installation directories of the JDK. If running on Windows, that means running as `Administrator`.
+//====
+//
+//After a few seconds this will display a dialog listing all installations of JDK that have been found:
+//
+//image::intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png[width="600px",link="{imagesdir}/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png"]
+//
+//
+//Select the corresponding installation, and select `Replace by DCEVM`.
+//
+//image::intellij-idea/070-advanced/020-dcevm-once-installed.png[width="600px",link="{imagesdir}/intellij-idea/070-advanced/020-dcevm-once-installed.png"]
+//
+//
+//In IntelliJ, register the JDK in `File > Project Structure` dialog:
+//
+//image::intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png[width="600px",link="{imagesdir}/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png"]
+//
+//Finally, in the run configuration, select the patched JDK:
+//
+//image::intellij-idea/070-advanced/040-dcevm-run-configuration.png[width="600px",link="{imagesdir}/intellij-idea/070-advanced/040-dcevm-run-configuration.png"]
+//
+//=== Setting up JRebel
+//
+//See the repo for the (non-ASF) link:https://github.com/isisaddons/isis-jrebel-plugin[Isis JRebel] plugin.
+//
+//Note that JRebel is a commercial product, requiring a license.
+//At the time of writing there is also currently a non-commercial free license (though note this comes with some usage conditions).
diff --git a/antora/toc/modules/devguide/pages/working-with-many-repos.adoc b/antora/components/setupguide/modules/ROOT/pages/working-with-many-repos.adoc
similarity index 99%
rename from antora/toc/modules/devguide/pages/working-with-many-repos.adoc
rename to antora/components/setupguide/modules/ROOT/pages/working-with-many-repos.adoc
index 924c218..5371ee4 100644
--- a/antora/toc/modules/devguide/pages/working-with-many-repos.adoc
+++ b/antora/components/setupguide/modules/ROOT/pages/working-with-many-repos.adoc
@@ -1,7 +1,6 @@
[[working-with-many-repos]]
= Appendix: Working with Many Repos
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-:page-partial:
diff --git a/antora/toc/modules/devguide/partials/x.sh b/antora/components/setupguide/modules/ROOT/partials/x.sh
similarity index 100%
rename from antora/toc/modules/devguide/partials/x.sh
rename to antora/components/setupguide/modules/ROOT/partials/x.sh
diff --git a/antora/toc/antora.yml b/antora/components/toc/antora.yml
similarity index 100%
copy from antora/toc/antora.yml
copy to antora/components/toc/antora.yml
diff --git a/antora/_component-template/modules/_module-template/examples/.gitkeep b/antora/components/toc/modules/ROOT/attachments/.gitkeep
similarity index 100%
rename from antora/_component-template/modules/_module-template/examples/.gitkeep
rename to antora/components/toc/modules/ROOT/attachments/.gitkeep
diff --git a/antora/_component-template/modules/_module-template/attachments/.gitkeep b/antora/components/toc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/_component-template/modules/_module-template/attachments/.gitkeep
rename to antora/components/toc/modules/ROOT/examples/.gitkeep
diff --git a/antora/toc/modules/ROOT/images/going-deeper/books/dhnako.jpg b/antora/components/toc/modules/ROOT/images/going-deeper/books/dhnako.jpg
similarity index 100%
rename from antora/toc/modules/ROOT/images/going-deeper/books/dhnako.jpg
rename to antora/components/toc/modules/ROOT/images/going-deeper/books/dhnako.jpg
diff --git a/antora/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/images/more-thanks/ecp.png b/antora/components/toc/modules/ROOT/images/more-thanks/ecp.png
similarity index 100%
rename from antora/toc/modules/ROOT/images/more-thanks/ecp.png
rename to antora/components/toc/modules/ROOT/images/more-thanks/ecp.png
diff --git a/antora/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/images/more-thanks/ej-technologies.png b/antora/components/toc/modules/ROOT/images/more-thanks/ej-technologies.png
similarity index 100%
rename from antora/toc/modules/ROOT/images/more-thanks/ej-technologies.png
rename to antora/components/toc/modules/ROOT/images/more-thanks/ej-technologies.png
diff --git a/antora/toc/modules/ROOT/images/more-thanks/icons8-logo.png b/antora/components/toc/modules/ROOT/images/more-thanks/icons8-logo.png
similarity index 100%
rename from antora/toc/modules/ROOT/images/more-thanks/icons8-logo.png
rename to antora/components/toc/modules/ROOT/images/more-thanks/icons8-logo.png
diff --git a/antora/toc/modules/ROOT/images/more-thanks/s101_170.png b/antora/components/toc/modules/ROOT/images/more-thanks/s101_170.png
similarity index 100%
rename from antora/toc/modules/ROOT/images/more-thanks/s101_170.png
rename to antora/components/toc/modules/ROOT/images/more-thanks/s101_170.png
diff --git a/antora/toc/modules/ROOT/images/support/slack/010.png b/antora/components/toc/modules/ROOT/images/support/slack/010.png
similarity index 100%
rename from antora/toc/modules/ROOT/images/support/slack/010.png
rename to antora/components/toc/modules/ROOT/images/support/slack/010.png
diff --git a/antora/toc/modules/ROOT/images/support/slack/020.png b/antora/components/toc/modules/ROOT/images/support/slack/020.png
similarity index 100%
rename from antora/toc/modules/ROOT/images/support/slack/020.png
rename to antora/components/toc/modules/ROOT/images/support/slack/020.png
diff --git a/antora/toc/modules/ROOT/images/support/slack/030.png b/antora/components/toc/modules/ROOT/images/support/slack/030.png
similarity index 100%
rename from antora/toc/modules/ROOT/images/support/slack/030.png
rename to antora/components/toc/modules/ROOT/images/support/slack/030.png
diff --git a/antora/toc/modules/ROOT/images/support/slack/040.png b/antora/components/toc/modules/ROOT/images/support/slack/040.png
similarity index 100%
rename from antora/toc/modules/ROOT/images/support/slack/040.png
rename to antora/components/toc/modules/ROOT/images/support/slack/040.png
diff --git a/antora/toc/modules/ROOT/images/support/slack/050.png b/antora/components/toc/modules/ROOT/images/support/slack/050.png
similarity index 100%
rename from antora/toc/modules/ROOT/images/support/slack/050.png
rename to antora/components/toc/modules/ROOT/images/support/slack/050.png
diff --git a/antora/toc/modules/ROOT/images/support/slack/060.png b/antora/components/toc/modules/ROOT/images/support/slack/060.png
similarity index 100%
rename from antora/toc/modules/ROOT/images/support/slack/060.png
rename to antora/components/toc/modules/ROOT/images/support/slack/060.png
diff --git a/antora/toc/modules/ROOT/images/support/slack/070.png b/antora/components/toc/modules/ROOT/images/support/slack/070.png
similarity index 100%
rename from antora/toc/modules/ROOT/images/support/slack/070.png
rename to antora/components/toc/modules/ROOT/images/support/slack/070.png
diff --git a/antora/toc/modules/ROOT/images/support/slack/080.png b/antora/components/toc/modules/ROOT/images/support/slack/080.png
similarity index 100%
rename from antora/toc/modules/ROOT/images/support/slack/080.png
rename to antora/components/toc/modules/ROOT/images/support/slack/080.png
diff --git a/antora/toc/modules/ROOT/images/support/slack/090.png b/antora/components/toc/modules/ROOT/images/support/slack/090.png
similarity index 100%
rename from antora/toc/modules/ROOT/images/support/slack/090.png
rename to antora/components/toc/modules/ROOT/images/support/slack/090.png
diff --git a/antora/toc/modules/ROOT/images/support/slack/100.png b/antora/components/toc/modules/ROOT/images/support/slack/100.png
similarity index 100%
rename from antora/toc/modules/ROOT/images/support/slack/100.png
rename to antora/components/toc/modules/ROOT/images/support/slack/100.png
diff --git a/antora/toc/modules/ROOT/images/support/slack/110.png b/antora/components/toc/modules/ROOT/images/support/slack/110.png
similarity index 100%
rename from antora/toc/modules/ROOT/images/support/slack/110.png
rename to antora/components/toc/modules/ROOT/images/support/slack/110.png
diff --git a/antora/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2015-HealthAssessmentReport_DRCP594591_138322.pdf b/antora/components/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2015-HealthAssessmentReport_DRCP594591_138322.pdf
similarity index 100%
rename from antora/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2015-HealthAssessmentReport_DRCP594591_138322.pdf
rename to antora/components/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2015-HealthAssessmentReport_DRCP594591_138322.pdf
diff --git a/antora/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2019-HealthAssessmentReport_DRCJ1712475_138322.pdf b/antora/components/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2019-HealthAssessmentReport_DRCJ1712475_138322.pdf
similarity index 100%
rename from antora/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2019-HealthAssessmentReport_DRCJ1712475_138322.pdf
rename to antora/components/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2019-HealthAssessmentReport_DRCJ1712475_138322.pdf
diff --git a/antora/toc/modules/ROOT/images/tv_show-25.png b/antora/components/toc/modules/ROOT/images/tv_show-25.png
similarity index 100%
rename from antora/toc/modules/ROOT/images/tv_show-25.png
rename to antora/components/toc/modules/ROOT/images/tv_show-25.png
diff --git a/antora/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/toc/modules/ROOT/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/ROOT/nav.adoc b/antora/components/toc/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..080d8e3
--- /dev/null
+++ b/antora/components/toc/modules/ROOT/nav.adoc
@@ -0,0 +1 @@
+include::toc:ROOT:partial$component-nav.adoc[]
diff --git a/antora/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
similarity index 85%
rename from antora/toc/modules/ROOT/pages/about.adoc
rename to antora/components/toc/modules/ROOT/pages/about.adoc
index a95264c..e9bfabe 100644
--- a/antora/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -1,6 +1,6 @@
= Menu
:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or ag [...]
-:page-role: -toc -title
+:page-role: -narrow -title
[.nogrid]
@@ -24,35 +24,53 @@
* xref:starters:helloworld:about.adoc[HelloWorld]
* xref:starters:simpleapp:about.adoc[SimpleApp]
+* xref:starters:parent-pom:about.adoc[Parent POM]
+* xref:starters:mavendeps:about.adoc[Aggregator POMs]
|
[discrete]
-== Demos & Tutorials
+== Demos & Tutorial
-* xref:demoapp:ROOT:about.adoc[Demo App]
-* link:https://danhaywood.gitlab.io/isis-petclinic-tutorial-docs/petclinic/1.16.2/intro.html[Petclinic]
+* xref:toc:demo:about.adoc[Demo App]
+* link:https://danhaywood.gitlab.io/isis-petclinic-tutorial-docs/petclinic/1.16.2/intro.html[Petclinic (v1.16.2)]
+
+[discrete]
+== Resources
+
+* xref:toc:resources:cheatsheet.adoc[Cheat Sheet]
+* xref:toc:resources:icons.adoc[Icons]
|
[discrete]
== Guides
+_Development_
+
+* xref:setupguide:ROOT:about.adoc[Setup Guide]
+
_Core_
* *xref:userguide:ROOT:about.adoc[User Guide]*
* *xref:refguide:ROOT:about.adoc[Reference Guide]*
-
-_Development_
-
* *xref:testing:ROOT:about.adoc[Testing Guide]*
-* *xref:toc:devguide:about.adoc[Developers' Guide]*
-_Libraries_
+|
+[discrete]
+== Libraries
+
+_For Use in Apps_
* xref:subdomains:ROOT:about.adoc[Subdomain Libraries]
-* xref:valuetypes:ROOT:about.adoc[Value Types]
+* xref:valuetypes:ROOT:about.adoc[Value Type Libraries]
+
+_Integrate between Apps_
+
* xref:mappings:ROOT:about.adoc[Bounded Context Mapping Libraries]
+_Other_
+* xref:incubator:ROOT:about.adoc[Incubator]
+* xref:legacy:ROOT:about.adoc[Legacy]
|
@@ -80,20 +98,17 @@ _Extensions_
[discrete]
== Support
+_Contact_
+
* *xref:toc:ROOT:support/slack-channel.adoc[Slack]*
* xref:toc:ROOT:support/mailing-list.adoc[Mailing Lists]
* link:https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=87[JIRA]
-
-
* link:https://stackoverflow.com/questions/tagged/isis[Stack Overflow]
-
-[discrete]
-== Releases
+_Releases_
* xref:toc:ROOT:downloads/how-to.adoc[Downloads]
-* xref:toc:relnotes:about.adoc[Release Notes]
-* xref:toc:mignotes:about.adoc[Migration Notes]
+* xref:relnotes:ROOT:about.adoc[Release Notes]
_Nightly Builds (not ASF)_
@@ -102,44 +117,39 @@ _Nightly Builds (not ASF)_
* link:https://apache-isis-committers.github.io/isis-nightly/toc/about.html[Website preview]
-
|
[discrete]
-== Further Resources
+== Framework
-_Reading_
+* xref:conguide:ROOT:about.adoc[Contributors' Guide]
+* xref:comguide:ROOT:about.adoc[Committers' Guide]
+* xref:core:ROOT:about.adoc[Core Design]
+* xref:more-thanks/more-thanks.adoc[Acknowledgements]
-* xref:going-deeper/articles-and-presentations.adoc[Articles & Presentations]
-* xref:going-deeper/books.adoc[Books]
-_Academia_
+_Analysis_
-* link:../ug/fun/_attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf[Naked Objects PhD] (Pawson)
-* https://esc.fnwi.uva.nl/thesis/centraal/files/f270412620.pdf[CLIsis: An interface for Visually Impaired Users] (Bachelors dissertation, Ginn)
-* https://esc.fnwi.uva.nl/thesis/centraal/files/f1051832702.pdf[Using blockchain to validate audit trail data in private business applications] (Masters dissertation, Kalis)
+* link:https://sonarcloud.io/dashboard?id=apache_isis[SonarCloud.io]
+* link:https://fisheye.apache.org/browse/~br=master/isis-git/[ASF Fisheye]
|
[discrete]
-== Internal
+== Further Resources
-* xref:toc:comguide:about.adoc[Committers' Guide]
-** xref:toc:comguide:about.adoc#cutting-a-release[Cutting a Release]
-** xref:toc:comguide:about.adoc#verifying-releases[Verifying a Release]
-* xref:core:ROOT:about.adoc[Core Design]
-* xref:more-thanks/more-thanks.adoc[Acknowledgements]
+_Reading_
-_More Libraries_
+* xref:going-deeper/articles-and-presentations.adoc[Articles & Presentations]
+* xref:going-deeper/books.adoc[Books]
-* xref:incubator:ROOT:about.adoc[Incubator]
-* xref:legacy:ROOT:about.adoc[Legacy]
+_Academia_
-_Analysis_
+* link:../ug/fun/_attachments/core-concepts/Pawson-Naked-Objects-thesis.pdf[Naked Objects PhD] (Pawson)
+* https://esc.fnwi.uva.nl/thesis/centraal/files/f270412620.pdf[CLIsis: An interface for Visually Impaired Users] (Bachelors dissertation, Ginn)
+* https://esc.fnwi.uva.nl/thesis/centraal/files/f1051832702.pdf[Using blockchain to validate audit trail data in private business applications] (Masters dissertation, Kalis)
-* link:https://sonarcloud.io/dashboard?id=apache_isis[SonarCloud.io]
-* link:https://fisheye.apache.org/browse/~br=master/isis-git/[ASF Fisheye]
@@ -164,7 +174,7 @@ _Experiments_
* https://github.com/isisaddons/isis-app-simpledsl[Isis DSL Example]
-
+|
[discrete]
== 3rd party
@@ -174,6 +184,11 @@ _Restful Objects viewers_
* link:https://github.com/sebastianslutzky/rob[ROB]
* link:https://github.com/joerg-rade/kroviz[Kroviz]
+|
+[discrete]
+
+
+
|===
diff --git a/antora/toc/modules/ROOT/pages/downloads/how-to.adoc b/antora/components/toc/modules/ROOT/pages/downloads/how-to.adoc
similarity index 100%
rename from antora/toc/modules/ROOT/pages/downloads/how-to.adoc
rename to antora/components/toc/modules/ROOT/pages/downloads/how-to.adoc
diff --git a/antora/toc/modules/ROOT/pages/going-deeper/articles-and-presentations.adoc b/antora/components/toc/modules/ROOT/pages/going-deeper/articles-and-presentations.adoc
similarity index 100%
rename from antora/toc/modules/ROOT/pages/going-deeper/articles-and-presentations.adoc
rename to antora/components/toc/modules/ROOT/pages/going-deeper/articles-and-presentations.adoc
diff --git a/antora/toc/modules/ROOT/pages/going-deeper/books.adoc b/antora/components/toc/modules/ROOT/pages/going-deeper/books.adoc
similarity index 100%
rename from antora/toc/modules/ROOT/pages/going-deeper/books.adoc
rename to antora/components/toc/modules/ROOT/pages/going-deeper/books.adoc
diff --git a/antora/toc/modules/ROOT/pages/landing-page/catalogs.adoc b/antora/components/toc/modules/ROOT/pages/landing-page/catalogs.adoc
similarity index 100%
rename from antora/toc/modules/ROOT/pages/landing-page/catalogs.adoc
rename to antora/components/toc/modules/ROOT/pages/landing-page/catalogs.adoc
diff --git a/antora/toc/modules/ROOT/pages/landing-page/components.adoc b/antora/components/toc/modules/ROOT/pages/landing-page/components.adoc
similarity index 100%
rename from antora/toc/modules/ROOT/pages/landing-page/components.adoc
rename to antora/components/toc/modules/ROOT/pages/landing-page/components.adoc
diff --git a/antora/toc/modules/ROOT/pages/landing-page/guides.adoc b/antora/components/toc/modules/ROOT/pages/landing-page/guides.adoc
similarity index 82%
rename from antora/toc/modules/ROOT/pages/landing-page/guides.adoc
rename to antora/components/toc/modules/ROOT/pages/landing-page/guides.adoc
index d3f01ff..ed65a71 100644
--- a/antora/toc/modules/ROOT/pages/landing-page/guides.adoc
+++ b/antora/components/toc/modules/ROOT/pages/landing-page/guides.adoc
@@ -1,7 +1,24 @@
= Guides
:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or ag [...]
-This page lists the user and reference guides available for developers to create applications with the framework.
+This page lists the user and reference guides available for developers to create applications with the framework:
+
+== Getting Started
+
+The following guide helps you setup your development environment so you can quickly be productive:
+
+* xref:setupguide:ROOT:about.adoc[Setup Guide]
+
+It's supported by the starter apps:
+
+* xref:starters:helloworld:about.adoc[HelloWorld] starter app
+* xref:starters:simpleapp:about.adoc[SimpleApp] starter app
+
+and the convenience POMs (to inherit from or reference):
+
+* xref:starters:parent-pom:about.adoc[Parent POM]
+* xref:starters:mavendeps:about.adoc[Aggregator POMs]
+
== Core
@@ -41,11 +58,5 @@ Provides libraries for integrating (or mapping) between the Apache Isis applicat
Some/many of these libraries are for code hosted outside of the Apache Isis application, ie which call into it.
Others are SPIs that are called by the framework implicitly rather than by your domain logic directly.
-
As well as the current libraries, the xref:incubator:ROOT:about.adoc[Incubator] may have additional libraries that may end up graduating to the extensions catalog, while the xref:legacy:ROOT:about.adoc[Legacy Catalog] may contain libraries that have been deprecated and are on the way out.
-== Resources
-
-* *xref:toc:devguide:about.adoc[Developers' Guide]*
-* xref:starters:mavendeps:about.adoc[Maven dependencies]
-
diff --git a/antora/toc/modules/ROOT/pages/landing-page/internal.adoc b/antora/components/toc/modules/ROOT/pages/landing-page/internal.adoc
similarity index 66%
rename from antora/toc/modules/ROOT/pages/landing-page/internal.adoc
rename to antora/components/toc/modules/ROOT/pages/landing-page/internal.adoc
index 2e96e1f..203423c 100644
--- a/antora/toc/modules/ROOT/pages/landing-page/internal.adoc
+++ b/antora/components/toc/modules/ROOT/pages/landing-page/internal.adoc
@@ -1,20 +1,18 @@
-= Internal
+= Framework
:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or ag [...]
-These guides and documents are for "internal use only", in other words by the use committers of the framework.
+These guides and documents relate to the framework itself, so will be of interest to contributors and committers only.
They include guides for day-to-day operations, as well as notes on the design/implementation of the software.
-== Committers
+== Contributors & Committers
-* xref:toc:comguide:about.adoc[Committers' Guide]
-** xref:toc:comguide:about.adoc#cutting-a-release[Cutting a Release]
-** xref:toc:comguide:about.adoc#verifying-releases[Verifying a Release]
+** xref:conguide:ROOT:about.adoc[Contributors' Guide]
+* xref:comguide:ROOT:about.adoc[Committers' Guide]
-== Implementation
+== Design & Implementation
-* xref:core:archdesign:about.adoc[Architecture & Design]
-* xref:runtime-services:ROOT:about.adoc[Framework Internal Services]
+* xref:core:ROOT:about.adoc[Core Design]
* xref:smoketests:ROOT:about.adoc[SmokeTest App]
diff --git a/antora/toc/modules/ROOT/pages/landing-page/releases.adoc b/antora/components/toc/modules/ROOT/pages/landing-page/releases.adoc
similarity index 88%
rename from antora/toc/modules/ROOT/pages/landing-page/releases.adoc
rename to antora/components/toc/modules/ROOT/pages/landing-page/releases.adoc
index f09fd78..6ea6509 100644
--- a/antora/toc/modules/ROOT/pages/landing-page/releases.adoc
+++ b/antora/components/toc/modules/ROOT/pages/landing-page/releases.adoc
@@ -19,13 +19,10 @@ If you want though you can also xref:toc:ROOT:downloads/how-to.adoc[download] th
For each release, consult:
-* xref:toc:relnotes:about.adoc[Release Notes]
+* xref:relnotes:ROOT:about.adoc[Release Notes]
+
-to learn about new features, improvements and bug fixes
-
-* xref:toc:mignotes:about.adoc[Migration Notes]
-+
-to learn how to migrate to new features / away from deprecated or removed features.
+to learn about new features, improvements and bug fixes.
+Also includes migration notes, explaining how to migrate to new features / away from deprecated or removed features.
If you like to live on the bleeding edge, there are also nightly builds of the framework.
diff --git a/antora/toc/modules/ROOT/pages/landing-page/support.adoc b/antora/components/toc/modules/ROOT/pages/landing-page/support.adoc
similarity index 91%
rename from antora/toc/modules/ROOT/pages/landing-page/support.adoc
rename to antora/components/toc/modules/ROOT/pages/landing-page/support.adoc
index 8685473..7b618e2 100644
--- a/antora/toc/modules/ROOT/pages/landing-page/support.adoc
+++ b/antora/components/toc/modules/ROOT/pages/landing-page/support.adoc
@@ -31,10 +31,9 @@ But you can also download the framework and built it yourself:
* xref:toc:ROOT:downloads/how-to.adoc[Downloads]
-Each new version of the framework updates the release notes and provides migration notes:
+Each new version of the framework updates the release notes (which includes migration notes):
-* xref:toc:relnotes:about.adoc[Release Notes]
-* xref:toc:mignotes:about.adoc[Migration Notes]
+* xref:relnotes:ROOT:about.adoc[Release Notes]
If you want to live on the bleeding edge, you can also use the nightly builds (not ASF):
diff --git a/antora/toc/modules/ROOT/pages/more-thanks/more-thanks.adoc b/antora/components/toc/modules/ROOT/pages/more-thanks/more-thanks.adoc
similarity index 100%
rename from antora/toc/modules/ROOT/pages/more-thanks/more-thanks.adoc
rename to antora/components/toc/modules/ROOT/pages/more-thanks/more-thanks.adoc
diff --git a/antora/toc/modules/ROOT/pages/support/mailing-list.adoc b/antora/components/toc/modules/ROOT/pages/support/mailing-list.adoc
similarity index 100%
rename from antora/toc/modules/ROOT/pages/support/mailing-list.adoc
rename to antora/components/toc/modules/ROOT/pages/support/mailing-list.adoc
diff --git a/antora/toc/modules/ROOT/pages/support/slack-channel.adoc b/antora/components/toc/modules/ROOT/pages/support/slack-channel.adoc
similarity index 100%
rename from antora/toc/modules/ROOT/pages/support/slack-channel.adoc
rename to antora/components/toc/modules/ROOT/pages/support/slack-channel.adoc
diff --git a/antora/toc/modules/ROOT/pages/what-is-apache-isis/common-use-cases.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/common-use-cases.adoc
similarity index 100%
rename from antora/toc/modules/ROOT/pages/what-is-apache-isis/common-use-cases.adoc
rename to antora/components/toc/modules/ROOT/pages/what-is-apache-isis/common-use-cases.adoc
diff --git a/antora/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc
similarity index 100%
rename from antora/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc
rename to antora/components/toc/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc
diff --git a/antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by.adoc
similarity index 100%
rename from antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by.adoc
rename to antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by.adoc
diff --git a/antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/commapp.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/commapp.adoc
similarity index 100%
rename from antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/commapp.adoc
rename to antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/commapp.adoc
diff --git a/antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/contactapp.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/contactapp.adoc
similarity index 100%
rename from antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/contactapp.adoc
rename to antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/contactapp.adoc
diff --git a/antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/cqnz.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/cqnz.adoc
similarity index 100%
rename from antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/cqnz.adoc
rename to antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/cqnz.adoc
diff --git a/antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/estatio.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/estatio.adoc
similarity index 100%
rename from antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/estatio.adoc
rename to antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/estatio.adoc
diff --git a/antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/gesconsultor-grc.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/gesconsultor-grc.adoc
similarity index 100%
rename from antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/gesconsultor-grc.adoc
rename to antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/gesconsultor-grc.adoc
diff --git a/antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/transport-planner.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/transport-planner.adoc
similarity index 100%
rename from antora/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/transport-planner.adoc
rename to antora/components/toc/modules/ROOT/pages/what-is-apache-isis/powered-by/transport-planner.adoc
diff --git a/antora/toc/modules/ROOT/pages/what-is-apache-isis/screencasts-older.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts-older.adoc
similarity index 97%
rename from antora/toc/modules/ROOT/pages/what-is-apache-isis/screencasts-older.adoc
rename to antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts-older.adoc
index e12dafc..048a226 100644
--- a/antora/toc/modules/ROOT/pages/what-is-apache-isis/screencasts-older.adoc
+++ b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts-older.adoc
@@ -50,7 +50,7 @@ _How to import an Apache Isis maven-based application into Eclipse and configure
NB: when configuring DataNucleus for the *dom* project, make sure you are in the 'Java perspective', not the 'Java EE perspective'). +
-Learn more xref:toc:devguide:about.adoc[here]
+Learn more xref:setupguide:ROOT:eclipse.adoc[here]
|video::RgcYfjQ8yJA[youtube,width="420px",height="315px"]
@@ -60,7 +60,7 @@ Learn more xref:toc:devguide:about.adoc[here]
_How to import an Apache Isis maven-based application into IntelliJ and run the app._ +
-Learn more xref:toc:devguide:about.adoc#intellij[here]
+Learn more xref:setupguide:ROOT:intellij.adoc[here]
|video::lwKsyTbTSnA[youtube,width="420px",height="315px"]
diff --git a/antora/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
similarity index 99%
rename from antora/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
rename to antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
index 2b8c86e..94d5687 100644
--- a/antora/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
+++ b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
@@ -54,7 +54,7 @@ include::screencasts/playlists.adoc[]
|link:https://www.youtube.com/watch?v=6GPtec5Hu5Q[002^] +
-Importing the generated app into an xref:toc:devguide:ide.adoc[IDE] +
+Importing the generated app into an xref:setupguide:ROOT:ide.adoc[IDE] +
|x||x||||||||
diff --git a/antora/toc/modules/ROOT/pages/what-is-apache-isis/screencasts/playlists.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts/playlists.adoc
similarity index 100%
rename from antora/toc/modules/ROOT/pages/what-is-apache-isis/screencasts/playlists.adoc
rename to antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts/playlists.adoc
diff --git a/antora/components/toc/modules/ROOT/partials/component-nav.adoc b/antora/components/toc/modules/ROOT/partials/component-nav.adoc
new file mode 100644
index 0000000..682f84f
--- /dev/null
+++ b/antora/components/toc/modules/ROOT/partials/component-nav.adoc
@@ -0,0 +1,10 @@
+include::toc:ROOT:partial$module-nav/what-is-apache-isis.adoc[]
+include::toc:ROOT:partial$module-nav/starter-apps.adoc[]
+include::toc:ROOT:partial$module-nav/demos-and-tutorials.adoc[]
+include::toc:ROOT:partial$module-nav/resources.adoc[]
+include::toc:ROOT:partial$module-nav/guides.adoc[]
+include::toc:ROOT:partial$module-nav/libraries.adoc[]
+include::toc:ROOT:partial$module-nav/components.adoc[]
+include::toc:ROOT:partial$module-nav/support.adoc[]
+include::toc:ROOT:partial$module-nav/releases.adoc[]
+include::toc:ROOT:partial$module-nav/framework.adoc[]
diff --git a/antora/components/toc/modules/ROOT/partials/module-nav/components.adoc b/antora/components/toc/modules/ROOT/partials/module-nav/components.adoc
new file mode 100644
index 0000000..75cbead
--- /dev/null
+++ b/antora/components/toc/modules/ROOT/partials/module-nav/components.adoc
@@ -0,0 +1,17 @@
+* Components
+
+** Viewers
+*** xref:vw:ROOT:about.adoc[Wicket UI]
+*** xref:vro:ROOT:about.adoc[Restful Objects (REST API)]
+
+** Security
+
+*** xref:security:ROOT:about.adoc[Security Guide]
+
+** Persistence
+
+*** xref:pjdo:ROOT:about.adoc[DataNucleus (JDO)]
+
+** Extensions
+
+*** xref:extensions:ROOT:about.adoc[Extensions Catalog]
diff --git a/antora/components/toc/modules/ROOT/partials/module-nav/demos-and-tutorials.adoc b/antora/components/toc/modules/ROOT/partials/module-nav/demos-and-tutorials.adoc
new file mode 100644
index 0000000..6555dcc
--- /dev/null
+++ b/antora/components/toc/modules/ROOT/partials/module-nav/demos-and-tutorials.adoc
@@ -0,0 +1,5 @@
+* Demos & Tutorials
+
+include::toc:demo:partial$module-nav.adoc[]
+
+** link:https://danhaywood.gitlab.io/isis-petclinic-tutorial-docs/petclinic/1.16.2/intro.html[Petclinic (tutorial)]
diff --git a/antora/components/toc/modules/ROOT/partials/module-nav/framework.adoc b/antora/components/toc/modules/ROOT/partials/module-nav/framework.adoc
new file mode 100644
index 0000000..c4acdcc
--- /dev/null
+++ b/antora/components/toc/modules/ROOT/partials/module-nav/framework.adoc
@@ -0,0 +1,7 @@
+* Framework
+
+** xref:conguide:ROOT:about.adoc[Contributors' Guide]
+** xref:comguide:ROOT:about.adoc[Committers' Guide]
+** xref:core:ROOT:about.adoc[Core Design]
+** xref:more-thanks/more-thanks.adoc[Acknowledgements]
+
diff --git a/antora/components/toc/modules/ROOT/partials/module-nav/guides.adoc b/antora/components/toc/modules/ROOT/partials/module-nav/guides.adoc
new file mode 100644
index 0000000..283f0b8
--- /dev/null
+++ b/antora/components/toc/modules/ROOT/partials/module-nav/guides.adoc
@@ -0,0 +1,11 @@
+* Guides
+
+** Development
+
+*** xref:setupguide:ROOT:about.adoc[Setup Guide]
+
+** Core
+
+*** xref:userguide:ROOT:about.adoc[User Guide]
+*** xref:refguide:ROOT:about.adoc[Reference Guide]
+*** xref:testing:ROOT:about.adoc[Testing Guide]
diff --git a/antora/components/toc/modules/ROOT/partials/module-nav/libraries.adoc b/antora/components/toc/modules/ROOT/partials/module-nav/libraries.adoc
new file mode 100644
index 0000000..f68d745
--- /dev/null
+++ b/antora/components/toc/modules/ROOT/partials/module-nav/libraries.adoc
@@ -0,0 +1,14 @@
+* Libraries
+
+** For Use in Apps
+
+*** xref:subdomains:ROOT:about.adoc[Subdomain Libraries]
+*** xref:valuetypes:ROOT:about.adoc[Value Types]
+
+** Integrate between Apps
+
+*** xref:mappings:ROOT:about.adoc[Bounded Context Mapping Libraries]
+
+** Other
+*** xref:incubator:ROOT:about.adoc[Incubator]
+*** xref:legacy:ROOT:about.adoc[Legacy]
diff --git a/antora/components/toc/modules/ROOT/partials/module-nav/releases.adoc b/antora/components/toc/modules/ROOT/partials/module-nav/releases.adoc
new file mode 100644
index 0000000..9bd6f83
--- /dev/null
+++ b/antora/components/toc/modules/ROOT/partials/module-nav/releases.adoc
@@ -0,0 +1,12 @@
+* Releases
+
+** xref:toc:ROOT:downloads/how-to.adoc[Downloads]
+** xref:relnotes:ROOT:about.adoc[Release Notes]
+
+
+** Nightly Builds (not ASF)
+
+*** link:https://github.com/apache-isis-committers/isis-nightly[CI]
+*** link:https://repo.incode.cloud/[Maven Repo]
+*** link:https://apache-isis-committers.github.io/isis-nightly/toc/about.html[Website preview]
+
diff --git a/antora/components/toc/modules/ROOT/partials/module-nav/resources.adoc b/antora/components/toc/modules/ROOT/partials/module-nav/resources.adoc
new file mode 100644
index 0000000..25f683b
--- /dev/null
+++ b/antora/components/toc/modules/ROOT/partials/module-nav/resources.adoc
@@ -0,0 +1 @@
+include::toc:resources:partial$module-nav.adoc[]
diff --git a/antora/components/toc/modules/ROOT/partials/module-nav/starter-apps.adoc b/antora/components/toc/modules/ROOT/partials/module-nav/starter-apps.adoc
new file mode 100644
index 0000000..b729444
--- /dev/null
+++ b/antora/components/toc/modules/ROOT/partials/module-nav/starter-apps.adoc
@@ -0,0 +1,9 @@
+* Starter Apps
+
+** xref:starters:helloworld:about.adoc[HelloWorld]
+** xref:starters:simpleapp:about.adoc[SimpleApp]
+
+** xref:starters:parent-pom:about.adoc[Parent POM]
+** xref:starters:mavendeps:about.adoc[Aggregator POMs]
+
+
diff --git a/antora/components/toc/modules/ROOT/partials/module-nav/support.adoc b/antora/components/toc/modules/ROOT/partials/module-nav/support.adoc
new file mode 100644
index 0000000..1c6f036
--- /dev/null
+++ b/antora/components/toc/modules/ROOT/partials/module-nav/support.adoc
@@ -0,0 +1,8 @@
+* Support
+
+
+** xref:toc:ROOT:support/slack-channel.adoc[Slack]
+** xref:toc:ROOT:support/mailing-list.adoc[Mailing Lists]
+** link:https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=87[ASF JIRA]
+** link:http://stackoverflow.com/questions/tagged/isis[Stack Overflow]
+
diff --git a/antora/components/toc/modules/ROOT/partials/module-nav/what-is-apache-isis.adoc b/antora/components/toc/modules/ROOT/partials/module-nav/what-is-apache-isis.adoc
new file mode 100644
index 0000000..d334f5e
--- /dev/null
+++ b/antora/components/toc/modules/ROOT/partials/module-nav/what-is-apache-isis.adoc
@@ -0,0 +1,5 @@
+* What is Apache Isis?
+** xref:what-is-apache-isis/isis-in-pictures.adoc[Apache Isis in pictures]
+** xref:what-is-apache-isis/common-use-cases.adoc[Common Use Cases]
+** xref:what-is-apache-isis/screencasts.adoc[Screencasts]
+// ** xref:what-is-apache-isis/powered-by.adoc[Powered By]
diff --git a/antora/components/toc/modules/resources/attachments/IsisCheatSheet.docx b/antora/components/toc/modules/resources/attachments/IsisCheatSheet.docx
new file mode 100644
index 0000000..a1d6797
Binary files /dev/null and b/antora/components/toc/modules/resources/attachments/IsisCheatSheet.docx differ
diff --git a/antora/components/toc/modules/resources/attachments/IsisCheatSheet.pdf b/antora/components/toc/modules/resources/attachments/IsisCheatSheet.pdf
new file mode 100644
index 0000000..4cdd75c
Binary files /dev/null and b/antora/components/toc/modules/resources/attachments/IsisCheatSheet.pdf differ
diff --git a/antora/toc/modules/devguide/images/resources/IsisCheatSheet.png b/antora/components/toc/modules/resources/images/IsisCheatSheet.png
similarity index 100%
rename from antora/toc/modules/devguide/images/resources/IsisCheatSheet.png
rename to antora/components/toc/modules/resources/images/IsisCheatSheet.png
diff --git a/antora/components/toc/modules/resources/nav.adoc b/antora/components/toc/modules/resources/nav.adoc
new file mode 100644
index 0000000..080d8e3
--- /dev/null
+++ b/antora/components/toc/modules/resources/nav.adoc
@@ -0,0 +1 @@
+include::toc:ROOT:partial$component-nav.adoc[]
diff --git a/antora/toc/modules/devguide/pages/hints-and-tips.adoc b/antora/components/toc/modules/resources/pages/about.adoc
similarity index 80%
rename from antora/toc/modules/devguide/pages/hints-and-tips.adoc
rename to antora/components/toc/modules/resources/pages/about.adoc
index 612936e..dd1876b 100644
--- a/antora/toc/modules/devguide/pages/hints-and-tips.adoc
+++ b/antora/components/toc/modules/resources/pages/about.adoc
@@ -1,10 +1,8 @@
-[[hints-and-tips]]
-= Hints and Tips
+= Resources
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-:page-partial:
+The following resources are available to help you develop your Apache Isis applications:
-
-This chapter provides some solutions for problems we've encountered ourselves or have been raised on the Apache Isis mailing lists.
-
+* xref:toc:resources:cheatsheet.adoc[cheat sheet]
+* xref:toc:resources:icons.adoc[icons]
diff --git a/antora/toc/modules/devguide/pages/ide.adoc b/antora/components/toc/modules/resources/pages/cheatsheet.adoc
similarity index 63%
rename from antora/toc/modules/devguide/pages/ide.adoc
rename to antora/components/toc/modules/resources/pages/cheatsheet.adoc
index 73d2466..e085c11 100644
--- a/antora/toc/modules/devguide/pages/ide.adoc
+++ b/antora/components/toc/modules/resources/pages/cheatsheet.adoc
@@ -1,15 +1,16 @@
-[[ide]]
-= Using an IDE
+= Cheat Sheet
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-:page-partial:
+:page-role: -toc
+This "one-pager" cheat sheet summarises the main programming conventions to follow when writing an Apache Isis application.
+pass:[<br/>]
-The vast majority of Java developers use an IDE to assist with developing their code, and we highly recommend that you do likewise as you develop your Apache Isis applications using an IDE.
-Apache Isis is built with Maven, and all modern IDEs can import Maven projects.
-
-This chapter shows how to setup and use two of the most popular IDEs, IntelliJ IDEA and Eclipse.
+image::IsisCheatSheet.png[width="800px",link="{attachmentsdir}/IsisCheatSheet.pdf"]
+pass:[<br/>]
+You can download the cheat sheet as either an
+link:{attachmentsdir}/IsisCheatSheet.pdf[Acrobat PDF] file or as an link:{attachmentsdir}/IsisCheatSheet.docx[MS Word .docx] file.
diff --git a/antora/toc/modules/devguide/pages/resources/icons.adoc b/antora/components/toc/modules/resources/pages/icons.adoc
similarity index 52%
rename from antora/toc/modules/devguide/pages/resources/icons.adoc
rename to antora/components/toc/modules/resources/pages/icons.adoc
index 3287f1a..59fdc28 100644
--- a/antora/toc/modules/devguide/pages/resources/icons.adoc
+++ b/antora/components/toc/modules/resources/pages/icons.adoc
@@ -1,11 +1,5 @@
-[[icons]]
-= Appendix: Icons
-:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or ag [...]
-:page-partial:
-
-
-
-
+= Icons
+:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
Most Apache Isis viewers use icons to help identify domain objects in the user interface.
It's a good idea to ensure that these are styled consistently.
@@ -18,4 +12,6 @@ Here are some open source icon sets for both personal and commercial use (though
* http://google.github.io/material-design-icons/[Google material design] and http://www.google.com/design/spec/resources/sticker-sheets.html#[zip here]
-If you know of any others freely usable and easily accessible, let us know through the xref:toc:ROOT:support.adoc#[mailing list].
+If you know of any others freely usable and easily accessible, let us know through the xref:toc:ROOT:support/mailing-list.adoc[mailing list].
+
+
diff --git a/antora/components/toc/modules/resources/partials/module-nav.adoc b/antora/components/toc/modules/resources/partials/module-nav.adoc
new file mode 100644
index 0000000..6c8442a
--- /dev/null
+++ b/antora/components/toc/modules/resources/partials/module-nav.adoc
@@ -0,0 +1,4 @@
+* Resources
+
+** xref:toc:resources:cheatsheet.adoc[Cheat Sheet]
+** xref:toc:resources:icons.adoc[Icons]
diff --git a/antora/playbooks/site-persistence.yml b/antora/playbooks/site-comguide.yml
similarity index 89%
copy from antora/playbooks/site-persistence.yml
copy to antora/playbooks/site-comguide.yml
index 6516193..4211b88 100644
--- a/antora/playbooks/site-persistence.yml
+++ b/antora/playbooks/site-comguide.yml
@@ -8,15 +8,15 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
-
-# persistence
- url: .
- start_path: persistence/jdo/adoc # pjdo
+ start_path: antora/components/comguide # comguide
branches: HEAD
+
+
ui:
bundle:
url: ../isis-antora/build/ui-bundle.zip
diff --git a/antora/playbooks/site-persistence.yml b/antora/playbooks/site-conguide.yml
similarity index 89%
copy from antora/playbooks/site-persistence.yml
copy to antora/playbooks/site-conguide.yml
index 6516193..201034d 100644
--- a/antora/playbooks/site-persistence.yml
+++ b/antora/playbooks/site-conguide.yml
@@ -8,15 +8,15 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
-
-# persistence
- url: .
- start_path: persistence/jdo/adoc # pjdo
+ start_path: antora/components/conguide # conguide
branches: HEAD
+
+
ui:
bundle:
url: ../isis-antora/build/ui-bundle.zip
diff --git a/antora/playbooks/site-core.yml b/antora/playbooks/site-core.yml
index 09f4e4b..c9a5940 100644
--- a/antora/playbooks/site-core.yml
+++ b/antora/playbooks/site-core.yml
@@ -8,7 +8,7 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
diff --git a/antora/playbooks/site-extensions.yml b/antora/playbooks/site-extensions.yml
index b77cc2b..7c35b3a 100644
--- a/antora/playbooks/site-extensions.yml
+++ b/antora/playbooks/site-extensions.yml
@@ -8,7 +8,7 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
# extensions
diff --git a/antora/playbooks/site-incubator.yml b/antora/playbooks/site-incubator.yml
index 60f1481..aa46eec 100644
--- a/antora/playbooks/site-incubator.yml
+++ b/antora/playbooks/site-incubator.yml
@@ -8,7 +8,7 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
diff --git a/antora/playbooks/site-legacy.yml b/antora/playbooks/site-legacy.yml
index 930161a..c29b308 100644
--- a/antora/playbooks/site-legacy.yml
+++ b/antora/playbooks/site-legacy.yml
@@ -8,7 +8,7 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
diff --git a/antora/playbooks/site-mappings.yml b/antora/playbooks/site-mappings.yml
index 7c53488..9632952 100644
--- a/antora/playbooks/site-mappings.yml
+++ b/antora/playbooks/site-mappings.yml
@@ -8,7 +8,7 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
diff --git a/antora/playbooks/site-persistence.yml b/antora/playbooks/site-persistence.yml
index 6516193..332f0b6 100644
--- a/antora/playbooks/site-persistence.yml
+++ b/antora/playbooks/site-persistence.yml
@@ -8,7 +8,7 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
# persistence
diff --git a/antora/playbooks/site-refguide.yml b/antora/playbooks/site-refguide.yml
index dc1ee5b..6399ed4 100644
--- a/antora/playbooks/site-refguide.yml
+++ b/antora/playbooks/site-refguide.yml
@@ -8,7 +8,7 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
diff --git a/antora/playbooks/site-persistence.yml b/antora/playbooks/site-relnotes.yml
similarity index 89%
copy from antora/playbooks/site-persistence.yml
copy to antora/playbooks/site-relnotes.yml
index 6516193..5cc0084 100644
--- a/antora/playbooks/site-persistence.yml
+++ b/antora/playbooks/site-relnotes.yml
@@ -8,15 +8,15 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
-
-# persistence
- url: .
- start_path: persistence/jdo/adoc # pjdo
+ start_path: antora/components/relnotes # relnotes
branches: HEAD
+
+
ui:
bundle:
url: ../isis-antora/build/ui-bundle.zip
diff --git a/antora/playbooks/site-security.yml b/antora/playbooks/site-security.yml
index b20ab99..640743d 100644
--- a/antora/playbooks/site-security.yml
+++ b/antora/playbooks/site-security.yml
@@ -8,7 +8,7 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
diff --git a/antora/playbooks/site-persistence.yml b/antora/playbooks/site-setupguide.yml
similarity index 88%
copy from antora/playbooks/site-persistence.yml
copy to antora/playbooks/site-setupguide.yml
index 6516193..0526cbe 100644
--- a/antora/playbooks/site-persistence.yml
+++ b/antora/playbooks/site-setupguide.yml
@@ -8,12 +8,10 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
-
-# persistence
- url: .
- start_path: persistence/jdo/adoc # pjdo
+ start_path: antora/components/setupguide # setupguide
branches: HEAD
diff --git a/antora/playbooks/site-starters.yml b/antora/playbooks/site-starters.yml
index d21da76..276e313 100644
--- a/antora/playbooks/site-starters.yml
+++ b/antora/playbooks/site-starters.yml
@@ -8,7 +8,7 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
# mavendeps
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index 0567174..70b0c9c 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -8,7 +8,7 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
diff --git a/antora/playbooks/site-testing.yml b/antora/playbooks/site-testing.yml
index 56b11d3..66c4d6b 100644
--- a/antora/playbooks/site-testing.yml
+++ b/antora/playbooks/site-testing.yml
@@ -8,7 +8,7 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
diff --git a/antora/playbooks/site-toc.yml b/antora/playbooks/site-toc.yml
index 673b85d..dcfff52 100644
--- a/antora/playbooks/site-toc.yml
+++ b/antora/playbooks/site-toc.yml
@@ -8,9 +8,11 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
+ branches: HEAD
+ - url: .
+ start_path: antora/redirects/guides # toc
branches: HEAD
-
ui:
diff --git a/antora/playbooks/site-userguide.yml b/antora/playbooks/site-userguide.yml
index fcfad06..9329a3a 100644
--- a/antora/playbooks/site-userguide.yml
+++ b/antora/playbooks/site-userguide.yml
@@ -8,7 +8,7 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
# api
@@ -18,7 +18,7 @@ content:
# extensions
- url: .
- start_path: extensions/core/flyway/adoc # refguide
+ start_path: extensions/core/flyway/adoc # userguide
branches: HEAD
diff --git a/antora/playbooks/site-valuetypes.yml b/antora/playbooks/site-valuetypes.yml
index 7f172c0..3901c24 100644
--- a/antora/playbooks/site-valuetypes.yml
+++ b/antora/playbooks/site-valuetypes.yml
@@ -8,7 +8,7 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
diff --git a/antora/playbooks/site-vro.yml b/antora/playbooks/site-vro.yml
index 2426f19..5f9eec6 100644
--- a/antora/playbooks/site-vro.yml
+++ b/antora/playbooks/site-vro.yml
@@ -8,7 +8,7 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
# extensions
diff --git a/antora/playbooks/site-vw.yml b/antora/playbooks/site-vw.yml
index 55a4bde..9695e5b 100644
--- a/antora/playbooks/site-vw.yml
+++ b/antora/playbooks/site-vw.yml
@@ -8,7 +8,7 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
branches: HEAD
# extensions
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 3726fb8..71df9ab 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -8,7 +8,22 @@ content:
# antora
- url: .
- start_path: antora/toc # toc
+ start_path: antora/components/toc # toc
+ branches: HEAD
+ - url: .
+ start_path: antora/components/comguide # comguide
+ branches: HEAD
+ - url: .
+ start_path: antora/components/conguide # conguide
+ branches: HEAD
+ - url: .
+ start_path: antora/components/relnotes # relnotes
+ branches: HEAD
+ - url: .
+ start_path: antora/components/setupguide # setupguide
+ branches: HEAD
+ - url: .
+ start_path: antora/redirects/guides # toc
branches: HEAD
diff --git a/antora/toc/antora.yml b/antora/redirects/guides/antora.yml
similarity index 62%
rename from antora/toc/antora.yml
rename to antora/redirects/guides/antora.yml
index 76c1eaa..85593c3 100644
--- a/antora/toc/antora.yml
+++ b/antora/redirects/guides/antora.yml
@@ -1,5 +1,5 @@
-name: toc
-title: " "
+name: guides
+title: "Guides (redirecting)"
version: master
start_page: ROOT:about.adoc
nav:
diff --git a/antora/redirects/guides/modules/ROOT/nav.adoc b/antora/redirects/guides/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..08f35ec
--- /dev/null
+++ b/antora/redirects/guides/modules/ROOT/nav.adoc
@@ -0,0 +1 @@
+* xref:guides:ROOT:about.adoc[]
diff --git a/antora/_component-template/modules/ROOT/pages/about.adoc b/antora/redirects/guides/modules/ROOT/pages/about.adoc
similarity index 93%
copy from antora/_component-template/modules/ROOT/pages/about.adoc
copy to antora/redirects/guides/modules/ROOT/pages/about.adoc
index 163a7df..75c2788 100644
--- a/antora/_component-template/modules/ROOT/pages/about.adoc
+++ b/antora/redirects/guides/modules/ROOT/pages/about.adoc
@@ -1,5 +1,4 @@
-= About
+= Redirects
:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or ag [...]
-:page-role: -toc -title
-
+:page-aliases: xref:toc:ROOT:about.adoc
diff --git a/antora/redirects/guides/modules/ugvro/nav.adoc b/antora/redirects/guides/modules/ugvro/nav.adoc
new file mode 100644
index 0000000..498244d
--- /dev/null
+++ b/antora/redirects/guides/modules/ugvro/nav.adoc
@@ -0,0 +1,3 @@
+* xref:guides:ugvro:ugvro.adoc[]
+
+
diff --git a/antora/_component-template/modules/ROOT/pages/about.adoc b/antora/redirects/guides/modules/ugvro/pages/ugvro.adoc
similarity index 92%
copy from antora/_component-template/modules/ROOT/pages/about.adoc
copy to antora/redirects/guides/modules/ugvro/pages/ugvro.adoc
index 163a7df..717d84e 100644
--- a/antora/_component-template/modules/ROOT/pages/about.adoc
+++ b/antora/redirects/guides/modules/ugvro/pages/ugvro.adoc
@@ -1,5 +1,5 @@
-= About
+= Restful Objects Viewer
:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or ag [...]
-:page-role: -toc -title
+:page-aliases: xref:vro:ROOT:about.adoc
diff --git a/antora/redirects/guides/modules/ugvw/nav.adoc b/antora/redirects/guides/modules/ugvw/nav.adoc
new file mode 100644
index 0000000..1538b85
--- /dev/null
+++ b/antora/redirects/guides/modules/ugvw/nav.adoc
@@ -0,0 +1 @@
+* xref:guides:ugvw:ugvw.adoc[]
diff --git a/antora/_component-template/modules/ROOT/pages/about.adoc b/antora/redirects/guides/modules/ugvw/pages/ugvw.adoc
similarity index 93%
rename from antora/_component-template/modules/ROOT/pages/about.adoc
rename to antora/redirects/guides/modules/ugvw/pages/ugvw.adoc
index 163a7df..9a6dcb6 100644
--- a/antora/_component-template/modules/ROOT/pages/about.adoc
+++ b/antora/redirects/guides/modules/ugvw/pages/ugvw.adoc
@@ -1,5 +1,5 @@
-= About
+= Wicket Viewer
:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or ag [...]
-:page-role: -toc -title
+:page-aliases: xref:vw:ROOT:about.adoc
diff --git a/antora/supplemental-ui/css/home/style.css b/antora/supplemental-ui/css/home/style.css
index 0c3437c..6eacd07 100644
--- a/antora/supplemental-ui/css/home/style.css
+++ b/antora/supplemental-ui/css/home/style.css
@@ -8,6 +8,19 @@
/*--------------------------------------------------------------
# General
--------------------------------------------------------------*/
+:root {
+ /* colors */
+ --color-theme-green-original: #50d8af;
+
+ --color-isis-red: #af3734;
+ --color-isis-orange: #f3882a;
+ --color-isis-green: #87a83f;
+ --color-isis-blue: #3c76bd;
+ --color-dark-blue: #0c2e8a;
+
+ --color-theme-blue: var(--color-dark-blue);
+ --color-theme-green: var(--color-isis-green);
+}
body {
background: #fff;
@@ -16,7 +29,7 @@ body {
}
a {
- color: #50d8af;
+ color: var(--color-theme-green);
transition: 0.5s;
}
@@ -50,7 +63,7 @@ h6 {
.back-to-top {
position: fixed;
display: none;
- background: #50d8af;
+ background: var(--color-theme-green);
color: #fff;
padding: 6px 12px 9px 12px;
font-size: 16px;
@@ -61,13 +74,13 @@ h6 {
}
.back-to-top:focus {
- background: #50d8af;
+ background: var(--color-theme-green);
color: #fff;
outline: none;
}
.back-to-top:hover {
- background: #0c2e8a;
+ background: var(--color-theme-blue);
color: #fff;
}
@@ -88,11 +101,11 @@ h6 {
}
#topbar .contact-info a:hover {
- color: #50d8af;
+ color: var(--color-theme-green);
}
#topbar .contact-info i {
- color: #50d8af;
+ color: var(--color-theme-green);
padding: 4px;
}
@@ -111,7 +124,7 @@ h6 {
}
#topbar .social-links a:hover {
- color: #50d8af;
+ color: var(--color-theme-green);
}
#topbar .social-links a:first-child {
@@ -141,14 +154,14 @@ h6 {
}
#header #logo h1 a {
- color: #0c2e8a;
+ color: var(--color-theme-blue);
line-height: 1;
display: inline-block;
font-size: smaller;
}
#header #logo h1 a span {
- color: #50d8af;
+ color: var(--color-theme-green);
}
#header #logo img {
@@ -199,14 +212,14 @@ h6 {
}
#intro .intro-content h2 {
- color: #0c2e8a;
+ color: var(--color-theme-blue);
margin-bottom: 30px;
font-size: 64px;
font-weight: 700;
}
#intro .intro-content h2 span {
- color: #50d8af;
+ color: var(--color-theme-green);
text-decoration: underline;
}
@@ -225,23 +238,23 @@ h6 {
}
#intro .intro-content .btn-get-started {
- background: #0c2e8a;
- border: 2px solid #0c2e8a;
+ background: var(--color-theme-blue);
+ border: 2px solid var(--color-theme-blue);
}
#intro .intro-content .btn-get-started:hover {
background: none;
- color: #0c2e8a;
+ color: var(--color-theme-blue);
}
#intro .intro-content .btn-projects {
- background: #50d8af;
- border: 2px solid #50d8af;
+ background: var(--color-theme-green);
+ border: 2px solid var(--color-theme-green);
}
#intro .intro-content .btn-projects:hover {
background: none;
- color: #50d8af;
+ color: var(--color-theme-green);
}
#intro #intro-carousel {
@@ -355,7 +368,7 @@ h6 {
.nav-menu li:hover > a,
.nav-menu .menu-active > a {
- color: #50d8af;
+ color: var(--color-theme-green);
}
.nav-menu > li {
@@ -383,7 +396,7 @@ h6 {
}
.nav-menu ul li:hover > a {
- color: #50d8af;
+ color: var(--color-theme-green);
}
.nav-menu ul ul {
@@ -466,11 +479,11 @@ h6 {
}
#mobile-nav ul .menu-has-children i.fa-chevron-up {
- color: #50d8af;
+ color: var(--color-theme-green);
}
#mobile-nav ul .menu-item-active {
- color: #50d8af;
+ color: var(--color-theme-green);
}
#mobile-body-overly {
@@ -511,7 +524,7 @@ body.mobile-nav-active #mobile-nav-toggle {
.section-header h2 {
font-size: 32px;
- color: #0c2e8a;
+ color: var(--color-theme-blue);
text-transform: uppercase;
font-weight: 700;
position: relative;
@@ -524,7 +537,7 @@ body.mobile-nav-active #mobile-nav-toggle {
display: block;
width: 50px;
height: 3px;
- background: #50d8af;
+ background: var(--color-theme-green);
bottom: 0;
left: 0;
}
@@ -551,7 +564,7 @@ body.mobile-nav-active #mobile-nav-toggle {
}
#why .content h2 {
- color: #0c2e8a;
+ color: var(--color-theme-blue);
font-weight: 700;
font-size: 36px;
font-family: "Raleway", sans-serif;
@@ -576,7 +589,7 @@ body.mobile-nav-active #mobile-nav-toggle {
#why .content i {
font-size: 20px;
padding-right: 4px;
- color: #50d8af;
+ color: var(--color-theme-green);
}
#why .content ul {
@@ -630,8 +643,8 @@ body.mobile-nav-active #mobile-nav-toggle {
}
#services .box .icon i:before {
- background: #0c2e8a;
- background: linear-gradient(45deg, #50d8af 0%, #a3ebd5 100%);
+ background: var(--color-theme-blue);
+ background: linear-gradient(45deg, var(--color-theme-green) 0%, #a3ebd5 100%);
background-clip: border-box;
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
@@ -689,7 +702,7 @@ body.mobile-nav-active #mobile-nav-toggle {
}
#clients .owl-dot.active {
- background-color: #50d8af;
+ background-color: var(--color-theme-green);
}
/* Our Portfolio Section
@@ -824,7 +837,7 @@ body.mobile-nav-active #mobile-nav-toggle {
}
#testimonials .owl-dot.active {
- background-color: #50d8af;
+ background-color: var(--color-theme-green);
}
/* Call To Action Section
@@ -861,8 +874,8 @@ body.mobile-nav-active #mobile-nav-toggle {
}
#call-to-action .cta-btn:hover {
- background: #50d8af;
- border: 3px solid #50d8af;
+ background: var(--color-theme-green);
+ border: 3px solid var(--color-theme-green);
}
/* Our Team Section
@@ -888,7 +901,7 @@ body.mobile-nav-active #mobile-nav-toggle {
}
#team .member .details {
- background: #50d8af;
+ background: var(--color-theme-green);
color: #fff;
padding: 15px;
border-radius: 0 0 3px 3px;
@@ -935,7 +948,7 @@ body.mobile-nav-active #mobile-nav-toggle {
font-size: 48px;
display: inline-block;
margin-bottom: 10px;
- color: #50d8af;
+ color: var(--color-theme-green);
}
#contact .contact-info address,
@@ -957,7 +970,7 @@ body.mobile-nav-active #mobile-nav-toggle {
}
#contact .contact-info a:hover {
- color: #50d8af;
+ color: var(--color-theme-green);
}
#contact .contact-address,
@@ -972,8 +985,8 @@ body.mobile-nav-active #mobile-nav-toggle {
}
#contact .form #sendmessage {
- color: #50d8af;
- border: 1px solid #50d8af;
+ color: var(--color-theme-green);
+ border: 1px solid var(--color-theme-green);
display: none;
text-align: center;
padding: 15px;
@@ -1014,7 +1027,7 @@ body.mobile-nav-active #mobile-nav-toggle {
}
#contact .form button[type="submit"] {
- background: #50d8af;
+ background: var(--color-theme-green);
border: 0;
border-radius: 3px;
padding: 10px 30px;
@@ -1049,7 +1062,7 @@ body.mobile-nav-active #mobile-nav-toggle {
}
#footer .credits a {
- color: #0c2e8a;
+ color: var(--color-theme-blue);
}
@media (min-width: 768px) {
diff --git a/antora/supplemental-ui/support.html b/antora/supplemental-ui/support.html
new file mode 100644
index 0000000..ced5cef
--- /dev/null
+++ b/antora/supplemental-ui/support.html
@@ -0,0 +1,9 @@
+<html>
+<head>
+ <meta http-equiv="refresh" content="0;url=http:///toc/support/mailing-list.html" />
+ <title>Page Moved</title>
+</head>
+<body>
+This page has moved. Click <a href="http:///toc/support/mailing-list.html">here</a> to go to the new page.
+</body>
+</html>
\ No newline at end of file
diff --git a/antora/toc/modules/ROOT/nav.adoc b/antora/toc/modules/ROOT/nav.adoc
deleted file mode 100644
index c00c4ed..0000000
--- a/antora/toc/modules/ROOT/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-include::toc:ROOT:partial$component-nav.adoc[]
\ No newline at end of file
diff --git a/antora/toc/modules/ROOT/partials/component-nav.adoc b/antora/toc/modules/ROOT/partials/component-nav.adoc
deleted file mode 100644
index 19a4fe0..0000000
--- a/antora/toc/modules/ROOT/partials/component-nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-include::toc:ROOT:partial$module-nav.adoc[]
-
diff --git a/antora/toc/modules/ROOT/partials/module-nav.adoc b/antora/toc/modules/ROOT/partials/module-nav.adoc
deleted file mode 100644
index 09a717e..0000000
--- a/antora/toc/modules/ROOT/partials/module-nav.adoc
+++ /dev/null
@@ -1,98 +0,0 @@
-* What is Apache Isis?
-** xref:what-is-apache-isis/isis-in-pictures.adoc[Apache Isis in pictures]
-** xref:what-is-apache-isis/common-use-cases.adoc[Common Use Cases]
-** xref:what-is-apache-isis/screencasts.adoc[Screencasts]
-// ** xref:what-is-apache-isis/powered-by.adoc[Powered By]
-
-
-* Starter Apps
-
-** xref:starters:helloworld:about.adoc[HelloWorld]
-** xref:starters:simpleapp:about.adoc[SimpleApp]
-
-** Resources
-*** xref:starters:parent-pom:about.adoc[Parent POM]
-*** xref:starters:mavendeps:about.adoc[Aggregator POMs]
-
-
-* Demos & Tutorials
-
-** xref:demoapp:ROOT:about.adoc[Demo App]
-** link:https://danhaywood.gitlab.io/isis-petclinic-tutorial-docs/petclinic/1.16.2/intro.html[Petclinic (tutorial)]
-
-
-* Guides
-
-** Core
-*** xref:userguide:ROOT:about.adoc[User Guide]
-*** xref:refguide:ROOT:about.adoc[Reference Guide]
-
-** Development
-*** xref:toc:devguide:about.adoc[Developers' Guide]
-*** xref:testing:ROOT:about.adoc[Testing Guide]
-
-** Libraries
-
-*** xref:subdomains:ROOT:about.adoc[Subdomain Libraries]
-*** xref:valuetypes:ROOT:about.adoc[Value Types]
-*** xref:mappings:ROOT:about.adoc[Bounded Context Mapping Libraries]
-
-
-
-
-
-* Components
-
-** Viewers
-*** xref:vw:ROOT:about.adoc[Wicket UI]
-*** xref:vro:ROOT:about.adoc[Restful Objects (REST API)]
-
-** Security
-
-*** xref:security:ROOT:about.adoc[Security Guide]
-
-** Persistence
-
-*** xref:pjdo:ROOT:about.adoc[DataNucleus (JDO)]
-
-** Extensions
-
-*** xref:extensions:ROOT:about.adoc[Extensions Catalog]
-
-
-
-* Support
-
-** xref:toc:ROOT:support/slack-channel.adoc[Slack]
-** xref:toc:ROOT:support/mailing-list.adoc[Mailing Lists]
-** link:https://issues.apache.org/jira/secure/RapidBoard.jspa?rapidView=87[ASF JIRA]
-** link:http://stackoverflow.com/questions/tagged/isis[Stack Overflow]
-
-
-* Releases
-
-** xref:toc:ROOT:downloads/how-to.adoc[Downloads]
-** xref:toc:relnotes:about.adoc[Release Notes]
-** xref:toc:mignotes:about.adoc[Migration Notes]
-
-
-** Nightly Builds (not ASF)
-
-*** link:https://github.com/apache-isis-committers/isis-nightly[CI]
-*** link:https://repo.incode.cloud/[Maven Repo]
-*** link:https://apache-isis-committers.github.io/isis-nightly/toc/about.html[Website preview]
-
-
-* Internal
-
-** xref:toc:comguide:about.adoc[Committers' Guide]
-*** xref:toc:comguide:about.adoc#cutting-a-release[Cutting a Release]
-*** xref:toc:comguide:about.adoc#verifying-releases[Verifying a Release]
-
-** xref:core:ROOT:about.adoc[Core Design]
-** xref:more-thanks/more-thanks.adoc[Acknowledgements]
-
-** More Libraries
-*** xref:incubator:ROOT:about.adoc[Incubator]
-*** xref:legacy:ROOT:about.adoc[Legacy]
-
diff --git a/antora/toc/modules/comguide/nav.adoc b/antora/toc/modules/comguide/nav.adoc
deleted file mode 100644
index 567a472..0000000
--- a/antora/toc/modules/comguide/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-// unused - referenced directly by toc/nav.adoc
\ No newline at end of file
diff --git a/antora/toc/modules/devguide/attachments/eclipse/isis.importorder b/antora/toc/modules/devguide/attachments/eclipse/isis.importorder
deleted file mode 100644
index 8603f7f..0000000
--- a/antora/toc/modules/devguide/attachments/eclipse/isis.importorder
+++ /dev/null
@@ -1,7 +0,0 @@
-#Organize Import Order
-#Wed Dec 15 15:36:51 GMT 2010
-0=java
-1=javax
-2=com
-3=org
-4=org.apache.isis
diff --git a/antora/toc/modules/devguide/attachments/resources/IsisCheatSheet.docx b/antora/toc/modules/devguide/attachments/resources/IsisCheatSheet.docx
deleted file mode 100644
index 003f616..0000000
Binary files a/antora/toc/modules/devguide/attachments/resources/IsisCheatSheet.docx and /dev/null differ
diff --git a/antora/toc/modules/devguide/attachments/resources/IsisCheatSheet.pdf b/antora/toc/modules/devguide/attachments/resources/IsisCheatSheet.pdf
deleted file mode 100644
index f0d6b1b..0000000
Binary files a/antora/toc/modules/devguide/attachments/resources/IsisCheatSheet.pdf and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/010-installing/010-welcome-page.png b/antora/toc/modules/devguide/images/intellij-idea/010-installing/010-welcome-page.png
deleted file mode 100644
index 24fbed3..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/010-installing/010-welcome-page.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/010-installing/020-choose-location.png b/antora/toc/modules/devguide/images/intellij-idea/010-installing/020-choose-location.png
deleted file mode 100644
index 1d0cb46..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/010-installing/020-choose-location.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/010-installing/030-installation-options.png b/antora/toc/modules/devguide/images/intellij-idea/010-installing/030-installation-options.png
deleted file mode 100644
index 01fbe56..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/010-installing/030-installation-options.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/010-installing/040-start-menu-folder.png b/antora/toc/modules/devguide/images/intellij-idea/010-installing/040-start-menu-folder.png
deleted file mode 100644
index dc850cc..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/010-installing/040-start-menu-folder.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/010-installing/050-completing.png b/antora/toc/modules/devguide/images/intellij-idea/010-installing/050-completing.png
deleted file mode 100644
index 7b80e17..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/010-installing/050-completing.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/010-installing/060-import-settings-or-not.png b/antora/toc/modules/devguide/images/intellij-idea/010-installing/060-import-settings-or-not.png
deleted file mode 100644
index 0054c4c..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/010-installing/060-import-settings-or-not.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/010-installing/070-set-ui-theme.png b/antora/toc/modules/devguide/images/intellij-idea/010-installing/070-set-ui-theme.png
deleted file mode 100644
index 247fc64..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/010-installing/070-set-ui-theme.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/010-new-project-create.png b/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/010-new-project-create.png
deleted file mode 100644
index a950887..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/010-new-project-create.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png b/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png
deleted file mode 100644
index 16fe8d1..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/030-java-project-select-jdk.png b/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/030-java-project-select-jdk.png
deleted file mode 100644
index d0214c6..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/030-java-project-select-jdk.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/040-sdk-selected.png b/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/040-sdk-selected.png
deleted file mode 100644
index b9399d6..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/040-sdk-selected.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/050-name-and-location.png b/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/050-name-and-location.png
deleted file mode 100644
index 7f3b8d6..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/050-name-and-location.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/060-create-dir.png b/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/060-create-dir.png
deleted file mode 100644
index 287478a..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/020-create-new-project/060-create-dir.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png b/antora/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png
deleted file mode 100644
index b383b3c..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/010-build-automatically.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png b/antora/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png
deleted file mode 100644
index 7618a4d..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/010-maven-installation.png b/antora/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/010-maven-installation.png
deleted file mode 100644
index 9fef693..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/010-maven-installation.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png b/antora/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png
deleted file mode 100644
index 945968d..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/042-other-settings-maven/020-maven-configuration.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/044-other-settings-misc/010-auto-import.png b/antora/toc/modules/devguide/images/intellij-idea/044-other-settings-misc/010-auto-import.png
deleted file mode 100644
index 293d2c3..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/044-other-settings-misc/010-auto-import.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/010-run-configuration.png b/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/010-run-configuration.png
deleted file mode 100644
index 0c6a929..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/010-run-configuration.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png b/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png
deleted file mode 100644
index 2dae157..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/030-running-unit-tests.png b/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/030-running-unit-tests.png
deleted file mode 100644
index b4e042a..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/030-running-unit-tests.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png b/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png
deleted file mode 100644
index 83a4a70..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png b/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png
deleted file mode 100644
index 6b0ad89..0000000
Binary files a/antora/toc/modules/devguide/images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/images/layouts/estatio-Lease.png b/antora/toc/modules/devguide/images/layouts/estatio-Lease.png
deleted file mode 100644
index e80ecb2..0000000
Binary files a/antora/toc/modules/devguide/images/layouts/estatio-Lease.png and /dev/null differ
diff --git a/antora/toc/modules/devguide/nav.adoc b/antora/toc/modules/devguide/nav.adoc
deleted file mode 100644
index 567a472..0000000
--- a/antora/toc/modules/devguide/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-// unused - referenced directly by toc/nav.adoc
\ No newline at end of file
diff --git a/antora/toc/modules/devguide/pages/about.adoc b/antora/toc/modules/devguide/pages/about.adoc
deleted file mode 100644
index 37795ec..0000000
--- a/antora/toc/modules/devguide/pages/about.adoc
+++ /dev/null
@@ -1,32 +0,0 @@
-= Developers' Guide
-
-This guide provides guidance to anyone in the community wanting to contribute to Apache Isis' ongoing development.
-
-
-include::ide.adoc[leveloffset=+1]
-include::ide/intellij.adoc[leveloffset=+2]
-include::ide/eclipse.adoc[leveloffset=+2]
-
-include::hints-and-tips.adoc[leveloffset=+1]
-include::hints-and-tips/datanucleus-enhancer.adoc[leveloffset=+2]
-include::hints-and-tips/enabling-logging.adoc[leveloffset=+2]
-include::hints-and-tips/enhance-only.adoc[leveloffset=+2]
-include::hints-and-tips/how-run-fixtures-on-app-startup.adoc[leveloffset=+2]
-
-include::building-apache-isis.adoc[leveloffset=+1]
-include::building-docs-and-website.adoc[leveloffset=+1]
-
-include::contributing.adoc[leveloffset=+1]
-
-include::git-cookbook.adoc[leveloffset=+1]
-
-include::working-with-many-repos.adoc[leveloffset=+1]
-
-include::asciidoc-syntax.adoc[leveloffset=+1]
-
-include::project-lombok.adoc[leveloffset=+1]
-
-include::agilej.adoc[leveloffset=+1]
-
-include::resources/cheat-sheet.adoc[leveloffset=+1]
-include::resources/icons.adoc[leveloffset=+1]
diff --git a/antora/toc/modules/devguide/pages/ide/intellij.adoc b/antora/toc/modules/devguide/pages/ide/intellij.adoc
deleted file mode 100644
index c73e8e6..0000000
--- a/antora/toc/modules/devguide/pages/ide/intellij.adoc
+++ /dev/null
@@ -1,663 +0,0 @@
-[[intellij]]
-= Developing using IntelliJ IDEA
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-:page-partial:
-
-[NOTE]
-====
-This material does not constitute an endorsement; JetBrains is not affiliated to Apache Software Foundation in any way.
-JetBrains does however provide complimentary copies of the IntelliJ IDE to Apache committers.
-====
-
-This section describes how to install and setup JetBrains' IntelliJ IDEA, then how to import an application into IntelliJ and run it.
-
-== Installing and Setting up
-
-This section covers installation and setup.
-These notes/screenshots were prepared using IntelliJ Community Edition 14.1.x, but are believed to be compatible with more recent versions/other editions of the IDE.
-
-=== Download and Install
-
-https://www.jetbrains.com/idea/download/[Download] latest version of IntelliJ Community Edition, and install:
-
-Start the wizard, click through the welcome page:
-
-.IntelliJ Installation Wizard - Welcome page
-image::intellij-idea/010-installing/010-welcome-page.png[width="400px",link="{imagesdir}/intellij-idea/010-installing/010-welcome-page.png"]
-
-Choose the location to install the IDE:
-
-.IntelliJ Installation Wizard - Choose Location
-image::intellij-idea/010-installing/020-choose-location.png[width="400px",link="{imagesdir}/intellij-idea/010-installing/020-choose-location.png"]
-
-Adjust any installation options as you prefer:
-
-.IntelliJ Installation Wizard - Installation Options
-image::intellij-idea/010-installing/030-installation-options.png[width="400px",link="{imagesdir}/intellij-idea/010-installing/030-installation-options.png"]
-
-and the start menu:
-
-.IntelliJ Installation Wizard - Start Menu Folder
-image::intellij-idea/010-installing/040-start-menu-folder.png[width="400px",link="{imagesdir}/intellij-idea/010-installing/040-start-menu-folder.png"]
-
-and finish up the wizard:
-
-.IntelliJ Installation Wizard - Completing the Wizard
-image::intellij-idea/010-installing/050-completing.png[width="400px",link="{imagesdir}/intellij-idea/010-installing/050-completing.png"]
-
-Later on we'll specify the Apache Isis/ASF code style settings, so for now select `I do not want to import settings`:
-
-.IntelliJ Installation Wizard - Import Settings
-image::intellij-idea/010-installing/060-import-settings-or-not.png[width="400px",link="{imagesdir}/intellij-idea/010-installing/060-import-settings-or-not.png"]
-
-Finally, if you are a trendy hipster, set the UI theme to Darcula:
-
-.IntelliJ Installation Wizard Set UI Theme
-image::intellij-idea/010-installing/070-set-ui-theme.png[width="600px",link="{imagesdir}/intellij-idea/010-installing/070-set-ui-theme.png"]
-
-=== New Project
-
-In IntelliJ a project can contain multiple modules; these need not be physically located together.
-(If you are previously an Eclipse user, you can think of it as similar to an Eclipse workspace).
-
-Start off by creating a new project:
-
-.IntelliJ Create New Project
-image::intellij-idea/020-create-new-project/010-new-project-create.png[width="400px",link="{imagesdir}/intellij-idea/020-create-new-project/010-new-project-create.png"]
-
-
-We want to create a new *Java* project:
-
-.IntelliJ Create New Project - Create a Java project
-image::intellij-idea/020-create-new-project/020-java-project-setup-jdk.png[width="500px",link="{imagesdir}/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png"]
-
-We therefore need to specify the JDK. Apache Isis supports both Java 7 and Java 8.
-
-
-.IntelliJ Create New Java Project - Select the JDK
-image::intellij-idea/020-create-new-project/030-java-project-select-jdk.png[width="250px",link="{imagesdir}/intellij-idea/020-create-new-project/030-java-project-select-jdk.png"]
-
-
-Specify the directory containing the JDK:
-
-.IntelliJ Create New Project - Select the JDK location
-image::intellij-idea/020-create-new-project/050-name-and-location.png[width="400px",link="{imagesdir}/intellij-idea/020-create-new-project/050-name-and-location.png"]
-
-
-Finally allow IntelliJ to create the directory for the new project:
-
-.IntelliJ Create New Project
-image::intellij-idea/020-create-new-project/060-create-dir.png[width="250px",link="{imagesdir}/intellij-idea/020-create-new-project/060-create-dir.png"]
-
-=== File templates
-
-Next we recommend you import a set of standard file templates.
-These are used to create new classes or supporting files:
-
-.File templates
-image::intellij-idea/030-import-settings/040-file-templates.png[width="400px",link="{imagesdir}/intellij-idea/030-import-settings/040-file-templates.png"]
-
-The file templates are provided as a settings JAR file, namely *link:{attachmentsdir}/intellij/isis-settings-file-templates.jar[isis-settings-file-templates.jar]*.
-Download this file.
-
-Next, import using `File > Import Settings`, specifying the directory that you have downloaded the file to:
-
-.IntelliJ Import Settings - Specify JAR file
-image::intellij-idea/030-import-settings/010-settings-import-jar.png[width="400px",link="{imagesdir}/intellij-idea/030-import-settings/010-settings-import-jar.png"]
-
-Select all the categories (there should just be one), and hit OK. then hit restart.
-
-[WARNING]
-====
-If importing into IntelliJ 2017.2.3 two categories are shown - "File templates" and "File templates (schemes)".
-Select all the categories.
-
-Apparently no categories are shown if importing into IntelliJ 2016.1.1 Community Edition (and perhaps other 2016 versions).
-The file does import ok into IntelliJ 15.0.x, so we think this is a bug in the 2016 version.
-
-The workaround is to extract the `.jar` file locally and copy the files into IntelliJ's `config` directory, somewhere in your home directory:
-
-* Windows `<User home>\.IdeaIC2016\config`
-* Linux `~/..IdeaIC2016/config`
-* Mac OS `~/Library/Preferences/IdeaIC2016`
-
-====
-
-=== Live templates
-
-We also recommend you import a set of live templates.
-These are used to add new methods to existing classes:
-
-.Live templates
-image::intellij-idea/030-import-settings/050-live-templates.png[width="600px",link="{imagesdir}/intellij-idea/030-import-settings/050-live-templates.png"]
-
-The live templates have a prefix of either:
-
-* `is` : for Apache Isis domain objects
-* `ju` : for JUnit tests
-* `jm` : for JMock mocks or libraries
-
-The live templates are also provided as a settings JAR file, namely *link:{attachmentsdir}/resources/intellij/isis-settings-live-templates.jar[isis-settings-live-templates.jar]*.
-Download and import (as for the previous settings JAR files).
-
-=== Coding Standards
-
-Next, we suggest you import settings for standard ASF/Apache Isis coding conventions.
-This file is also provided as a settings file, namely *link:{attachmentsdir}/intellij/isis-settings-code-style.jar[isis-settings-code-style.jar]*.
-Download and import (as for the above settings JAR files).
-
-=== Other Settings (Compiler)
-
-There are also some other settings that influence the compiler.
-We highly recommend you set these.
-
-On the *Compiler* Settings page, ensure that `build automatically` is enabled (and optionally `compile independent modules in parallel`):
-
-.IntelliJ Compiler Settings
-image::intellij-idea/040-other-settings-compiler/010-build-automatically.png[width="700px",link="{imagesdir}/intellij-idea/040-other-settings-compiler/010-build-automatically.png"]
-
-
-On the *Annotation Processors* page, enable and adjust for the 'default' setting:
-
-.IntelliJ Annotation Processor Settings
-image::intellij-idea/040-other-settings-compiler/020-annotation-processor.png[width="700px",link="{imagesdir}/intellij-idea/040-other-settings-compiler/020-annotation-processor.png"]
-
-This setting enables the generation of the `Q*` classes for DataNucleus type-safe queries, as well as being required for frameworks such as xref:toc:devguide:project-lombok.adoc[Project Lombok].
-
-[NOTE]
-====
-IntelliJ may also have inferred these settings for specific projects/modules when importing; review the list on the left to see if the default is overridden and fix/delete as required.
-====
-
-=== Other Settings (Maven)
-
-There are also some other settings for Maven that we recommend you adjust (though these are less critical):
-
-First, specify an up-to-date Maven installation, using `File > Settings` (or `IntelliJ > Preferences` if on MacOS):
-
-.IntelliJ Maven Settings - Installation
-image::intellij-idea/042-other-settings-maven/010-maven-installation.png[width="700px",link="{imagesdir}/intellij-idea/042-other-settings-maven/010-maven-installation.png"]
-
-Still on the Maven settings page, configure as follows:
-
-.IntelliJ Maven Settings - Configuration
-image::intellij-idea/042-other-settings-maven/020-maven-configuration.png[width="700px",link="{imagesdir}/intellij-idea/042-other-settings-maven/020-maven-configuration.png"]
-
-=== Other Settings (Misc)
-
-These settings are optional but also recommended.
-
-On the *auto import* page, check the `optimize imports on the fly` and `add unambiguous imports on the fly`
-
-.IntelliJ Maven Settings - Auto Import
-image::intellij-idea/044-other-settings-misc/010-auto-import.png[width="700px",link="{imagesdir}/intellij-idea/044-other-settings-misc/010-auto-import.png"]
-
-== Importing Maven Modules
-
-Let's load in some actual code!
-We do this by importing the Maven modules.
-
-First up, open up the Maven tool window (`View > Tool Windows > Maven Projects`).
-You can then use the 'plus' button to add Maven modules.
-In the screenshot you can see we've loaded in Apache Isis core; the modules are listed in the _Maven Projects_ window and corresponding (IntelliJ) modules are shown in the _Projects_ window:
-
-.IntelliJ Maven Module Management - Importing Maven modules
-image::intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png[width="730px",link="{imagesdir}/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png"]
-
-We can then import another module (from some other directory).
-For example, here we are importing the TodoApp example:
-
-
-.IntelliJ Maven Module Management - Importing another Module
-image::intellij-idea/100-maven-module-mgmt/020-adding-another-module.png[width="400px",link="{imagesdir}/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png"]
-
-You should then see the new Maven module loaded in the _Projects_ window and also the _Maven Projects_ window:
-
-.IntelliJ Maven Module Management -
-image::intellij-idea/100-maven-module-mgmt/030-other-module-added.png[width="730px",link="{imagesdir}/intellij-idea/100-maven-module-mgmt/030-other-module-added.png"]
-
-If any dependencies are already loaded in the project, then IntelliJ will automatically update the CLASSPATH to resolve to locally held modules (rather from `.m2/repository` folder).
-So, for example (assuming that the `<version>` is correct, of course), the Isis todoapp will have local dependencies on the Apache Isis core.
-
-You can press F4 (or use `File > Project Structure`) to see the resolved classpath for any of the modules loaded into the project.
-
-If you want to focus on one set of code (eg the Isis todoapp but not Apache Isis core) then you _could_ remove the module; but better is to ignore those modules.
-This will remove them from the _Projects_ window but keep them available in the _Maven Projects_ window for when you next want to work on them:
-
-.IntelliJ Maven Module Management - Ignoring Modules
-image::intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png[width="730px",link="{imagesdir}/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png"]
-
-Confirm that it's ok to ignore these modules:
-
-.IntelliJ Maven Module Management - Ignoring Modules (ctd)
-image::intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png[width="300px",link="{imagesdir}/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png"]
-
-All being well you should see that the _Projects_ window now only contains the code you are working on.
-Its classpath dependencies will be adjusted (eg to resolve to Apache Isis core from `.m2/repository`):
-
-.IntelliJ Maven Module Management - Updated Projects Window
-image::intellij-idea/100-maven-module-mgmt/060-ignored-modules.png[width="730px",link="{imagesdir}/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png"]
-
-== Running
-
-Let's see how to run both the app and the tests.
-
-=== Running the App
-
-Once you've imported your Apache Isis application, we should run it.
-We do this by creating a Run configuration, using `Run > Edit Configurations`.
-
-Set up the details as follows:
-
-.IntelliJ Running the App - Run Configuration
-image::intellij-idea/110-running-the-app/010-run-configuration.png[width="600px",link="{imagesdir}/intellij-idea/110-running-the-app/010-run-configuration.png"]
-
-We specify the `Main class` to be `org.apache.isis.WebServer`; this is a wrapper around Jetty.
-It's possible to pass program arguments to this (eg to automatically install fixtures), but for now leave this blank.
-
-Also note that `Use classpath of module` is the webapp module for your app, and that the `working directory` is `$MODULE_DIR$`.
-
-Next, and most importantly, configure the DataNucleus enhancer to run for your `dom` goal.
-This can be done by defining a Maven goal to run before the app:
-
-.IntelliJ Running the App - Datanucleus Enhancer Goal
-image::intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png[width="400px",link="{imagesdir}/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png"]
-
-The `-o` flag in the goal means run off-line; this will run faster.
-
-[WARNING]
-====
-If you forget to set up the enhancer goal, or don't run it on the correct (dom) module, then you will get all sorts of errors when you startup.
-These usually manifest themselves as class cast exception in DataNucleus.
-====
-
-You should now be able to run the app using `Run > Run Configuration`.
-The same configuration can also be used to debug the app if you so need.
-
-[TIP]
-====
-Under windows you may get 'Standard error from the DataNucleus tool + org.datanucleus.enhancer.DataNucleusEnhancer : The command line is too long' although 'fork=false' is set in pom.xml.
-Can be worked around via setting '-Dfork=false' before or after 'datanucleus:enhance -o'.
-====
-
-=== Running the Unit Tests
-
-The easiest way to run the unit tests is just to right click on the `dom` module in the _Project Window_, and choose run unit tests.
-Hopefully your tests will pass (!).
-
-.IntelliJ Running the App - Unit Tests Run Configuration
-image::intellij-idea/110-running-the-app/030-running-unit-tests.png[width="600px",link="{imagesdir}/intellij-idea/110-running-the-app/030-running-unit-tests.png"]
-
-As a side-effect, this will create a run configuration, very similar to the one we manually created for the main app:
-
-.IntelliJ Running the App - Unit Tests Run Configuration
-image::intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png[width="600px",link="{imagesdir}/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png"]
-
-Thereafter, you should run units by selecting this configuration (if you use the right click approach you'll end up with lots of run configurations, all similar).
-
-=== Running the Integration Tests
-
-Integration tests can be run in the same way as unit tests, however the `dom` module must also have been enhanced.
-
-One approach is to initially run the tests use the right click on the `integtests` module; the tests will fail because the code won't have been enhanced, but we can then go and update the run configuration to run the datanucleus enhancer goal (same as when running the application):
-
-.IntelliJ Running the App - Integration Tests Run Configuration
-image::intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png[width="600px",link="{imagesdir}/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png"]
-
-
-
-Also make sure that the `search for tests` radio button is set to `In single module`:
-
-image::intellij-idea/400-running-integtests/run-debug-configuration-single-module.png[width="600px",link="{imagesdir}/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png"]
-
-If this radio button is set to one of the other options then you may obtain class loading issues; these result from IntelliJ attempting to run unit tests of the `dom` project that depend on test classes in that module, but using the classpath of the `integtests` module whereby the `dom` test-classes (`test-jar` artifact) are not exposed on the Maven classpath.
-
-[[intellij-hints-and-tips]]
-== Hints and Tips
-
-=== Keyboard Cheat Sheets
-
-You can download 1-page PDFs cheat sheets for IntelliJ's keyboard shortcuts:
-* for link:https://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard.pdf[Windows]
-* for link:https://www.jetbrains.com/idea/docs/IntelliJIDEA_ReferenceCard_Mac.pdf[MacOS]
-
-Probably the most important shortcut on them is for `Find Action`:
-- `ctrl-shift-A` on Windows
-- `cmd-shift-A` on MacOS.
-
-This will let you search for any action just by typing its name.
-
-=== Switch between Tools & Editors
-
-The Tool Windows are the views around the editor (to left, bottom and right).
-It's possible to move these around to your preferred locations.
-
-* Use `alt-1` through `alt-9` (or `cmd-1` through `alt-9`) to select the tool windows
-** Press it twice and the tool window will hide itself; so can use to toggle
-* If in the _Project Window_ (say) and hit enter on a file, then it will be shown in the editor, but (conveniently) the focus remains in the tool window.
-To switch to the editor, just press `Esc`.
-** If in the _Terminal Window_, you'll need to press `Shift-Esc`.
-* If on the editor and want to locate the file in (say) the _Project Window_, use `alt-F1`.
-* To change the size of any tool window, use `ctrl-shift-arrow`
-
-Using these shortcuts you can easily toggle between the tool windows and the editor, without using the mouse.
-Peachy!
-
-=== Navigating Around
-
-For all of the following, you don't need to type every letter, typing "ab" will actually search for ".*a.*b.*".
-
-* to open classes or files or methods that you know the name of:
-** `ctrl-N` to open class
-** `ctrl-shift-N` to open a file
-** (bit fiddly this) `ctrl-shift-alt-N` to search for any symbol.
-* open up dialog of recent files: `ctrl-E`
-* search for any file: `shift-shift`
-
-Navigating around:
-
-* find callers of a method (the call hierarchy): `ctrl-alt-H`
-* find subclasses or overrides: `ctrl-alt-B`
-* find superclasses/interface/declaration: `ctrl-B`
-
-Viewing the structure (ie outline) of a class
-* `ctrl-F12` will pop-up a dialog showing all members
-** hit `ctrl-F12` again to also see inherited members
-
-=== Editing
-
-* Extend selection using `ctrl-W`
-** and contract it down again using `ctrl-shift-W`
-* to duplicate a line, it's `ctrl-D`
-** if you have some text selected (or even some lines), it'll actually duplicate the entire selection
-* to delete a line, it's `ctrl-X`
-* to move a line up or down: `shift-alt-up` and `shift-alt-down`
-** if you have selected several lines, it'll move them all togethe
-* `ctrl-shift-J` can be handy for joining lines together
-** just hit enter to split them apart (even in string quotes; IntelliJ will "do the right thing")
-
-=== Intentions and Code Completion
-
-Massively useful is the "Intentions" popup; IntelliJ tries to guess what you might want to do.
-You can activate this using`alt-enter`, whenever you see a lightbulb/tooltip in the margin of the current line.
-
-Code completion usually happens whenever you type '.'.
-You can also use `ctrl-space` to bring these up.
-
-In certain circumstances (eg in methods0) you can also type `ctrl-shift-space` to get a smart list of methods etc that you might want to call.
-Can be useful.
-
-Last, when invoking a method, use `ctrl-P` to see the parameter types.
-
-=== Refactoring
-
-Loads of good stuff on the `Refactor` menu; most used are:
-
-* Rename (`shift-F6`)
-* Extract
-** method: `ctrl-alt-M`
-** variable: `ctrl-alt-V`
-* Inline method/variable: `ctrl-alt-N`
-* Change signature
-
-If you can't remember all those shortcuts, just use `ctrl-shift-alt-T` (might want to rebind that to something else!) and get a context-sensitive list of refactorings available for the currently selected object
-
-=== Plugins
-
-You might want to set up some additional plugins.
-You can do this using `File > Settings > Plugins` (or equivalently `File > Other Settings > Configure Plugins`).
-
-Recommended are:
-
-* link:https://plugins.jetbrains.com/plugin/7179?pr=idea[Maven Helper] plugin
-+
-More on this below.
-
-* link:https://github.com/asciidoctor/asciidoctor-intellij-plugin[AsciiDoctor] plugin
-+
-Useful if you are doing any authoring of documents.
-
-Some others you might like to explore are:
-
-.IntelliJ Plugins
-image::intellij-idea/050-some-plugins/020-some-plugins-confirmation.png[width="600px",link="{imagesdir}/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png"]
-
-==== Maven Helper Plugin
-
-This plugin provides a couple of great features.
-One is better visualization of dependency trees (similar to Eclipse).
-
-If you open a `pom.xml` file, you'll see an additional "Dependencies" tab:
-
-image::intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png[width="600px",link="{imagesdir}/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png"]
-
-Clicking on this gives a graphical tree representation of the dependencies, similar to that obtained by `mvn dependency:tree`, but filterable.
-
-image::intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png[width="600px",link="{imagesdir}/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png"]
-
-The plugin also provides the ability to easily run a Maven goal on a project:
-
-image::intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png[width="600px",link="{imagesdir}/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png"]
-
-This menu can also be bound to a keystroke so that it is available as a pop-up:
-
-image::intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png[width="600px",link="{imagesdir}/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png"]
-
-=== Troubleshooting
-
-When a Maven module is imported, IntelliJ generates its own project files (suffix `.ipr`), and the application is actually built from that.
-
-Occasionally these don't keep in sync (even if auto-import of Maven modules has been enabled).
-
-To fix the issue, try:
-
-* reimport module
-* rebuild selected modules/entire project
-* remove and then re-add the project
-* restart, invalidating caches
-* hit StackOverflow (!)
-
-One thing worth knowing; IntelliJ actively scans the filesystem all the time.
-It's therefore (almost always) fine to build the app from the Maven command line; IntelliJ will detect the changes and keep in sync.
-If you want to force that, use `File > Synchronize`, `ctrl-alt-Y`.
-
-If you hit an error of "duplicate classes":
-
-image::intellij-idea/060-troubleshooting/010-duplicate-classes.png[width="600px",link="{imagesdir}/intellij-idea/060-troubleshooting/010-duplicate-classes.png"]
-
-then make sure you have correctly configured the xref:toc:devguide:about.adoc#other-settings-compiler[annotation processor]
-settings.
-Pay attention in particular to the "Production sources directory" and "Test sources directory", that these are set up correctly.
-
-== Faster turnaround times
-
-In this section are several options that will reduce the time it takes between making a source code edit and seeing the results in the running app. code/build/deploy/review feedback loop.
-
-=== Using Grade to compile/enhance
-
-Running an Apache Isis application requires that the DataNucleus enhancer runs on the compiled bytecode.
-As described xref:toc:devguide:about.adoc#running_the-app[above], the recommended way to do this with IntelliJ is to use a Run configuration that runs the enhancer goal prior to launch.
-
-Alternative, you can use the following `build.gradle` script in your `dom` module:
-
-[source,groovy]
-.`build.gradle`
-----
-apply plugin: 'java'
-apply plugin: 'tangram.tools'
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-version = (new XmlParser()).parse('pom.xml').parent.version.text()
-buildscript {
- repositories {
- maven { url "http://oss.jfrog.org/artifactory/oss-snapshot-local" }
- jcenter()
- }
- dependencies {
- classpath 'tangram:gradle-plugin:1.1.2'
- }
-}
-repositories {
- mavenLocal()
- maven { url "http://oss.jfrog.org/artifactory/oss-snapshot-local" }
- jcenter()
-}
-dependencies {
- compile group: 'org.apache.isis.core', name: 'isis-core-applib', version: version
-}
-task copyClasses << {
- copy {
- from 'build/classes/main'
- into 'target/classes'
- }
-}
-----
-
-The script is intended to be in the background as a daemon while editing/developing; whenever a change is made to any source code, gradle will automatically compile _and_ enhance the code.
-In this way it eliminates the need to start up Maven and run the enhancer goal.
-
-To use, you must disable the IntelliJ's automatic building of the 'dom' project.
-This is done using:
-`File > Settings > Build, Execution, Deployment > Compiler > Excludes`, and then exclude the `.../dom/src/main/java`
-directory:
-
-image::intellij-idea/070-advanced/002-compiler-exclude.png[width="800px",link="{imagesdir}/intellij-idea/070-advanced/002-compiler-exclude.png"]
-
-
-The script can be run in the background using:
-
-[source,bash]
-----
-gradle -t --offline &
-----
-
-from the command line (in the `dom` module).
-
-image::intellij-idea/070-advanced/004-gradle-output.png[width="600px",link="{imagesdir}/intellij-idea/070-advanced/004-gradle-output.png"]
-
-=== Using Gradle for liveReload
-
-Similarly, gradle can be run to reduce the turn-around time when tweaking the UI (defined by the
-xref:vw:ROOT:layout.adoc#file-based[`*.layout.xml`] file for each domain class), when the app is running.
-
-The framework will automatically notice any changes to `.layout.xml` files, but these are read from the classpath (the `target/classes` directory), not the source path.
-With IntelliJ these can be copied over manually by invoking `Run > Reload Changed Classes`.
-Once the browser is refreshed, the new layout will be rendered.
-
-[NOTE]
-====
-We've occasionally noticed that this interferes with Wicket's own javascript - switching tabs becomes unresponsive.
-The work-around is just to reload the page.
-====
-
-To reduce the turn-around time there are therefore two steps to be automated:
-
-* the copying of the `.layout.xml` files over to the `target/classes` directory
-* the triggering of a page refresh by the browser.
-
-The `layouts.gradle` script takes care of the first of these; whenever a change is made to any `.layout.xml` file, gradle will automatically copy over the file to the `target/classes` directory:
-
-[source,groovy]
-.`layouts.gradle`
-----
-defaultTasks 'copyLayouts'
-task copyLayouts(type:Copy) {
- from 'src/main/java'
- into 'target/classes'
- include '**/*.layout.xml'
-}
-----
-
-Similarly, the `liveReload.gradle` script takes care of the browser refresh:
-
-[source,groovy]
-.`liveReload.gradle`
-----
-defaultTasks 'liveReload'
-buildscript {
- repositories {
- jcenter()
- }
- dependencies {
- classpath 'org.kordamp.gradle:livereload-gradle-plugin:0.2.1'
- }
-}
-apply plugin: 'org.kordamp.gradle.livereload'
-liveReload {
- docRoot new File('target/classes').canonicalPath
-}
-----
-
-These scripts can be run together using:
-
-[source,bash]
-----
-gradle -t --offline -b layouts.gradle &
-gradle -t --offline -b liveReload.gradle &
-----
-
-from the command line (in the `dom` module):
-
-
-image::intellij-idea/070-advanced/005-gradle-output.png[width="600px",link="{imagesdir}/intellij-idea/070-advanced/005-gradle-output.png"]
-
-
-Live reload also requires that the `isis.viewer.wicket.liveReloadUrl` configuration property is set appropriately:
-
-[source,ini]
-.`viewer_wicket.properties`
-----
-isis.viewer.wicket.liveReloadUrl=http://localhost:35729/livereload.js?snipver=1
-----
-
-You can confirm the script is loaded correctly using the web browser's development tools, eg:
-
-
-image::intellij-idea/070-advanced/006-livereload-js.png[width="800px",link="{imagesdir}/intellij-idea/070-advanced/006-livereload-js.png"]
-
-=== Setting up DCEVM
-
-link:http://github.com/dcevm/dcevm[DCEVM] enhances the JVM with true hot-swap adding/removing of methods as well as more reliable hot swapping of the implementation of existing methods.
-
-In the context of Apache Isis, this is very useful for contributed actions and mixins and also view models; you should then be able to write these actions and have them be picked up without restarting the application.
-
-Changing persisting domain entities is more problematic, for two reasons: the JDO/DataNucleus enhancer needs to run on domain entities, and also at runtime JDO/DataNucleus would need to rebuild its own metamodel.
-You may find that adding actions will work, but adding new properties or collections is much less likely to.
-
-To set up DCEVM, download the appropriate JAR from the link:https://dcevm.github.io/[github page], and run the installer.
-For example:
-
-[source,bash]
-----
-java -jar DCEVM-light-8u51-installer.jar
-----
-
-[TIP]
-====
-Be sure to run with appropriate privileges to be able to write to the installation directories of the JDK. If running on Windows, that means running as `Administrator`.
-====
-
-After a few seconds this will display a dialog listing all installations of JDK that have been found:
-
-image::intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png[width="600px",link="{imagesdir}/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png"]
-
-
-Select the corresponding installation, and select `Replace by DCEVM`.
-
-image::intellij-idea/070-advanced/020-dcevm-once-installed.png[width="600px",link="{imagesdir}/intellij-idea/070-advanced/020-dcevm-once-installed.png"]
-
-
-In IntelliJ, register the JDK in `File > Project Structure` dialog:
-
-image::intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png[width="600px",link="{imagesdir}/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png"]
-
-Finally, in the run configuration, select the patched JDK:
-
-image::intellij-idea/070-advanced/040-dcevm-run-configuration.png[width="600px",link="{imagesdir}/intellij-idea/070-advanced/040-dcevm-run-configuration.png"]
-
-=== Setting up JRebel
-
-See the repo for the (non-ASF) link:https://github.com/isisaddons/isis-jrebel-plugin[Isis JRebel] plugin.
-
-Note that JRebel is a commercial product, requiring a license.
-At the time of writing there is also currently a non-commercial free license (though note this comes with some usage conditions).
diff --git a/antora/toc/modules/devguide/pages/resources/cheat-sheet.adoc b/antora/toc/modules/devguide/pages/resources/cheat-sheet.adoc
deleted file mode 100644
index 60ff82a..0000000
--- a/antora/toc/modules/devguide/pages/resources/cheat-sheet.adoc
+++ /dev/null
@@ -1,18 +0,0 @@
-[[cheat-sheet]]
-= Appendix: Cheat Sheet
-:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or ag [...]
-:page-partial:
-
-
-
-This "one-pager" cheat sheet summarises the main programming conventions to follow when writing an Apache Isis application.
-
-pass:[<br/>]
-
-
-image::resources/IsisCheatSheet.png[width="800px",link="{attachmentsdir}/resources/IsisCheatSheet.pdf"]
-
-
-pass:[<br/>]
-
-You can download the cheat sheet as either a link:{attachmentsdir}/resources/IsisCheatSheet.pdf[Acrobat PDF] or as an link:{attachmentsdir}/resources/IsisCheatSheet.docx[MS Word .docx] file.
diff --git a/antora/toc/modules/mignotes/nav.adoc b/antora/toc/modules/mignotes/nav.adoc
deleted file mode 100644
index 567a472..0000000
--- a/antora/toc/modules/mignotes/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-// unused - referenced directly by toc/nav.adoc
\ No newline at end of file
diff --git a/antora/toc/modules/mignotes/pages/about.adoc b/antora/toc/modules/mignotes/pages/about.adoc
deleted file mode 100644
index e9e8bfb..0000000
--- a/antora/toc/modules/mignotes/pages/about.adoc
+++ /dev/null
@@ -1,22 +0,0 @@
-= Migration Notes
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-
-Consult these notes when migrating to new versions of the framework.
-
-
-
-include::migrating-to-2.0.0.adoc[leveloffset=+1]
-include::mn-1.16.0-to-2.0.0-M1.adoc[leveloffset=+1]
-include::mn-1.16.0-to-1.17.0.adoc[leveloffset=+1]
-include::mn-1.15.0-to-1.16.0.adoc[leveloffset=+1]
-include::mn-1.14.0-to-1.15.0.adoc[leveloffset=+1]
-include::mn-1.13.0-to-1.14.0.adoc[leveloffset=+1]
-include::mn-1.12.0-to-1.13.0.adoc[leveloffset=+1]
-include::mn-1.11.0-to-1.12.0.adoc[leveloffset=+1]
-include::mn-1.10.0-to-1.11.0.adoc[leveloffset=+1]
-include::mn-1.9.0-to-1.10.0.adoc[leveloffset=+1]
-include::mn-1.8.0-to-1.9.0.adoc[leveloffset=+1]
-include::mn-1.7.0-to-1.8.0.adoc[leveloffset=+1]
-include::mn-1.6.0-to-1.7.0.adoc[leveloffset=+1]
diff --git a/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1.adoc b/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1.adoc
deleted file mode 100644
index c410176..0000000
--- a/antora/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1.adoc
+++ /dev/null
@@ -1,15 +0,0 @@
-= From v1.16.x to 2.0.0-M1
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-:page-partial:
-
-
-include::mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_meta-annotations.adoc[leveloffset=+1]
-include::mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_updated-annotations.adoc[leveloffset=+1]
-include::mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-annotations.adoc[leveloffset=+1]
-include::mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_moved-types.adoc[leveloffset=+1]
-include::mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-configuration-properties.adoc[leveloffset=+1]
-include::mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_updated-classes.adoc[leveloffset=+1]
-include::mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_removed-types.adoc[leveloffset=+1]
-include::mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_legacy-modules.adoc[leveloffset=+1]
-include::mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_other-changes.adoc[leveloffset=+1]
-
diff --git a/antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0.adoc b/antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0.adoc
deleted file mode 100644
index 338cc62..0000000
--- a/antora/toc/modules/mignotes/pages/mn-1.8.0-to-1.9.0.adoc
+++ /dev/null
@@ -1,19 +0,0 @@
-= From v1.8.0 to 1.9.0
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-:page-partial:
-
-
-
-
-include::mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_upgrading-to-dn4.adoc[leveloffset=+1]
-include::mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_specify-all-dom-packages.adoc[leveloffset=+1]
-include::mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_upgrading-to-java8.adoc[leveloffset=+1]
-include::mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_exception-recognizer.adoc[leveloffset=+1]
-include::mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_fixture-scripts-specification-provider.adoc[leveloffset=+1]
-include::mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_war-packaging.adoc[leveloffset=+1]
-include::mn-1.8.0-to-1.9.0/mn-1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc[leveloffset=+1]
-
-
-
-
-
diff --git a/antora/toc/modules/relnotes/nav.adoc b/antora/toc/modules/relnotes/nav.adoc
deleted file mode 100644
index 567a472..0000000
--- a/antora/toc/modules/relnotes/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-// unused - referenced directly by toc/nav.adoc
\ No newline at end of file
diff --git a/antora/toc/modules/relnotes/pages/about.adoc b/antora/toc/modules/relnotes/pages/about.adoc
deleted file mode 100644
index 12dd1c5..0000000
--- a/antora/toc/modules/relnotes/pages/about.adoc
+++ /dev/null
@@ -1,411 +0,0 @@
-= Release Notes
-:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or ag [...]
-
-
-
-== Summary
-
-This table summarises all releases of Apache Isis to date.
-
-[cols="1,2,4a,>1,>1,>1,3a"]
-|===
-| Version
-| Date
-| Release notes
-| Features
-| Improves
-| Bugs
-| JIRA relnotes
-
-
-| link:https://isis.apache.org/versions/2.0.0-M2/release-notes/release-notes.html#_release-notes_2.0.0-M2[2.0.0-M2]
-| 22-01-2018
-| Second milestone release for Apache Isis 2.0.0: tree support, initial work on simplifying bootstrapping and configuration, removing dependencies
-| 2
-| 36
-| 13
-| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342393[Release notes for 2.0.0-M2]
-
-| xref:about.adoc#_release-notes_1.17.0[1.17.0]
-| 06-01-2019
-| Sidebar dialogs, metamodel export
-| 4
-| 17
-| 9
-| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342854[Release notes for 1.17.0]
-
-| link:https://isis.apache.org/versions/2.0.0-M1/release-notes/release-notes.html#_release-notes_2.0.0-M1[2.0.0-M1]
-| 31-07-2018
-| First milestone release for Apache Isis 2.0.0: Java 8 support, DataNucleus 5.1, Wicket 8, meta-annotations, breadcrumbs
-| 6
-| 55
-+ 4 tasks
-+ 13 sub-tasks
-| 22
-| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342392[Release notes for 2.0.0-M1]
-
-
-| xref:about.adoc#_release-notes_1.16.2[1.16.2]
-| 05-03-2018
-| RO viewer support, performance improvement, fix of severe bug for parented checkboxes
-| 1
-| 6
-| 1
-| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342822[Release notes for 1.16.2]
-
-| link:https://isis.apache.org/versions/1.16.1/release-notes/release-notes.html#_release-notes_1.16.1[1.16.1]
-| 22-02-2018
-| Parented collections with checkboxes, replay module
-| 4
-| 10
-| 17
-| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342424[Release notes for v1.16.1]
-
-| link:https://isis.apache.org/versions/1.16.0/release-notes/release-notes.html#_release-notes_1.16.0[1.16.0]
-| 08-01-2018
-| Modules, simplified bootstrapping, menubars.layout.xml
-| 13
-| 16
-| 26
-| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342073[Release notes for v1.16.0]
-
-| link:https://isis.apache.org/versions/1.15.1/release-notes/release-notes.html#_release-notes_1.15.1[1.15.1]
-| 25-09-2017
-| Bug fixes, Wicket 7.9.0, Markup valuetype
-| 5
-| 4
-| 9
-| link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12341577[Release notes for v1.15.1]
-
-| link:https://isis.apache.org/versions/1.15.0/release-notes/release-notes.html#_release-notes_1.15.0[1.15.0]
-| 14-08-2017
-| Inline prompts, Wicket 7.x
-| 7
-| 25
-| 34
-| link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12338577[Release notes for v1.15.0]
-
-| link:https://isis.apache.org/versions/1.14.0/release-notes/release-notes.html#_release-notes_1.14.0[1.14.0]
-| 19-02-2017
-| Actions with collection parameters, metamodel validations.
-| 3
-| 11
-| 11
-| link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12338898[Release notes for v1.14.0]
-
-| link:https://isis.apache.org/versions/1.13.2.1/release-notes/release-notes.html#_release-notes_1.13.2.1[1.13.2.1]
-| 03-jan-2017
-| Patch release for simpleapp archetype only (docker images, regular actions instead of mixins)
-| 0
-| 2
-| 0
-| link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12338937[Release notes for v1.13.2.1]
-
-| link:https://isis.apache.org/versions/1.13.2/release-notes/release-notes.html#_release-notes_1.13.2[1.13.2]
-| 14-dec-2016
-| Patch release, modular simpleapp archetype
-| 2
-| 9
-| 5
-| link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12338744[Release notes for v1.13.2]
-
-| link:https://isis.apache.org/versions/1.13.1/release-notes/release-notes.html#_release-notes_1.13.1[1.13.1]
-| 30-oct-2016
-| Patch release, better support for docker
-| 1
-| 13
-| 21
-| link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12337967[Release notes for v1.13.1]
-
-| link:https://isis.apache.org/versions/1.13.0/release-notes/release-notes.html#_release-notes_1.13.0[1.13.0]
-| 11-jul-2016
-| Commands, interactions and internal refactorings
-| 27
-| 50
-| 23
-| link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12335362[Release notes for v1.13.0]
-
-| link:https://isis.apache.org/versions/1.12.2/release-notes/release-notes.html#_release-notes_1.12.2[1.12.2]
-| 06-jun-2016
-| Bug-fix release
-| 0
-| 0
-| 2
-| link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12335949[Release notes for v1.12.2]
-
-| link:https://isis.apache.org/versions/1.12.1/release-notes/release-notes.html#_release-notes_1.12.1[1.12.1]
-| 12-apr-2016
-| Bug-fix release
-| 0
-| 0
-| 4
-| link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12335484[Release notes for v1.12.1]
-
-| link:https://isis.apache.org/versions/1.12.0/release-notes/release-notes.html#_release-notes_1.12.0[1.12.0]
-| 29-mar-2016
-| Dynamic XML layouts
-| 7
-| 21
-| 21
-| link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12327483[Release notes for v1.12.0]
-
-| link:https://isis.apache.org/versions/1.11.1/release-notes/release-notes.html#_release-notes_1.11.1[1.11.1]
-| 17-jan-2016
-| Re-release under Java 1.7 (using toolchains plugin).
-| 0
-| 0
-| 1
-| link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12334640[Release notes for v1.11.1]
-
-| link:https://isis.apache.org/versions/1.11.0/release-notes/release-notes.html#_release-notes_1.11.0[1.11.0]
-| 02-jan-2016
-| More flexible REST API, view models using JAXB.
-| 9
-| 19
-| 12
-| link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12333974[Release notes for v1.11.0]
-
-| link:https://isis.apache.org/versions/1.10.0/release-notes/release-notes.html#_release-notes_1.10.0[1.10.0]
-| 10-nov-2015
-| New domain services, multi-tenancy support and mixins.
-| 7
-| 18
-| 12
-| link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12333354[Release notes for 1.10.0]
-
-| link:https://isis.apache.org/versions/1.9.0/release-notes/release-notes.html#_release-notes_1.9.0[1.9.0]
-| 1-sep-2015
-| AppManifest, Restful Objects representations and other "under-the-cover" improvements.
-| 18
-| 50
-| 25
-| link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12332806[Release notes for 1.9.0]
-
-| link:https://isis.apache.org/versions/1.8.0/release-notes/release-notes.html#_release-notes_1.8.0[1.8.0]
-| 24-feb-2015
-| Wicket viewer moved into core; todoapp archetype moved to link:http://www.isisaddons.org[Isis Addons] (non-ASF).
-| 27
-| 41
-| 20
-| * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12328845[core-1.8.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12328847[archetype-1.8.0]
-
-| link:https://isis.apache.org/versions/1.7.0/release-notes/release-notes.html#_release-notes_1.7.0[1.7.0]
-| 18-oct-2014
-| Module functionality previously in 1.6.0 now retired; use link:http://www.isisaddons.org[Isis Addons] (non-ASF) instead.
-| 4
-| 9
-| 20
-| * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326453[core-1.7.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326460[viewer-wicket-1.7.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12327441[archetype-simpleapp-1.7.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12327440[archetype-todoapp-1.7.0]
-
-| link:https://isis.apache.org/versions/1.6.0/release-notes/release-notes.html#_release-notes_1.6.0[1.6.0]
-| 28-jul-2014
-| Restful Objects viewer, JDO/Datanucleus Objectstore and Shiro Security all moved into core. Quickstart-wrj archetype renamed to todoapp; simple-wrj archetype renamed to simpleapp. Some functionality copied/refactored as link:http://www.isisaddons.org[Isis Addons] (non-ASF).
-| 6
-| 12
-| 15
-| * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12325314[core-1.6.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12325318[viewer-wicket-1.6.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326462[archetype-simpleapp-1.6.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326461[archetype-todoapp-1.6.0]
-
-| link:https://isis.apache.org/versions/1.5.0/release-notes/release-notes.html#_release-notes_1.5.0[1.5.0]
-| 08-jun-2014
-| No longer releasing security-file
-| 3
-| 19
-| 13
-| * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326524[core-1.5.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326525[objectstore-jdo-1.5.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326529[security-shiro-1.5.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326947[viewer-restfulobjects-2.3.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326526[viewer-wicket-1.5.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326528[archetype-simple-wrj-1.5.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326527[archetype-quickstart-wrj-1.5.0]
-
-| link:https://isis.apache.org/versions/1.4.1/release-notes/release-notes.html#_release-notes_1.4.1[1.4.1]
-| 14-mar-2014
-| Patch release
-| 0
-| 2
-| 2
-| * objectstore-jdo-1.4.1
-* viewer-wicket-1.4.1
-* archetype-simple-wrj-1.4.1
-* archetype-quickstart-wrj-1.4.1
-
-| link:https://isis.apache.org/versions/1.4.0/release-notes/release-notes.html#_release-notes_1.4.0[1.4.0]
-| 11-mar-2014
-|
-| 56
-| 62
-| 26
-| * core-1.4.0
-* objectstore-jdo-1.4.0
-* security-file-1.4.0
-* security-shiro-1.4.0
-* viewer-restfulobjects-2.2.0
-* viewer-wicket-1.4.0
-* archetype-simple-wrj-1.4.0
-* archetype-quickstart-wrj-1.4.0
-
-| link:https://isis.apache.org/versions/1.3.1/release-notes/release-notes.html#_release-notes_1.3.1[1.3.1]
-| 7-nov-2013
-| Patch release
-| 1
-| 0
-| 3
-| * viewer-wicket-1.3.1
-* archetype-simple-wrj-1.3.1
-* archetype-quickstart-wrj-1.3.1
-
-| link:https://isis.apache.org/versions/1.3.0/release-notes/release-notes.html#_release-notes_1.3.0[1.3.0]
-| 25-oct-2013
-| WRJ archetype renamed to Quickstart WRJ. Simple WRJ archetype added.
-| 52
-| 61
-| 30
-| * core-1.3.0
-* objectstore-jdo-1.3.0
-* security-file-1.0.2
-* security-shiro-1.3.0
-* viewer-restfulobjects-2.1.0
-* viewer-wicket-1.3.0
-* archetype-simple-wrj-1.3.0
-* archetype-quickstart-wrj-1.3.0
-
-| link:https://isis.apache.org/versions/1.2.0/release-notes/release-notes.html#_release-notes_1.2.0[1.2.0]
-| 30-may-2013
-|
-| 22
-| 41
-| 15
-| * core-1.2.0
-* objectstore-jdo-1.2.0
-* security-file-1.0.1
-* security-shiro-1.1.1
-* viewer-restfulobjects-2.0.0
-* viewer-wicket-1.2.0
-* archetype-wrj-1.0.3
-
-| link:https://isis.apache.org/versions/1.1.0/release-notes/release-notes.html#_release-notes_1.1.0[1.1.0]
-| 31-jan-2013
-|
-| 9
-| 18
-| 8
-|* core-1.1.0
-* security-shiro-1.1.0
-* viewer-wicket-1.1.0
-* archetype-wrj-1.0.2
-
-| link:https://isis.apache.org/versions/1.0.1/release-notes/release-notes.html#_release-notes_1.0.1[1.0.1]
-| 10-jan-2013
-| Combining RestfulObjects and Wicket viewers into a single webapp, along with Shiro security
-| 1
-|
-|
-| * security-shiro-1.0.0
-* archetype-wrj-1.0.1
-
-| link:https://isis.apache.org/versions/1.0.0/release-notes/release-notes.html#_release-notes_1.0.0[1.0.0]
-| 24-dec-2012
-| First release having graduated
-| 8
-| 33
-| 6
-|* core-1.0.0
-* security-file-1.0.0
-* viewer-wicket-1.0.0
-* viewer-restfulobjects-1.0.0
-* archetype-wrj-1.0.0
-
-
-| 0.2.0-incubating
-| 20-feb-2012
-|
-|
-|
-|
-| * 0.2.0-incubating
-
-| 0.1.2-incubating
-| 13-jul-2011
-| First release in the ASF incubator
-|
-|
-|
-| * 0.1.2-incubating
-|===
-
-
-
-
-
-== 2019
-
-include::rn-2.0.0-M2.adoc[leveloffset=+2]
-include::rn-1.17.0.adoc[leveloffset=+2]
-
-
-== 2018
-
-include::rn-2.0.0-M1.adoc[leveloffset=+2]
-include::rn-1.16.2.adoc[leveloffset=+2]
-include::rn-1.16.1.adoc[leveloffset=+2]
-include::rn-1.16.0.adoc[leveloffset=+2]
-
-
-== 2017
-
-include::rn-1.15.1.adoc[leveloffset=+2]
-include::rn-1.15.0.adoc[leveloffset=+2]
-include::rn-1.14.0.adoc[leveloffset=+2]
-include::rn-1.13.2.1.adoc[leveloffset=+2]
-
-
-== 2016
-
-include::rn-1.13.2.adoc[leveloffset=+2]
-include::rn-1.13.2.adoc[leveloffset=+2]
-include::rn-1.13.1.adoc[leveloffset=+2]
-include::rn-1.13.0.adoc[leveloffset=+2]
-include::rn-1.12.2.adoc[leveloffset=+2]
-include::rn-1.12.1.adoc[leveloffset=+2]
-include::rn-1.12.0.adoc[leveloffset=+2]
-include::rn-1.11.1.adoc[leveloffset=+2]
-include::rn-1.11.0.adoc[leveloffset=+2]
-
-
-== 2015
-
-include::rn-1.10.0.adoc[leveloffset=+2]
-include::rn-1.9.0.adoc[leveloffset=+2]
-
-
-== 2014
-
-include::rn-1.8.0.adoc[leveloffset=+2]
-include::rn-1.7.0.adoc[leveloffset=+2]
-include::rn-1.6.0.adoc[leveloffset=+2]
-include::rn-1.5.0.adoc[leveloffset=+2]
-include::rn-1.4.1.adoc[leveloffset=+2]
-include::rn-1.4.0.adoc[leveloffset=+2]
-
-
-== 2013
-
-include::rn-1.3.1.adoc[leveloffset=+2]
-include::rn-1.3.0.adoc[leveloffset=+2]
-include::rn-1.2.0.adoc[leveloffset=+2]
-include::rn-1.1.0.adoc[leveloffset=+2]
-
-
-== 2012
-
-include::rn-1.0.0.adoc[leveloffset=+2]
-
-
diff --git a/api/adoc/userguide/modules/fun/pages/about.adoc b/api/adoc/userguide/modules/fun/pages/about.adoc
index ff32fa0..60f014d 100644
--- a/api/adoc/userguide/modules/fun/pages/about.adoc
+++ b/api/adoc/userguide/modules/fun/pages/about.adoc
@@ -3,7 +3,7 @@
This guide introduces the xref:userguide:fun:core-concepts.adoc[core concepts] and the xref:userguide:fun:building-blocks.adoc[building blocks] of Apache Isis, and tells you how to get started with the xref:starters:helloworld:about.adoc[HelloWorld] starter app.
-It describes in some detail the conventions of Apache Isis' xref:userguide:fun:programming-model.adoc[programming model]s, describes how to influence the xref:vw:ROOT:layout.adoc[UI layout] of your domain objects , and it catalogues various xref:toc:devguide:hints-and-tips.adoc.adoc[FAQ]s.
+It describes in some detail the conventions of Apache Isis' xref:userguide:fun:programming-model.adoc[programming model]s, describes how to influence the xref:vw:ROOT:layout.adoc[UI layout] of your domain objects , and it catalogues various xref:setupguide:ROOT:hints-and-tips.adoc[hints-n-tips]s.
diff --git a/api/adoc/userguide/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc b/api/adoc/userguide/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc
index e0b361b..e9d9339 100644
--- a/api/adoc/userguide/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc
+++ b/api/adoc/userguide/modules/fun/pages/core-concepts/philosophy/how-eases-ddd.adoc
@@ -53,7 +53,8 @@ If we are using code as the primary means of expressing the model, then we need
We could generate UML diagrams and the like from code. That will work for some members of the business community, but not for everyone. Or we could generate a PDF document from Javadoc comments, but comments aren't code and so the document may be inaccurate. Anyway, even if we do create such a document, not everyone will read it.
A better way to represent the model is to show it in action as a working prototype.
-As we show in the xref:starters:helloworld:about.adoc[Getting Started] section, Apache Isis enables this with ease. Such prototypes bring the domain model to life, engaging the audience in a way that a piece of paper never can.
+As we show with the xref:starters:helloworld:about.adoc[starter apps], Apache Isis enables this with ease.
+Such prototypes bring the domain model to life, engaging the audience in a way that a piece of paper never can.
Moreover, with Apache Isis prototypes, the domain model will come shining through. If there are mistakes or misunderstandings in the domain model (inevitable when building any complex system), they will be obvious to all.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Auditing.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Auditing.java
index 283c859..eb1f6f8 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Auditing.java
+++ b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Auditing.java
@@ -23,7 +23,7 @@ package org.apache.isis.applib.annotation;
*/
public enum Auditing {
/**
- * The auditing of the object should be as per the default auditing policy configured in <tt>isis.properties</tt>.
+ * The auditing of the object should be as per the default auditing policy configured in <tt>application.properties</tt>.
*
* <p>
* If no auditing policy is configured, then the auditing is disabled.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/CommandReification.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/CommandReification.java
index 8128e63..89edc33 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/CommandReification.java
+++ b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/CommandReification.java
@@ -20,16 +20,10 @@ package org.apache.isis.applib.annotation;
/**
* The available policies as to whether action invocations are reified into commands.
- *
- * <p>
- * Note: this enum is <i>not</i> an inner class of the {@link org.apache.isis.applib.annotation.Action} annotation
- * because in the future we may also support commands for {@link org.apache.isis.applib.annotation.Property} and
- * {@link org.apache.isis.applib.annotation.Collection}.
- * </p>
*/
public enum CommandReification {
/**
- * Whether the action should be handled as a command is per the default command configured in <tt>isis.properties</tt>.
+ * Whether the action should be handled as a command as per the default command configured in <tt>applicationp.properties</tt>.
*
* <p>
* If no command policy is configured, then the action is <i>not</i> treated as a command.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Editing.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Editing.java
index 73bd187..9404bc4 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Editing.java
+++ b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Editing.java
@@ -23,7 +23,7 @@ package org.apache.isis.applib.annotation;
*/
public enum Editing {
/**
- * The editing of the object should be as per the default editing policy configured in <tt>isis.properties</tt>.
+ * The editing of the object should be as per the default editing policy configured in <tt>application.properties</tt>.
*
* <p>
* If no editing policy is configured, then the editing is enabled.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Publishing.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Publishing.java
index 78afcdc..581bdab 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Publishing.java
+++ b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Publishing.java
@@ -23,7 +23,7 @@ package org.apache.isis.applib.annotation;
*/
public enum Publishing {
/**
- * The publishing of the object should be as per the default publishing policy configured in <tt>isis.properties</tt>.
+ * The publishing of the object should be as per the default publishing policy configured in <tt>application.properties</tt>.
*
* <p>
* If no publishing policy is configured, then the publishing is disabled.
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/Title.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Title.adoc
index 06a3b43..3db789f 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/Title.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/Title.adoc
@@ -34,7 +34,7 @@ This convention can be overridden using `@Property(where=Where.NOWHERE)`.
== Lombok support
-If xref:toc:devguide:ide/project-lombok.adoc[Project Lombok] is being used, then `@Title` can be specified on the backing field.
+If xref:setupguide:ROOT:hints-and-tips.adoc#project-lombok[Project Lombok] is being used, then `@Title` can be specified on the backing field.
For example:
diff --git a/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/AuditerService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/AuditerService.java
index 3e340cf..29a1f7e 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/AuditerService.java
+++ b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/AuditerService.java
@@ -37,7 +37,7 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
* {@link AuditerServiceLogging}.
*
* <p>
- * To use either service, must include on the classpath and also register the service (eg in <tt>isis.properties</tt>).
+ * To use either service, must include on the classpath and also register the service (eg in <tt>application.properties</tt>).
*/
public interface AuditerService {
diff --git a/api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-api/IsisJdoSupport.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-api/IsisJdoSupport.adoc
index 705f028..3fbe56e 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-api/IsisJdoSupport.adoc
+++ b/api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-api/IsisJdoSupport.adoc
@@ -68,7 +68,7 @@ These "Q..." classes mirror the structure of domain entity, but expose propertie
[NOTE]
====
The IntelliJ IDE automatically enables annotation processing by default, as does Maven.
-Using Eclipse IDE you may need to configure annotation processing manually; see the xref:toc:devguide:about.adoc#enable-annotation-processing[Developers' Guide].
+Using Eclipse IDE you may need to configure annotation processing manually; see the xref:setupguide:ROOT:eclipse.adoc#enable-annotation-processing[Setup Guide].
The DataNucleus' link:http://www.datanucleus.org/products/accessplatform_4_0/jdo/jdoql_typesafe.html[documentation] offers some guidance on confirming that APT is enabled.
====
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Auditing.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Auditing.java
index 283c859..eb1f6f8 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Auditing.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Auditing.java
@@ -23,7 +23,7 @@ package org.apache.isis.applib.annotation;
*/
public enum Auditing {
/**
- * The auditing of the object should be as per the default auditing policy configured in <tt>isis.properties</tt>.
+ * The auditing of the object should be as per the default auditing policy configured in <tt>application.properties</tt>.
*
* <p>
* If no auditing policy is configured, then the auditing is disabled.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/CommandReification.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/CommandReification.java
index 8128e63..89edc33 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/CommandReification.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/CommandReification.java
@@ -20,16 +20,10 @@ package org.apache.isis.applib.annotation;
/**
* The available policies as to whether action invocations are reified into commands.
- *
- * <p>
- * Note: this enum is <i>not</i> an inner class of the {@link org.apache.isis.applib.annotation.Action} annotation
- * because in the future we may also support commands for {@link org.apache.isis.applib.annotation.Property} and
- * {@link org.apache.isis.applib.annotation.Collection}.
- * </p>
*/
public enum CommandReification {
/**
- * Whether the action should be handled as a command is per the default command configured in <tt>isis.properties</tt>.
+ * Whether the action should be handled as a command as per the default command configured in <tt>applicationp.properties</tt>.
*
* <p>
* If no command policy is configured, then the action is <i>not</i> treated as a command.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Editing.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Editing.java
index 73bd187..9404bc4 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Editing.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Editing.java
@@ -23,7 +23,7 @@ package org.apache.isis.applib.annotation;
*/
public enum Editing {
/**
- * The editing of the object should be as per the default editing policy configured in <tt>isis.properties</tt>.
+ * The editing of the object should be as per the default editing policy configured in <tt>application.properties</tt>.
*
* <p>
* If no editing policy is configured, then the editing is enabled.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Publishing.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Publishing.java
index 78afcdc..581bdab 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Publishing.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Publishing.java
@@ -23,7 +23,7 @@ package org.apache.isis.applib.annotation;
*/
public enum Publishing {
/**
- * The publishing of the object should be as per the default publishing policy configured in <tt>isis.properties</tt>.
+ * The publishing of the object should be as per the default publishing policy configured in <tt>application.properties</tt>.
*
* <p>
* If no publishing policy is configured, then the publishing is disabled.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerService.java b/api/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerService.java
index 3e340cf..29a1f7e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/audit/AuditerService.java
@@ -37,7 +37,7 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
* {@link AuditerServiceLogging}.
*
* <p>
- * To use either service, must include on the classpath and also register the service (eg in <tt>isis.properties</tt>).
+ * To use either service, must include on the classpath and also register the service (eg in <tt>application.properties</tt>).
*/
public interface AuditerService {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetFromConfiguration.java
index 1d7f7fc..53313cf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetFromConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetFromConfiguration.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacetAbstract
/**
* If the domain object has not been annotated with {@link org.apache.isis.applib.annotation.DomainObject} but auditing
- * has been configured in <tt>isis.properties</tt>.
+ * has been configured in <tt>application.properties</tt>.
*/
public class AuditableFacetFromConfiguration extends AuditableFacetAbstract {
diff --git a/examples/demo/src/main/adoc/antora.yml b/examples/demo/src/main/adoc/antora.yml
index 9bff432..92f67d2 100644
--- a/examples/demo/src/main/adoc/antora.yml
+++ b/examples/demo/src/main/adoc/antora.yml
@@ -1,6 +1,2 @@
-name: demoapp
-title: "Demo App"
+name: toc
version: master
-start_page: ROOT:about.adoc
-nav:
-- modules/ROOT/nav.adoc
diff --git a/examples/demo/src/main/adoc/modules/ROOT/nav.adoc b/examples/demo/src/main/adoc/modules/ROOT/nav.adoc
deleted file mode 100644
index 8b13789..0000000
--- a/examples/demo/src/main/adoc/modules/ROOT/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/examples/demo/src/main/adoc/modules/demo/nav.adoc b/examples/demo/src/main/adoc/modules/demo/nav.adoc
new file mode 100644
index 0000000..080d8e3
--- /dev/null
+++ b/examples/demo/src/main/adoc/modules/demo/nav.adoc
@@ -0,0 +1 @@
+include::toc:ROOT:partial$component-nav.adoc[]
diff --git a/examples/demo/src/main/adoc/modules/ROOT/pages/about.adoc b/examples/demo/src/main/adoc/modules/demo/pages/about.adoc
similarity index 95%
rename from examples/demo/src/main/adoc/modules/ROOT/pages/about.adoc
rename to examples/demo/src/main/adoc/modules/demo/pages/about.adoc
index 73248bd..200192e 100644
--- a/examples/demo/src/main/adoc/modules/ROOT/pages/about.adoc
+++ b/examples/demo/src/main/adoc/modules/demo/pages/about.adoc
@@ -88,7 +88,7 @@ Use CTRL-C to stop and detach
If you like to get involved quickly, please feel free to open new pull requests (at github) or just join the discussion and provide feedback.
-If you are interested in contributing to Apache Isis, see the https://isis.apache.org/guides/dg/dg.html[Developers' Guide] for details.
+If you are interested in contributing to Apache Isis, see the xref:conguide:ROOT:about.adoc[Contributors' Guide] for details.
== Credits
diff --git a/examples/demo/src/main/adoc/modules/demo/partials/module-nav.adoc b/examples/demo/src/main/adoc/modules/demo/partials/module-nav.adoc
new file mode 100644
index 0000000..fbe1113
--- /dev/null
+++ b/examples/demo/src/main/adoc/modules/demo/partials/module-nav.adoc
@@ -0,0 +1 @@
+** xref:toc:demo:about.adoc[Demo App]
diff --git a/mappings/adoc/modules/ROOT/pages/about.adoc b/mappings/adoc/modules/ROOT/pages/about.adoc
index 5c306be..12e63f7 100644
--- a/mappings/adoc/modules/ROOT/pages/about.adoc
+++ b/mappings/adoc/modules/ROOT/pages/about.adoc
@@ -1,4 +1,4 @@
-= Bounded Contexts Mappings Catalog
+= Bounded Context Mapping Libraries
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/configuring/persistence-xml.adoc b/persistence/jdo/adoc/modules/ROOT/pages/configuring/persistence-xml.adoc
index b584357..3657352 100644
--- a/persistence/jdo/adoc/modules/ROOT/pages/configuring/persistence-xml.adoc
+++ b/persistence/jdo/adoc/modules/ROOT/pages/configuring/persistence-xml.adoc
@@ -26,7 +26,8 @@ Normally all one needs to do is to change the `persistence-unit` name.
[TIP]
====
-If you use Eclipse IDE on Windows then xref:toc:devguide:about.adoc#workaround-for-path-limits[note the importance] of the `persistence.xml` file to make DataNucleus enhancer work correctly.
+If you use Eclipse IDE on Windows then
+xref:setupguide:ROOT:eclipse.adoc#workaround-for-path-limits-the-dn-plugin-to-use-the-persistence-xml[note the importance] of the `persistence.xml` file to make DataNucleus enhancer work correctly.
====
diff --git a/starters/adoc/modules/helloworld/pages/about.adoc b/starters/adoc/modules/helloworld/pages/about.adoc
index eca5cbc..9399afd 100644
--- a/starters/adoc/modules/helloworld/pages/about.adoc
+++ b/starters/adoc/modules/helloworld/pages/about.adoc
@@ -22,7 +22,7 @@ Apache Isis is a Java based framework, so in terms of prerequisites, you'll need
* Java 8 JDK
* link:http://maven.apache.org[Apache Maven] 3.5+
-You'll probably also want to use an IDE; the Apache Isis committers use either IntelliJ or Eclipse; in the xref:toc:devguide:ide.adoc[Developers' Guide] we have detailed setup instructions for using these two IDEs.
+You'll probably also want to use an IDE; the Apache Isis committers use either IntelliJ or Eclipse; in the xref:setupguide:ROOT:ide.adoc[Setup Guide] we have detailed setup instructions for using these two IDEs.
If you're a NetBeans user you should have no problems as it too has strong support for Maven.
When building and running within an IDE, you'll also need to configure the Datanucleus enhancer.
@@ -459,14 +459,14 @@ This means:
== Running from within the IDE
Most of the time you'll probably want to run the app from within your IDE.
-The mechanics of doing this will vary by IDE; see the xref:toc:devguide:ide.adoc[Developers' Guide] for details of setting up Eclipse or IntelliJ IDEA.
-Basically, though, it amounts to running the `main()` method in the `HelloWorldApp`, but also (and this bit is important) ensuring that the xref:toc:devguide:hints-and-tips/datanucleus-enhancer.adoc[DataNucleus enhancer] has properly processed all domain entities.
+The mechanics of doing this will vary by IDE; see the xref:setupguide:ROOT:ide.adoc[Setup Guide] for details of setting up Eclipse or IntelliJ IDEA.
+Basically, though, it amounts to running the `main()` method in the `HelloWorldApp`, but also (and this bit is important) ensuring that the xref:setupguide:ROOT:hints-and-tips.adoc#datanucleus-enhancer[DataNucleus enhancer] has properly processed all domain entities.
Here's what the setup looks like in IntelliJ IDEA:
image::helloworld.png[width="600px",link="{imagesdir}/helloworld.png"]
-which uses an IntelliJ feature to run a different run configuration to run DataNucleus enhancer (discussed in more detail xref:toc:devguide:hints-and-tips/datanucleus-enhancer.adoc[here]) beforehand:
+which uses an IntelliJ feature to run a different run configuration to run DataNucleus enhancer beforehand:
image::helloworld-before-launch.png[width="600px",link="{imagesdir}/helloworld-before-launch.png"]
@@ -477,7 +477,8 @@ image::helloworld-before-launch.png[width="600px",link="{imagesdir}/helloworld-b
Once you are familiar with the app, try modifying it.
There is plenty more guidance on this site; start with the xref:userguide:fun:about.adoc[User Guide Fundamentals] and then look at the other guides linked to from the top-level menu or from the main xref:toc:ROOT:about.adoc[table of contents].
-If you use IntelliJ IDEA or Eclipse, do also install the xref:toc:devguide:about.adoc#live-templates[live templates (for IntelliJ)] / xref:toc:devguide:about.adoc#editor-templates[editor templates (for Eclipse)]; these will help you follow the Apache Isis naming conventions.
+If you use IntelliJ IDEA or Eclipse, do also install the
+xref:setupguide:ROOT:intellij.adoc#live-templates[live templates (for IntelliJ)] / xref:setupguide:ROOT:eclipse.adoc#editor-templates[editor templates (for Eclipse)]; these will help you follow the Apache Isis naming conventions.
If you run into issues, please don't hesitate to ask for help on the users mailing list or the Slack channel, as per the xref:toc:ROOT:landing-page/support.adoc[support page].
diff --git a/starters/adoc/modules/simpleapp/pages/about.adoc b/starters/adoc/modules/simpleapp/pages/about.adoc
index b10944f..53bc62a 100644
--- a/starters/adoc/modules/simpleapp/pages/about.adoc
+++ b/starters/adoc/modules/simpleapp/pages/about.adoc
@@ -16,7 +16,7 @@ Apache Isis is a Java based framework, so in terms of prerequisites, you'll need
* Java 8 JDK
* link:http://maven.apache.org[Apache Maven] 3.5+
-You'll probably also want to use an IDE; the Apache Isis committers use either IntelliJ or Eclipse; in the xref:toc:devguide:ide.adoc[Developers' Guide] we have detailed setup instructions for using these two IDEs.
+You'll probably also want to use an IDE; the Apache Isis committers use either IntelliJ or Eclipse; in the xref:setupguide:ROOT:ide.adoc[Setup Guide] we have detailed setup instructions for using these two IDEs.
If you're a NetBeans user you should have no problems as it too has strong support for Maven.
When building and running within an IDE, you'll also need to configure the Datanucleus enhancer.
@@ -874,14 +874,14 @@ This means:
== Running from within the IDE
Most of the time you'll probably want to run the app from within your IDE.
-The mechanics of doing this will vary by IDE; see the xref:toc:devguide:ide.adoc[Developers' Guide] for details of setting up Eclipse or IntelliJ IDEA.
-Basically, though, it amounts to running the `main()` method in the `SimpleApp`, but also (and this bit is important) ensuring that the xref:toc:devguide:hints-and-tips/datanucleus-enhancer.adoc[DataNucleus enhancer] has properly processed all domain entities.
+The mechanics of doing this will vary by IDE; see the xref:setupguide:ROOT:ide.adoc[Setup Guide] for details of setting up Eclipse or IntelliJ IDEA.
+Basically, though, it amounts to running the `main()` method in the `SimpleApp`, but also (and this bit is important) ensuring that the xref:setupguide:ROOT:hints-and-tips.adoc#datanucleus-enhancer[DataNucleus enhancer] has properly processed all domain entities.
Here's what the setup looks like in IntelliJ IDEA:
image::simpleapp-webapp.png[width="600px",link="{imagesdir}/simpleapp-webapp.png"]
-which uses an IntelliJ feature to run a different run configuration to run DataNucleus enhancer (discussed in more detail xref:toc:devguide:hints-and-tips/datanucleus-enhancer.adoc[here]) beforehand:
+which uses an IntelliJ feature to run a different run configuration to run DataNucleus enhancer beforehand:
image::simpleapp-webapp-before-launch.png[width="600px",link="{imagesdir}/simpleapp-webapp-before-launch.png"]
@@ -892,7 +892,7 @@ image::simpleapp-webapp-before-launch.png[width="600px",link="{imagesdir}/simple
Once you are familiar with the app, try modifying it.
There is plenty more guidance on this site; start with the xref:userguide:fun:about.adoc[User Guide Fundamentals] and then look at the other guides linked to from the top-level menu or from the main xref:toc:ROOT:about.adoc[table of contents].
-If you use IntelliJ IDEA or Eclipse, do also install the xref:toc:devguide:about.adoc#live-templates[live templates (for IntelliJ)] / xref:toc:devguide:about.adoc#editor-templates[editor templates (for Eclipse)]; these will help you follow the Apache Isis naming conventions.
+If you use IntelliJ IDEA or Eclipse, do also install the xref:setupguide:ROOT:intellij.adoc#live-templates[live templates (for IntelliJ)] / xref:setupguide:ROOT:eclipse.adoc#editor-templates[editor templates (for Eclipse)]; these will help you follow the Apache Isis naming conventions.
If you run into issues, please don't hesitate to ask for help on the users mailing list or the Slack channel, as per the xref:toc:ROOT:landing-page/support.adoc[support page].
diff --git a/subdomains/adoc/modules/ROOT/pages/about.adoc b/subdomains/adoc/modules/ROOT/pages/about.adoc
index d678650..4d65b55 100644
--- a/subdomains/adoc/modules/ROOT/pages/about.adoc
+++ b/subdomains/adoc/modules/ROOT/pages/about.adoc
@@ -1,4 +1,4 @@
-= Subdomains Catalog
+= Subdomain Libraries
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
diff --git a/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc b/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc
index 632d969..faed52c 100644
--- a/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc
+++ b/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc
@@ -71,7 +71,7 @@ This contract test automatically checks that bidirectional 1:m or 1:1 associatio
====
(If using JDO/DataNucleus, then) there is generally no need to programmatically maintain 1:m relationships (indeed it may introduce subtle errors).
For more details, see xref:userguide:fun:how-tos/entity-relationships/managed-1-to-m-bidirectional-relationships.adoc[here].
-Also check out the templates in the developers' guide (xref:toc:devguide:about.adoc#live-templates[live templates for IntelliJ] / xref:toc:devguide:about.adoc#editor-templates[editor templates for Eclipse]) for further guidance.
+Also check out the templates in the setup guide (xref:setupguide:ROOT:intellij.adoc#live-templates[live templates (for IntelliJ)] / xref:setupguide:ROOT:eclipse.adoc#editor-templates[editor templates (for Eclipse)]) for further guidance.
====
For example, suppose that `ParentDomainObject` and `ChildDomainObject` have a 1:m relationship (`ParentDomainObject#children` / `ChildDomainObject#parent`), and also `PeerDomainObject` has a 1:1 relationship with itself (`PeerDomainObject#next` / `PeerDomainObject#previous`).
diff --git a/valuetypes/adoc/modules/ROOT/pages/about.adoc b/valuetypes/adoc/modules/ROOT/pages/about.adoc
index 13b3101..1ccbb00 100644
--- a/valuetypes/adoc/modules/ROOT/pages/about.adoc
+++ b/valuetypes/adoc/modules/ROOT/pages/about.adoc
@@ -1,4 +1,4 @@
-= Value Types Catalog
+= Value Type Libraries
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
:page-partial:
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/about.adoc b/viewers/wicket/adoc/modules/ROOT/pages/about.adoc
index d55d3cd..2c00058 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/about.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/about.adoc
@@ -1,4 +1,6 @@
= Wicket Viewer
+:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+:page-aliases: sysadmin:webservers:upgrade/service/apache.adoc
The Wicket Viewer automatically exposes an Apache Isis domain object model for use by end-users. The viewer is
implemented using link:http://wicket.apache.org[Apache Wicket].
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/configuration-properties.adoc b/viewers/wicket/adoc/modules/ROOT/pages/configuration-properties.adoc
index 5de63ef..db317b5 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/configuration-properties.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/configuration-properties.adoc
@@ -160,7 +160,7 @@ This can be computed using a simple script, for example:
DATE=$(date +%Y%m%d.%H%M)
BRANCH=$(echo $GIT_BRANCH | sed 's|^rel/||g' | sed 's|[.]|_|g' | awk -F/ '{ print $NF }')
GIT_SHORT_COMMIT=$(echo $GIT_COMMIT | cut -c1-8)
-REVISION=$DATE.$BRANCH.$GIT_SHORT_COMMIT
+APPLICATION_VERSION=$DATE.$BRANCH.$GIT_SHORT_COMMIT
----
where `$GIT_BRANCH` and `$GIT_COMMIT` are provided by the CI server/build environment.
@@ -169,35 +169,39 @@ This environment variable can be passed into the (Maven) build using a system pr
[source,bash]
----
-mvn -Drevision=$REVISION clean install
+mvn -DapplicationVersion=$APPLICATION_VERSION clean install
----
-If we provide a file `application-version.properties` is in the same package as the app manifest file, but in the `src/main/resources` directory:
+Suppose we now provide a file `application-version.properties` is in the same package as the app manifest file, but in the `src/main/resources` directory:
[source,ini]
.application-version.properties
----
-isis.viewer.wicket.application.version=$\{revision}
+isis.viewer.wicket.application.version=$\{applicationVersion}
----
then Maven will automatically interpolate the actual revision when this file is copied over to the build (ie `target/classes`) directory.
-Finally, this file can be loaded in the app manifest using:
+The last step is for Spring Boot to also load this file.
+One way to do this is using the Spring link:https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/context/annotation/PropertySource.html[@PropertySource] annotation on the top-level "app manifest":
[source,java]
----
-public class MyAppManifest extends AppManifestAbstract2 {
-
- public static final AppManifestAbstract2.Builder BUILDER =
- AppManifestAbstract2.Builder.forModule(new MyApplicationModule())
- .withConfigurationPropertiesFile(
- MyAppManifest.class, "application-version.properties");
-
- public MyAppManifest() {
- super(BUILDER);
- }
+@Configuration
+@Import({
+ IsisModuleCoreRuntimeServices.class,
+ IsisModuleSecurityShiro.class,
+ IsisModuleJdoDataNucleus5.class,
+ IsisModuleViewerRestfulObjectsJaxrsResteasy4.class,
+ IsisModuleViewerWicketViewer.class,
+
+ /* ... application-specific modules ... */
+})
+@PropertySource("classpath:application-version.properties") //<1>
+public class AppManifest {
}
----
+<1> picks up the additional configuration property.
@@ -809,7 +813,7 @@ This feature is primarily just to help track any memory leakage issues that migh
|`isis.viewer.wicket.` +
`liveReloadUrl`
| URL
-|Specifies the URL if xref:toc:devguide:about.adoc#advanced_gradle-liveReload[live reload] is set up, eg: +
+|Specifies the URL if xref:setupguide:ROOT:intellij.adoc#using-gradle-for-livereload[live reload] is set up, eg: +
`http://localhost:35729/livereload.js?snipver=1`