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/01/13 21:39:59 UTC

[isis] 03/05: ISIS-2062: moves src/main/doc to src/main/adoc

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 184fd5a3b1c18b0a6e0a3204495b067eeec40865
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Jan 13 09:50:10 2020 +0000

    ISIS-2062: moves src/main/doc to src/main/adoc
---
 antora/playbooks/site-core.yml                     |  21 ++-
 antora/playbooks/site-extensions.yml               |  22 +--
 antora/playbooks/site-incubator.yml                |   7 +
 antora/playbooks/site-legacy.yml                   |  10 +-
 antora/playbooks/site-mappings.yml                 |   8 +-
 antora/playbooks/site-pjdo.yml                     |   2 +-
 antora/playbooks/site-refguide.yml                 |   6 +-
 antora/playbooks/site-security.yml                 |  12 +-
 antora/playbooks/site-subdomains.yml               |  18 +--
 antora/playbooks/site-testing.yml                  |  16 +-
 antora/playbooks/site-toc.yml                      |   4 +-
 antora/playbooks/site-valuetypes.yml               |   6 +-
 antora/playbooks/site-vro.yml                      |   8 +-
 antora/playbooks/site-vw.yml                       |   2 +-
 antora/playbooks/site.yml                          | 126 ++++++++-------
 .../doc => api/applib/src/main/adoc}/antora.yml    |   0
 .../{doc => adoc}/modules/applib-ant/examples.sh   |   0
 .../applib-ant/examples/annotation/Action.java     |   0
 .../examples/annotation/ActionLayout.java          |   0
 .../applib-ant/examples/annotation/Auditing.java   |   0
 .../examples/annotation/BookmarkPolicy.java        |   0
 .../applib-ant/examples/annotation/Bounding.java   |   0
 .../applib-ant/examples/annotation/Collection.java |   0
 .../examples/annotation/CollectionLayout.java      |   0
 .../examples/annotation/CommandExecuteIn.java      |   0
 .../examples/annotation/CommandPersistence.java    |   0
 .../examples/annotation/CommandReification.java    |   0
 .../applib-ant/examples/annotation/Constants.java  |   0
 .../examples/annotation/Contributed.java           |   0
 .../applib-ant/examples/annotation/Defaulted.java  |   0
 .../examples/annotation/DomainObject.java          |   0
 .../examples/annotation/DomainObjectLayout.java    |   0
 .../examples/annotation/DomainService.java         |   0
 .../examples/annotation/DomainServiceLayout.java   |   0
 .../applib-ant/examples/annotation/Editing.java    |   0
 .../examples/annotation/EqualByContent.java        |   0
 .../applib-ant/examples/annotation/Facets.java     |   0
 .../applib-ant/examples/annotation/HomePage.java   |   0
 .../examples/annotation/LabelPosition.java         |   0
 .../examples/annotation/MemberOrder.java           |   0
 .../examples/annotation/MementoSerialization.java  |   0
 .../applib-ant/examples/annotation/MinLength.java  |   0
 .../applib-ant/examples/annotation/Mixin.java      |   0
 .../applib-ant/examples/annotation/Module.java     |   0
 .../applib-ant/examples/annotation/Nature.java     |   0
 .../examples/annotation/NatureOfService.java       |   0
 .../applib-ant/examples/annotation/Navigable.java  |   0
 .../examples/annotation/Optionality.java           |   0
 .../examples/annotation/OrderPrecedence.java       |   0
 .../applib-ant/examples/annotation/Parameter.java  |   0
 .../examples/annotation/ParameterLayout.java       |   0
 .../examples/annotation/Programmatic.java          |   0
 .../applib-ant/examples/annotation/Projecting.java |   0
 .../examples/annotation/PromptStyle.java           |   0
 .../applib-ant/examples/annotation/Property.java   |   0
 .../examples/annotation/PropertyLayout.java        |   0
 .../applib-ant/examples/annotation/Publishing.java |   0
 .../examples/annotation/PublishingChangeKind.java  |   0
 .../applib-ant/examples/annotation/Redirect.java   |   0
 .../applib-ant/examples/annotation/RenderDay.java  |   0
 .../applib-ant/examples/annotation/Repainting.java |   0
 .../applib-ant/examples/annotation/RestrictTo.java |   0
 .../examples/annotation/SemanticsOf.java           |   0
 .../applib-ant/examples/annotation/Title.java      |   0
 .../applib-ant/examples/annotation/Value.java      |   0
 .../applib-ant/examples/annotation/ViewModel.java  |   0
 .../examples/annotation/ViewModelLayout.java       |   0
 .../applib-ant/examples/annotation/Where.java      |   0
 .../examples/annotation/package-info.java          |   0
 .../main/adoc/modules/applib-ant}/images/.gitkeep  |   0
 .../ActionLayout}/bookmarking.png                  | Bin
 .../ActionLayout/position-BELOW.png                | Bin
 .../ActionLayout/position-PANEL.png                | Bin
 .../ActionLayout/position-PANEL_DROPDOWN.png       | Bin
 .../ActionLayout/position-RIGHT.png                | Bin
 .../CollectionLayout/sortedby-dependencies.png     | Bin
 .../DomainObjectLayout/bookmarking-nested.png      | Bin
 .../DomainObjectLayout}/bookmarking.png            | Bin
 .../DomainServiceLayout/menuBar-primary.png        | Bin
 .../DomainServiceLayout/menuBar-secondary.png      | Bin
 .../DomainServiceLayout/menuBar-tertiary.png       | Bin
 .../DomainServiceLayout/menuOrder.png              | Bin
 .../reference-annotations/HomePage/HomePage.png    | Bin
 .../PropertyLayout/labelPosition-LEFT.png          | Bin
 .../PropertyLayout/labelPosition-NONE.png          | Bin
 .../PropertyLayout/labelPosition-TOP.png           | Bin
 .../PropertyLayout/labelPosition-boolean-LEFT.png  | Bin
 .../PropertyLayout/labelPosition-boolean-RIGHT.png | Bin
 .../src/main/adoc/modules/applib-ant}/nav.adoc     |   0
 .../modules/applib-ant/pages/Action.adoc           |   0
 .../applib-ant/pages/Action/associateWith.adoc     |   0
 .../modules/applib-ant/pages/Action/command.adoc   |   0
 .../applib-ant/pages/Action/domainEvent.adoc       |   0
 .../modules/applib-ant/pages/Action/hidden.adoc    |   0
 .../modules/applib-ant/pages/Action/invokeOn.adoc  |   0
 .../applib-ant/pages/Action/publishing.adoc        |   0
 .../applib-ant/pages/Action/restrictTo.adoc        |   0
 .../modules/applib-ant/pages/Action/semantics.adoc |   0
 .../modules/applib-ant/pages/Action/typeOf.adoc    |   0
 .../modules/applib-ant/pages/ActionLayout.adoc     |   0
 .../applib-ant/pages/ActionLayout/bookmarking.adoc |   0
 .../pages/ActionLayout/contributedAs.adoc          |   0
 .../applib-ant/pages/ActionLayout/cssClass.adoc    |   0
 .../applib-ant/pages/ActionLayout/cssClassFa.adoc  |   0
 .../applib-ant/pages/ActionLayout/describedAs.adoc |   0
 .../applib-ant/pages/ActionLayout/hidden.adoc      |   0
 .../applib-ant/pages/ActionLayout/named.adoc       |   0
 .../applib-ant/pages/ActionLayout/position.adoc    |   0
 .../applib-ant/pages/ActionLayout/promptStyle.adoc |   0
 .../applib-ant/pages/ActionLayout/redirect.adoc    |   0
 .../modules/applib-ant/pages/Collection.adoc       |   0
 .../applib-ant/pages/Collection/domainEvent.adoc   |   0
 .../applib-ant/pages/Collection/editing.adoc       |   0
 .../applib-ant/pages/Collection/hidden.adoc        |   0
 .../applib-ant/pages/Collection/notPersisted.adoc  |   0
 .../applib-ant/pages/Collection/typeOf.adoc        |   0
 .../modules/applib-ant/pages/CollectionLayout.adoc |   0
 .../pages/CollectionLayout/cssClass.adoc           |   0
 .../pages/CollectionLayout/defaultView.adoc        |   0
 .../pages/CollectionLayout/describedAs.adoc        |   0
 .../applib-ant/pages/CollectionLayout/hidden.adoc  |   0
 .../applib-ant/pages/CollectionLayout/named.adoc   |   0
 .../applib-ant/pages/CollectionLayout/paged.adoc   |   0
 .../pages/CollectionLayout/sortedBy.adoc           |   0
 .../modules/applib-ant/pages/Column.adoc           |   0
 .../modules/applib-ant/pages/Digits.adoc           |   0
 .../modules/applib-ant/pages/Discriminator.adoc    |   0
 .../modules/applib-ant/pages/DomainObject.adoc     |   0
 .../pages/DomainObject/actionDomainEvent.adoc      |   0
 .../applib-ant/pages/DomainObject/auditing.adoc    |   0
 .../pages/DomainObject/autoCompleteRepository.adoc |   0
 .../applib-ant/pages/DomainObject/bounding.adoc    |   0
 .../pages/DomainObject/collectionDomainEvent.adoc  |   0
 .../pages/DomainObject/createdLifecycleEvent.adoc  |   0
 .../applib-ant/pages/DomainObject/editing.adoc     |   0
 .../pages/DomainObject/loadedLifecycleEvent.adoc   |   0
 .../applib-ant/pages/DomainObject/mixinMethod.adoc |   0
 .../applib-ant/pages/DomainObject/nature.adoc      |   0
 .../applib-ant/pages/DomainObject/objectType.adoc  |   0
 .../DomainObject/persistedLifecycleEvent.adoc      |   0
 .../DomainObject/persistingLifecycleEvent.adoc     |   0
 .../pages/DomainObject/propertyDomainEvent.adoc    |   0
 .../applib-ant/pages/DomainObject/publishing.adoc  |   0
 .../pages/DomainObject/removingLifecycleEvent.adoc |   0
 .../pages/DomainObject/updatedLifecycleEvent.adoc  |   0
 .../pages/DomainObject/updatingLifecycleEvent.adoc |   0
 .../applib-ant/pages/DomainObjectLayout.adoc       |   0
 .../pages/DomainObjectLayout/bookmarking.adoc      |   0
 .../pages/DomainObjectLayout/cssClass.adoc         |   0
 .../pages/DomainObjectLayout/cssClassFa.adoc       |   0
 .../pages/DomainObjectLayout/cssClassUiEvent.adoc  |   0
 .../pages/DomainObjectLayout/describedAs.adoc      |   0
 .../pages/DomainObjectLayout/iconUiEvent.adoc      |   0
 .../pages/DomainObjectLayout/layoutUiEvent.adoc    |   0
 .../applib-ant/pages/DomainObjectLayout/named.adoc |   0
 .../applib-ant/pages/DomainObjectLayout/paged.adoc |   0
 .../pages/DomainObjectLayout/plural.adoc           |   0
 .../pages/DomainObjectLayout/titleUiEvent.adoc     |   0
 .../modules/applib-ant/pages/DomainService.adoc    |   0
 .../applib-ant/pages/DomainService/nature.adoc     |   0
 .../applib-ant/pages/DomainService/objectType.adoc |   0
 .../pages/DomainService/repositoryFor.adoc         |   0
 .../applib-ant/pages/DomainServiceLayout.adoc      |   0
 .../pages/DomainServiceLayout/menuBar.adoc         |   0
 .../pages/DomainServiceLayout/menuOrder.adoc       |   0
 .../pages/DomainServiceLayout/named.adoc           |   0
 .../modules/applib-ant/pages/Facets.adoc           |   0
 .../modules/applib-ant/pages/HomePage.adoc         |   0
 .../modules/applib-ant/pages/Inject.adoc           |   0
 .../applib-ant/pages/MemberGroupLayout.adoc        |   0
 .../modules/applib-ant/pages/MemberOrder.adoc      |   0
 .../modules/applib-ant/pages/MemberOrder/name.adoc |   0
 .../applib-ant/pages/MemberOrder/sequence.adoc     |   0
 .../modules/applib-ant/pages/MinLength.adoc        |   0
 .../modules/applib-ant/pages/Mixin.adoc            |   0
 .../modules/applib-ant/pages/Mixin/method.adoc     |   0
 .../modules/applib-ant/pages/NotPersistent.adoc    |   0
 .../modules/applib-ant/pages/Nullable.adoc         |   0
 .../modules/applib-ant/pages/Parameter.adoc        |   0
 .../applib-ant/pages/Parameter/fileAccept.adoc     |   0
 .../applib-ant/pages/Parameter/maxLength.adoc      |   0
 .../applib-ant/pages/Parameter/mustSatisfy.adoc    |   0
 .../applib-ant/pages/Parameter/optionality.adoc    |   0
 .../applib-ant/pages/Parameter/regexPattern.adoc   |   0
 .../modules/applib-ant/pages/ParameterLayout.adoc  |   0
 .../applib-ant/pages/ParameterLayout/cssClass.adoc |   0
 .../pages/ParameterLayout/describedAs.adoc         |   0
 .../pages/ParameterLayout/labelPosition.adoc       |   0
 .../pages/ParameterLayout/multiLine.adoc           |   0
 .../applib-ant/pages/ParameterLayout/named.adoc    |   0
 .../pages/ParameterLayout/renderedAsDayBefore.adoc |   0
 .../pages/ParameterLayout/typicalLength.adoc       |   0
 .../modules/applib-ant/pages/Pattern.adoc          |   0
 .../applib-ant/pages/PersistenceCapable.adoc       |   0
 .../modules/applib-ant/pages/PostConstruct.adoc    |   0
 .../modules/applib-ant/pages/PreDestroy.adoc       |   0
 .../modules/applib-ant/pages/PrimaryKey.adoc       |   0
 .../modules/applib-ant/pages/Programmatic.adoc     |   0
 .../modules/applib-ant/pages/Property.adoc         |   0
 .../modules/applib-ant/pages/Property/command.adoc |   0
 .../applib-ant/pages/Property/domainEvent.adoc     |   0
 .../modules/applib-ant/pages/Property/editing.adoc |   0
 .../applib-ant/pages/Property/fileAccept.adoc      |   0
 .../modules/applib-ant/pages/Property/hidden.adoc  |   0
 .../applib-ant/pages/Property/maxLength.adoc       |   0
 .../applib-ant/pages/Property/mustSatisfy.adoc     |   0
 .../applib-ant/pages/Property/notPersisted.adoc    |   0
 .../applib-ant/pages/Property/optionality.adoc     |   0
 .../applib-ant/pages/Property/projecting.adoc      |   0
 .../applib-ant/pages/Property/publishing.adoc      |   0
 .../applib-ant/pages/Property/regexPattern.adoc    |   0
 .../modules/applib-ant/pages/PropertyLayout.adoc   |   0
 .../applib-ant/pages/PropertyLayout/cssClass.adoc  |   0
 .../pages/PropertyLayout/describedAs.adoc          |   0
 .../applib-ant/pages/PropertyLayout/hidden.adoc    |   0
 .../pages/PropertyLayout/labelPosition.adoc        |   0
 .../applib-ant/pages/PropertyLayout/multiLine.adoc |   0
 .../applib-ant/pages/PropertyLayout/named.adoc     |   0
 .../applib-ant/pages/PropertyLayout/navigable.adoc |   0
 .../pages/PropertyLayout/promptStyle.adoc          |   0
 .../pages/PropertyLayout/renderedAsDayBefore.adoc  |   0
 .../pages/PropertyLayout/typicalLength.adoc        |   0
 .../pages/PropertyLayout/unchanging.adoc           |   0
 .../modules/applib-ant/pages/RequestScoped.adoc    |   0
 .../modules/applib-ant/pages/Title.adoc            |   0
 .../modules/applib-ant/pages/ViewModel.adoc        |   0
 .../applib-ant/pages/ViewModel/objectType.adoc     |   0
 .../modules/applib-ant/pages/ViewModelLayout.adoc  |   0
 .../pages/ViewModelLayout/bookmarking.adoc         |   0
 .../applib-ant/pages/ViewModelLayout/cssClass.adoc |   0
 .../pages/ViewModelLayout/cssClassFa.adoc          |   0
 .../pages/ViewModelLayout/cssClassUiEvent.adoc     |   0
 .../pages/ViewModelLayout/describedAs.adoc         |   0
 .../pages/ViewModelLayout/iconUiEvent.adoc         |   0
 .../pages/ViewModelLayout/layoutUiEvent.adoc       |   0
 .../applib-ant/pages/ViewModelLayout/named.adoc    |   0
 .../applib-ant/pages/ViewModelLayout/paged.adoc    |   0
 .../applib-ant/pages/ViewModelLayout/plural.adoc   |   0
 .../pages/ViewModelLayout/titleUiEvent.adoc        |   0
 .../applib-ant/pages/XmlJavaTypeAdapter.adoc       |   0
 .../modules/applib-ant/pages/XmlRootElement.adoc   |   0
 .../modules/applib-ant/pages/about.adoc            |   0
 .../modules/applib-ant/pages/about/jdo.adoc        |   0
 .../modules/applib-ant/pages/about/jee.adoc        |   0
 .../modules/applib-ant/pages/about/main.adoc       |   0
 .../modules/applib-ant/pages/about/other.adoc      |   0
 .../modules/applib-ant/pages/about/partial.adoc    |   0
 .../modules/applib-ant/partials/module-nav.adoc    |   0
 .../{doc => adoc}/modules/applib-cm/examples.sh    |   0
 .../modules/applib-cm/examples/clock/Clock.java    |   0
 .../applib-cm/examples/clock/package-info.java     |   0
 .../examples/domain/DomainObjectList.java          |   0
 .../events/ActionArgumentUsabilityEvent.java       |   0
 .../events/ActionArgumentVisibilityEvent.java      |   0
 .../events/domain/AbstractDomainEvent.java         |   0
 .../examples/events/domain/ActionDomainEvent.java  |   0
 .../events/domain/CollectionDomainEvent.java       |   0
 .../examples/events/domain/EventObjectBase.java    |   0
 .../events/domain/PropertyDomainEvent.java         |   0
 .../events/lifecycle/AbstractLifecycleEvent.java   |   0
 .../events/lifecycle/ObjectCreatedEvent.java       |   0
 .../events/lifecycle/ObjectLoadedEvent.java        |   0
 .../events/lifecycle/ObjectPersistedEvent.java     |   0
 .../events/lifecycle/ObjectPersistingEvent.java    |   0
 .../events/lifecycle/ObjectRemovingEvent.java      |   0
 .../events/lifecycle/ObjectUpdatedEvent.java       |   0
 .../events/lifecycle/ObjectUpdatingEvent.java      |   0
 .../examples/events/ui/AbstractUiEvent.java        |   0
 .../examples/events/ui/CssClassUiEvent.java        |   0
 .../applib-cm/examples/events/ui/IconUiEvent.java  |   0
 .../examples/events/ui/LayoutUiEvent.java          |   0
 .../applib-cm/examples/events/ui/TitleUiEvent.java |   0
 .../layout/component/ActionLayoutData.java         |   0
 .../layout/component/ActionLayoutDataOwner.java    |   0
 .../layout/component/CollectionLayoutData.java     |   0
 .../component/CollectionLayoutDataOwner.java       |   0
 .../layout/component/DomainObjectLayoutData.java   |   0
 .../component/DomainObjectLayoutDataOwner.java     |   0
 .../examples/layout/component/FieldSet.java        |   0
 .../examples/layout/component/FieldSetOwner.java   |   0
 .../examples/layout/component/HasBookmarking.java  |   0
 .../examples/layout/component/HasCssClass.java     |   0
 .../examples/layout/component/HasCssClassFa.java   |   0
 .../examples/layout/component/HasDescribedAs.java  |   0
 .../examples/layout/component/HasHidden.java       |   0
 .../examples/layout/component/HasNamed.java        |   0
 .../examples/layout/component/MemberRegion.java    |   0
 .../layout/component/MemberRegionOwner.java        |   0
 .../applib-cm/examples/layout/component/Owned.java |   0
 .../applib-cm/examples/layout/component/Owner.java |   0
 .../layout/component/PropertyLayoutData.java       |   0
 .../layout/component/ServiceActionLayoutData.java  |   0
 .../component/ServiceActionLayoutDataOwner.java    |   0
 .../examples/layout/component/package-info.java    |   0
 .../applib-cm/examples/layout/grid/Grid.java       |   0
 .../examples/layout/grid/GridAbstract.java         |   0
 .../layout/grid/bootstrap3/BS3ClearFix.java        |   0
 .../layout/grid/bootstrap3/BS3ClearFixHidden.java  |   0
 .../layout/grid/bootstrap3/BS3ClearFixVisible.java |   0
 .../examples/layout/grid/bootstrap3/BS3Col.java    |   0
 .../layout/grid/bootstrap3/BS3Element.java         |   0
 .../layout/grid/bootstrap3/BS3ElementAbstract.java |   0
 .../examples/layout/grid/bootstrap3/BS3Grid.java   |   0
 .../examples/layout/grid/bootstrap3/BS3Row.java    |   0
 .../layout/grid/bootstrap3/BS3RowContent.java      |   0
 .../layout/grid/bootstrap3/BS3RowContentOwner.java |   0
 .../layout/grid/bootstrap3/BS3RowOwner.java        |   0
 .../examples/layout/grid/bootstrap3/BS3Tab.java    |   0
 .../layout/grid/bootstrap3/BS3TabGroup.java        |   0
 .../layout/grid/bootstrap3/BS3TabGroupOwner.java   |   0
 .../layout/grid/bootstrap3/BS3TabOwner.java        |   0
 .../examples/layout/grid/bootstrap3/HasCssId.java  |   0
 .../examples/layout/grid/bootstrap3/Size.java      |   0
 .../examples/layout/grid/bootstrap3/SizeSpan.java  |   0
 .../layout/grid/bootstrap3/WithinGrid.java         |   0
 .../layout/grid/bootstrap3/package-info.java       |   0
 .../applib-cm/examples/layout/links/Link.java      |   0
 .../examples/layout/links/package-info.java        |   0
 .../applib-cm/examples/layout/menubars/Menu.java   |   0
 .../examples/layout/menubars/MenuBar.java          |   0
 .../examples/layout/menubars/MenuBars.java         |   0
 .../examples/layout/menubars/MenuBarsAbstract.java |   0
 .../examples/layout/menubars/MenuSection.java      |   0
 .../layout/menubars/bootstrap3/BS3Menu.java        |   0
 .../layout/menubars/bootstrap3/BS3MenuBar.java     |   0
 .../layout/menubars/bootstrap3/BS3MenuBars.java    |   0
 .../layout/menubars/bootstrap3/BS3MenuSection.java |   0
 .../layout/menubars/bootstrap3/package-info.java   |   0
 .../applib-cm/examples/layout/package-info.java    |   0
 .../applib-cm/examples/mixins/MixinConstants.java  |   0
 .../modules/applib-cm/examples/mixins/dto/Dto.java |   0
 .../examples/mixins/dto/DtoMappingHelper.java      |   0
 .../examples/mixins/dto/Dto_downloadXml.java       |   0
 .../examples/mixins/dto/Dto_downloadXsd.java       |   0
 .../examples/mixins/dto/package-info.java          |   0
 .../mixins/layout/Object_downloadLayoutXml.java    |   0
 .../examples/mixins/layout/Object_openRestApi.java |   0
 .../mixins/layout/Object_rebuildMetamodel.java     |   0
 .../metamodel/Object_downloadMetaModelXml.java     |   0
 .../mixins/metamodel/Object_objectIdentifier.java  |   0
 .../mixins/metamodel/Object_objectType.java        |   0
 .../examples/mixins/timestamp/HoldsUpdatedAt.java  |   0
 .../examples/mixins/timestamp/HoldsUpdatedBy.java  |   0
 .../examples/mixins/timestamp/Timestampable.java   |   0
 .../examples/mixins/timestamp/package-info.java    |   0
 .../applib-cm/examples/security/RoleMemento.java   |   0
 .../applib-cm/examples/security/UserMemento.java   |   0
 .../applib-cm/examples/security/package-info.java  |   0
 .../examples/spec/AbstractSpecification.java       |   0
 .../examples/spec/AbstractSpecification2.java      |   0
 .../applib-cm/examples/spec/Specification.java     |   0
 .../applib-cm/examples/spec/Specification2.java    |   0
 .../applib-cm/examples/spec/SpecificationAnd.java  |   0
 .../applib-cm/examples/spec/SpecificationNot.java  |   0
 .../applib-cm/examples/spec/SpecificationOr.java   |   0
 .../applib-cm/examples/spec/package-info.java      |   0
 .../applib-cm/examples/tree/LazyTreeNode.java      |   0
 .../applib-cm/examples/tree/TreeAdapter.java       |   0
 .../modules/applib-cm/examples/tree/TreeNode.java  |   0
 .../tree/TreeNode_iteratorBreadthFirst.java        |   0
 .../examples/tree/TreeNode_iteratorDepthFirst.java |   0
 .../tree/TreeNode_iteratorHierarchyUp.java         |   0
 .../modules/applib-cm/examples/tree/TreePath.java  |   0
 .../applib-cm/examples/tree/TreePath_Default.java  |   0
 .../modules/applib-cm/examples/tree/TreeState.java |   0
 .../applib-cm/examples/tree/TreeState_Default.java |   0
 .../modules/applib-cm/examples/util/Enums.java     |   0
 .../modules/applib-cm/examples/util/Equality.java  |   0
 .../modules/applib-cm/examples/util/Hashing.java   |   0
 .../applib-cm/examples/util/JaxbAdapters.java      |   0
 .../modules/applib-cm/examples/util/JaxbUtil.java  |   0
 .../examples/util/ObjectContract_Empty.java        |   0
 .../examples/util/ObjectContract_Impl.java         |   0
 .../examples/util/ObjectContract_Parser.java       |   0
 .../applib-cm/examples/util/ObjectContracts.java   |   0
 .../applib-cm/examples/util/ReasonBuffer.java      |   0
 .../applib-cm/examples/util/ReasonBuffer2.java     |   0
 .../modules/applib-cm/examples/util/Reasons.java   |   0
 .../applib-cm/examples/util/TitleBuffer.java       |   0
 .../examples/util/TitleBufferException.java        |   0
 .../modules/applib-cm/examples/util/ToString.java  |   0
 .../modules/applib-cm/examples/util/ZipWriter.java |   0
 .../applib-cm/examples/util/package-info.java      |   0
 .../examples/util/schema/ChangesDtoUtils.java      |   0
 .../examples/util/schema/CommandDtoUtils.java      |   0
 .../examples/util/schema/CommonDtoUtils.java       |   0
 .../examples/util/schema/InteractionDtoUtils.java  |   0
 .../util/schema/MemberExecutionDtoUtils.java       |   0
 .../modules/applib-cm/examples/value/Blob.java     |   0
 .../applib-cm/examples/value/BlobClobFactory.java  |   0
 .../modules/applib-cm/examples/value/Clob.java     |   0
 .../modules/applib-cm/examples/value/Image.java    |   0
 .../examples/value/LocalResourcePath.java          |   0
 .../modules/applib-cm/examples/value/Markup.java   |   0
 .../examples/value/NamedWithMimeType.java          |   0
 .../modules/applib-cm/examples/value/Password.java |   0
 .../applib-cm/examples/value/package-info.java     |   0
 .../reference-classes/issue-in-more-detail.png     | Bin
 .../prefixes/choices/dependent.png                 | Bin
 .../reserved/cssClass/strikethrough.png            | Bin
 .../reserved/iconName/differing.pdn                | Bin
 .../reserved/iconName/differing.png                | Bin
 .../reserved/iconName/png-files.png                | Bin
 .../applib-cm}/images/value-types/markup.png       | Bin
 .../src/main/adoc/modules/applib-cm}/nav.adoc      |   0
 .../modules/applib-cm/pages/about.adoc             |   0
 .../modules/applib-cm/pages/classes.adoc           |   0
 .../pages/classes/AppManifest-bootstrapping.adoc   |   0
 .../pages/classes/AppManifest2-bootstrapping.adoc  |   0
 .../applib-cm/pages/classes/contributee.adoc       |   0
 .../classes/contributee/HasTransactionId.adoc      |   0
 .../pages/classes/contributee/HasUserName.adoc     |   0
 .../applib-cm/pages/classes/domainevent.adoc       |   0
 .../classes/domainevent/AbstractDomainEvent.adoc   |   0
 .../classes/domainevent/ActionDomainEvent.adoc     |   0
 .../classes/domainevent/CollectionDomainEvent.adoc |   0
 .../classes/domainevent/PropertyDomainEvent.adoc   |   0
 .../modules/applib-cm/pages/classes/i18n.adoc      |   0
 .../pages/classes/i18n/TranslatableString.adoc     |   0
 .../modules/applib-cm/pages/classes/layout.adoc    |   0
 .../applib-cm/pages/classes/lifecycleevent.adoc    |   0
 .../lifecycleevent/AbstractLifecycleEvent.adoc     |   0
 .../classes/lifecycleevent/ObjectCreatedEvent.adoc |   0
 .../classes/lifecycleevent/ObjectLoadedEvent.adoc  |   0
 .../lifecycleevent/ObjectPersistedEvent.adoc       |   0
 .../lifecycleevent/ObjectPersistingEvent.adoc      |   0
 .../lifecycleevent/ObjectRemovingEvent.adoc        |   0
 .../classes/lifecycleevent/ObjectUpdatedEvent.adoc |   0
 .../lifecycleevent/ObjectUpdatingEvent.adoc        |   0
 .../modules/applib-cm/pages/classes/menubars.adoc  |   0
 .../modules/applib-cm/pages/classes/mixins.adoc    |   0
 .../applib-cm/pages/classes/mixins/Dto.adoc        |   0
 .../applib-cm/pages/classes/mixins/Object.adoc     |   0
 .../pages/classes/mixins/Persistable.adoc          |   0
 .../modules/applib-cm/pages/classes/roles.adoc     |   0
 .../pages/classes/roles/HoldsUpdatedAt.adoc        |   0
 .../pages/classes/roles/HoldsUpdatedBy.adoc        |   0
 .../pages/classes/roles/Timestampable.adoc         |   0
 .../modules/applib-cm/pages/classes/spec.adoc      |   0
 .../modules/applib-cm/pages/classes/super.adoc     |   0
 .../pages/classes/super/AbstractService.adoc       |   0
 .../pages/classes/super/AbstractSubscriber.adoc    |   0
 .../pages/classes/super/AbstractViewModel.adoc     |   0
 .../pages/classes/super/FixtureScript.adoc         |   0
 .../pages/classes/super/FixtureScripts.adoc        |   0
 .../modules/applib-cm/pages/classes/uievent.adoc   |   0
 .../pages/classes/uievent/CssClassUiEvent.adoc     |   0
 .../pages/classes/uievent/IconUiEvent.adoc         |   0
 .../pages/classes/uievent/TitleUiEvent.adoc        |   0
 .../modules/applib-cm/pages/classes/utility.adoc   |   0
 .../applib-cm/pages/classes/utility/Enums.adoc     |   0
 .../pages/classes/utility/ObjectContracts.adoc     |   0
 .../applib-cm/pages/classes/utility/Reasons.adoc   |   0
 .../pages/classes/utility/TitleBuffer.adoc         |   0
 .../applib-cm/pages/classes/value-types.adoc       |   0
 .../applib-cm/pages/classes/value-types/Blob.adoc  |   0
 .../applib-cm/pages/classes/value-types/Clob.adoc  |   0
 .../applib-cm/pages/classes/value-types/Color.adoc |   0
 .../pages/classes/value-types/Markup.adoc          |   0
 .../applib-cm/pages/classes/value-types/Money.adoc |   0
 .../pages/classes/value-types/Password.adoc        |   0
 .../modules/applib-cm/pages/methods.adoc           |   0
 .../modules/applib-cm/pages/methods/lifecycle.adoc |   0
 .../applib-cm/pages/methods/lifecycle/created.adoc |   0
 .../applib-cm/pages/methods/lifecycle/jdo-api.adoc |   0
 .../applib-cm/pages/methods/lifecycle/loaded.adoc  |   0
 .../pages/methods/lifecycle/persisted.adoc         |   0
 .../pages/methods/lifecycle/persisting.adoc        |   0
 .../applib-cm/pages/methods/lifecycle/removed.adoc |   0
 .../pages/methods/lifecycle/removing.adoc          |   0
 .../applib-cm/pages/methods/lifecycle/updated.adoc |   0
 .../pages/methods/lifecycle/updating.adoc          |   0
 .../modules/applib-cm/pages/methods/prefixes.adoc  |   0
 .../applib-cm/pages/methods/prefixes/addTo.adoc    |   0
 .../pages/methods/prefixes/autoComplete.adoc       |   0
 .../applib-cm/pages/methods/prefixes/choices.adoc  |   0
 .../applib-cm/pages/methods/prefixes/clear.adoc    |   0
 .../applib-cm/pages/methods/prefixes/default.adoc  |   0
 .../applib-cm/pages/methods/prefixes/disable.adoc  |   0
 .../applib-cm/pages/methods/prefixes/get.adoc      |   0
 .../applib-cm/pages/methods/prefixes/hide.adoc     |   0
 .../applib-cm/pages/methods/prefixes/modify.adoc   |   0
 .../pages/methods/prefixes/removeFrom.adoc         |   0
 .../applib-cm/pages/methods/prefixes/set.adoc      |   0
 .../applib-cm/pages/methods/prefixes/validate.adoc |   0
 .../pages/methods/prefixes/validateAddTo.adoc      |   0
 .../pages/methods/prefixes/validateRemoveFrom.adoc |   0
 .../modules/applib-cm/pages/methods/reserved.adoc  |   0
 .../applib-cm/pages/methods/reserved/cssClass.adoc |   0
 .../applib-cm/pages/methods/reserved/disable.adoc  |   0
 .../applib-cm/pages/methods/reserved/getId.adoc    |   0
 .../applib-cm/pages/methods/reserved/hide.adoc     |   0
 .../applib-cm/pages/methods/reserved/iconName.adoc |   0
 .../applib-cm/pages/methods/reserved/layout.adoc   |   0
 .../applib-cm/pages/methods/reserved/title.adoc    |   0
 .../applib-cm/pages/methods/reserved/validate.adoc |   0
 .../modules/applib-cm/pages/rgcms.adoc             |   0
 .../modules/applib-cm/partials/module-nav.adoc     |   0
 .../{doc => adoc}/modules/applib-svc/examples.sh   |   0
 .../applib-svc/examples/services/HasUniqueId.java  |   0
 .../applib-svc/examples/services/HasUsername.java  |   0
 .../RepresentsInteractionMemberExecution.java      |   0
 .../examples/services/WithTransactionScope.java    |   0
 .../services/acceptheader/AcceptHeaderService.java |   0
 .../appfeat/ApplicationFeatureRepository.java      |   0
 .../services/appfeat/ApplicationMemberType.java    |   0
 .../examples/services/appfeat/package-info.java    |   0
 .../services/audit/AuditEntryPropertyIdType.java   |   0
 .../audit/AuditEntryPropertyValueType.java         |   0
 .../examples/services/audit/AuditerService.java    |   0
 .../services/audit/AuditerServiceLogging.java      |   0
 .../examples/services/audit/package-info.java      |   0
 .../background/BackgroundCommandService.java       |   0
 .../examples/services/background/package-info.java |   0
 .../examples/services/bookmark/Bookmark.java       |   0
 .../examples/services/bookmark/BookmarkHolder.java |   0
 .../services/bookmark/BookmarkHolder_lookup.java   |   0
 .../services/bookmark/BookmarkHolder_object.java   |   0
 .../services/bookmark/BookmarkService.java         |   0
 .../examples/services/bookmark/package-info.java   |   0
 .../services/bookmarkui/BookmarkUiService.java     |   0
 .../examples/services/clock/ClockService.java      |   0
 .../examples/services/clock/package-info.java      |   0
 .../examples/services/command/Command.java         |   0
 .../examples/services/command/CommandContext.java  |   0
 .../examples/services/command/CommandDefault.java  |   0
 .../services/command/CommandDtoProcessor.java      |   0
 .../CommandDtoProcessorForActionAbstract.java      |   0
 .../CommandDtoProcessorForPropertyAbstract.java    |   0
 .../services/command/CommandExecutorService.java   |   0
 .../examples/services/command/CommandWithDto.java  |   0
 .../examples/services/command/package-info.java    |   0
 .../services/command/spi/CommandService.java       |   0
 .../services/confview/ConfigurationMenu.java       |   0
 .../services/confview/ConfigurationProperty.java   |   0
 .../confview/ConfigurationProperty.layout.xml      |   0
 .../services/confview/ConfigurationProperty.png    | Bin
 .../confview/ConfigurationViewService.java         |   0
 .../examples/services/confview/package-info.java   |   0
 .../services/conmap/ContentMappingService.java     |   0
 .../ContentMappingServiceForCommandDto.java        |   0
 .../ContentMappingServiceForCommandsDto.java       |   0
 .../command/spi/CommandDtoProcessorService.java    |   0
 .../examples/services/conmap/package-info.java     |   0
 .../examples/services/email/EmailService.java      |   0
 .../examples/services/email/package-info.java      |   0
 .../examples/services/error/ErrorDetails.java      |   0
 .../services/error/ErrorReportingService.java      |   0
 .../applib-svc/examples/services/error/Ticket.java |   0
 .../examples/services/error/package-info.java      |   0
 .../services/eventbus/EventBusService.java         |   0
 .../examples/services/eventbus/package-info.java   |   0
 .../services/exceprecog/ExceptionRecognizer.java   |   0
 .../exceprecog/ExceptionRecognizerAbstract.java    |   0
 .../exceprecog/ExceptionRecognizerComposite.java   | 178 +++++++++++++++++++++
 .../exceprecog/ExceptionRecognizerForType.java     |   0
 .../services/exceprecog/TranslatableException.java |   0
 .../examples/services/exceprecog/package-info.java |   0
 .../examples/services/factory/FactoryService.java  |   0
 .../examples/services/factory/package-info.java    |   0
 .../examples/services/grid/GridLoaderService.java  |   0
 .../examples/services/grid/GridService.java        |   0
 .../examples/services/grid/GridSystemService.java  |   0
 .../examples/services/grid/package-info.java       |   0
 .../examples/services/health/Health.java           |   0
 .../services/health/HealthCheckService.java        |   0
 .../examples/services/hint/HintStore.java          |   0
 .../examples/services/hint/package-info.java       |   0
 .../examples/services/i18n/LocaleProvider.java     |   0
 .../examples/services/i18n/TranslatableString.java |   0
 .../examples/services/i18n/TranslationService.java |   0
 .../services/i18n/TranslationsResolver.java        |   0
 .../examples/services/i18n/package-info.java       |   0
 .../examples/services/iactn/Interaction.java       |   0
 .../services/iactn/InteractionContext.java         |   0
 .../examples/services/iactn/package-info.java      |   0
 .../examples/services/inject/ServiceInjector.java  |   0
 .../jaxb/CatalogingSchemaOutputResolver.java       |   0
 .../examples/services/jaxb/JaxbService.java        |   0
 .../examples/services/jaxb/JaxbServiceDefault.java |   0
 .../services/jaxb/StreamResultWithWriter.java      |   0
 .../examples/services/jaxb/package-info.java       |   0
 .../examples/services/layout/LayoutService.java    |   0
 .../services/layout/LayoutServiceMenu.java         |   0
 .../examples/services/layout/package-info.java     |   0
 .../examples/services/linking/DeepLinkService.java |   0
 .../examples/services/linking/package-info.java    |   0
 .../services/menu/MenuBarsLoaderService.java       |   0
 .../examples/services/menu/MenuBarsService.java    |   0
 .../examples/services/message/MessageService.java  |   0
 .../examples/services/message/package-info.java    |   0
 .../examples/services/metamodel/DomainMember.java  |   0
 .../examples/services/metamodel/DomainModel.java   |   0
 .../services/metamodel/MetaModelService.java       |   0
 .../services/metamodel/MetaModelServicesMenu.java  |   0
 .../examples/services/metamodel/package-info.java  |   0
 .../examples/services/metrics/MetricsService.java  |   0
 .../examples/services/metrics/package-info.java    |   0
 .../applib-svc/examples/services/package-info.java |   0
 .../services/publish/PublishedObjects.java         |   0
 .../services/publish/PublisherService.java         |   0
 .../services/publish/PublisherServiceLogging.java  |   0
 .../examples/services/publish/package-info.java    |   0
 .../queryresultscache/QueryResultCacheControl.java |   0
 .../queryresultscache/QueryResultsCache.java       |   0
 .../QueryResultsCacheDefault.java                  |   0
 .../services/queryresultscache/package-info.java   |   0
 .../services/registry/ServiceRegistry.java         |   0
 .../examples/services/registry/package-info.java   |   0
 .../services/repository/RepositoryService.java     |   0
 .../examples/services/repository/package-info.java |   0
 .../examples/services/routing/RoutingService.java  |   0
 .../examples/services/routing/package-info.java    |   0
 .../examples/services/scratchpad/Scratchpad.java   |   0
 .../examples/services/scratchpad/package-info.java |   0
 .../services/session/SessionLoggingService.java    |   0
 .../examples/services/session/package-info.java    |   0
 .../sessmgmt/SessionManagementService.java         |   0
 .../examples/services/sessmgmt/package-info.java   |   0
 .../examples/services/sudo/SudoService.java        |   0
 .../examples/services/sudo/package-info.java       |   0
 .../examples/services/swagger/SwaggerService.java  |   0
 .../examples/services/swagger/package-info.java    |   0
 .../services/tablecol/TableColumnOrderService.java |   0
 .../examples/services/title/TitleService.java      |   0
 .../examples/services/title/package-info.java      |   0
 .../services/urlencoding/UrlEncodingService.java   |   0
 ...rlEncodingServiceUsingBaseEncodingAbstract.java |   0
 .../UrlEncodingServiceWithCompression.java         |   0
 .../services/urlencoding/package-info.java         |   0
 .../examples/services/user/UserService.java        |   0
 .../examples/services/user/package-info.java       |   0
 .../services/userprof/UserProfileService.java      |   0
 .../examples/services/userprof/package-info.java   |   0
 .../services/userreg/EmailNotificationService.java |   0
 .../examples/services/userreg/UserDetails.java     |   0
 .../services/userreg/UserRegistrationService.java  |   0
 .../userreg/events/EmailEventAbstract.java         |   0
 .../userreg/events/EmailRegistrationEvent.java     |   0
 .../userreg/events/PasswordResetEvent.java         |   0
 .../examples/services/userreg/package-info.java    |   0
 .../examples/services/wrapper/AsyncWrap.java       |   0
 .../services/wrapper/DisabledException.java        |   0
 .../examples/services/wrapper/HiddenException.java |   0
 .../services/wrapper/InteractionException.java     |   0
 .../services/wrapper/InvalidException.java         |   0
 .../examples/services/wrapper/WrapperFactory.java  |   0
 .../examples/services/wrapper/WrappingObject.java  |   0
 .../services/wrapper/events/AccessEvent.java       |   0
 .../wrapper/events/ActionArgumentEvent.java        |   0
 .../wrapper/events/ActionInvocationEvent.java      |   0
 .../wrapper/events/ActionUsabilityEvent.java       |   0
 .../wrapper/events/ActionVisibilityEvent.java      |   0
 .../wrapper/events/CollectionAccessEvent.java      |   0
 .../wrapper/events/CollectionAddToEvent.java       |   0
 .../wrapper/events/CollectionMethodEvent.java      |   0
 .../wrapper/events/CollectionRemoveFromEvent.java  |   0
 .../wrapper/events/CollectionUsabilityEvent.java   |   0
 .../wrapper/events/CollectionVisibilityEvent.java  |   0
 .../services/wrapper/events/InteractionEvent.java  |   0
 .../services/wrapper/events/ObjectTitleEvent.java  |   0
 .../wrapper/events/ObjectValidityEvent.java        |   0
 .../wrapper/events/ObjectVisibilityEvent.java      |   0
 .../services/wrapper/events/ParseValueEvent.java   |   0
 .../wrapper/events/PropertyAccessEvent.java        |   0
 .../wrapper/events/PropertyModifyEvent.java        |   0
 .../wrapper/events/PropertyUsabilityEvent.java     |   0
 .../wrapper/events/PropertyVisibilityEvent.java    |   0
 .../wrapper/events/ProposedHolderEvent.java        |   0
 .../services/wrapper/events/UsabilityEvent.java    |   0
 .../services/wrapper/events/ValidityEvent.java     |   0
 .../services/wrapper/events/VisibilityEvent.java   |   0
 .../services/wrapper/events/package-info.java      |   0
 .../wrapper/listeners/InteractionAdapter.java      |   0
 .../wrapper/listeners/InteractionListener.java     |   0
 .../examples/services/wrapper/package-info.java    |   0
 .../examples/services/xactn/Transaction.java       |   0
 .../examples/services/xactn/TransactionId.java     |   0
 .../services/xactn/TransactionService.java         |   0
 .../examples/services/xactn/TransactionState.java  |   0
 .../examples/services/xactn/package-info.java      |   0
 .../services/xmlsnapshot/XmlSnapshotService.java   |   0
 .../xmlsnapshot/XmlSnapshotServiceAbstract.java    |   0
 .../services/xmlsnapshot/package-info.java         |   0
 .../reference-services-api/acceptheaderservice.png | Bin
 .../acceptheaderservice.pptx                       | Bin
 .../ErrorReportingService/kitchensink-example.png  | Bin
 .../action-invocation-published-to-stderr.png      | Bin
 .../changed-object-published-to-stderr.png         | Bin
 .../PublishingService/yuml.me-23db58a4.png         | Bin
 .../UserProfileService/todoapp.png                 | Bin
 .../images/reference-services/categories.png       | Bin
 .../images/reference-services/categories.pptx      | Bin
 .../reference-services/commands-and-events.png     | Bin
 .../reference-services/commands-and-events.pptx    | Bin
 .../main/{doc => adoc}/modules/applib-svc/nav.adoc |   0
 .../modules/applib-svc/pages/about.adoc            |   0
 .../applib-svc/pages/application-layer-api.adoc    |   0
 .../application-layer-api/BackgroundService.adoc   |   0
 .../BackgroundCommandExecution.adoc                |   0
 .../BackgroundService/Quartz.adoc                  |   0
 .../application-layer-api/CommandContext.adoc      |   0
 .../CommandExecutorService.adoc                    |   0
 .../application-layer-api/DtoMappingHelper.adoc    |   0
 .../application-layer-api/InteractionContext.adoc  |   0
 .../application-layer-api/MessageService.adoc      |   0
 .../SessionManagementService.adoc                  |   0
 .../pages/application-layer-api/TitleService.adoc  |   0
 .../application-layer-api/TransactionService.adoc  |   0
 .../application-layer-api/WrapperFactory.adoc      |   0
 .../applib-svc/pages/application-layer-spi.adoc    |   0
 .../BackgroundCommandService.adoc                  |   0
 .../application-layer-spi/CommandService.adoc      |   0
 .../application-layer-spi/HealthCheckService.adoc  |   0
 .../HomePageProviderService.adoc                   |   0
 .../applib-svc/pages/bootstrapping-spi.adoc        |   0
 .../bootstrapping-spi/ClassDiscoveryService.adoc   |   0
 .../modules/applib-svc/pages/core-domain-api.adoc  |   0
 .../pages/core-domain-api/ClockService.adoc        |   0
 .../core-domain-api/ConfigurationService.adoc      |   0
 .../pages/core-domain-api/EventBusService.adoc     |   0
 .../pages/core-domain-api/FactoryService.adoc      |   0
 .../pages/core-domain-api/Scratchpad.adoc          |   0
 .../pages/core-domain-api/UserService.adoc         |   0
 .../modules/applib-svc/pages/integration-api.adoc  |   0
 .../pages/integration-api/BookmarkService.adoc     |   0
 .../pages/integration-api/EmailService.adoc        |   0
 .../pages/integration-api/JaxbService.adoc         |   0
 .../pages/integration-api/MementoService.adoc      |   0
 .../pages/integration-api/XmlSnapshotService.adoc  |   0
 .../modules/applib-svc/pages/metadata-api.adoc     |   0
 .../metadata-api/ApplicationFeatureRepository.adoc |   0
 .../pages/metadata-api/LayoutService.adoc          |   0
 .../pages/metadata-api/MetamodelService.adoc       |   0
 .../pages/metadata-api/ServiceRegistry.adoc        |   0
 .../pages/metadata-api/SwaggerService.adoc         |   0
 .../applib-svc/pages/persistence-layer-api.adoc    |   0
 .../pages/persistence-layer-api/H2ManagerMenu.adoc |   0
 .../persistence-layer-api/HsqlDbManagerMenu.adoc   |   0
 .../persistence-layer-api/IsisJdoSupport.adoc      |   0
 .../persistence-layer-api/MetricsService.adoc      |   0
 .../persistence-layer-api/QueryResultsCache.adoc   |   0
 .../persistence-layer-api/RepositoryService.adoc   |   0
 .../applib-svc/pages/persistence-layer-spi.adoc    |   0
 .../persistence-layer-spi/AuditerService.adoc      |   0
 .../persistence-layer-spi/PublisherService.adoc    |   0
 .../UserRegistrationService.adoc                   |   0
 .../applib-svc/pages/presentation-layer-api.adoc   |   0
 .../AcceptHeaderService.adoc                       |   0
 .../presentation-layer-api/BookmarkUiService.adoc  |   0
 .../ConfigurationViewService.adoc                  |   0
 .../presentation-layer-api/DeepLinkService.adoc    |   0
 .../presentation-layer-api/GuiceBeanProvider.adoc  |   0
 .../applib-svc/pages/presentation-layer-spi.adoc   |   0
 .../ContentMappingService.adoc                     |   0
 .../EmailNotificationService.adoc                  |   0
 .../ErrorReportingService.adoc                     |   0
 .../ExceptionRecognizer.adoc                       |   0
 .../presentation-layer-spi/GridLoaderService.adoc  |   0
 .../pages/presentation-layer-spi/GridService.adoc  |   0
 .../presentation-layer-spi/GridSystemService.adoc  |   0
 .../pages/presentation-layer-spi/HintStore.adoc    |   0
 .../presentation-layer-spi/LocaleProvider.adoc     |   0
 .../MenuBarsLoaderService.adoc                     |   0
 .../presentation-layer-spi/MenuBarsService.adoc    |   0
 .../presentation-layer-spi/RoutingService.adoc     |   0
 .../SessionLoggingService.adoc                     |   0
 .../TableColumnOrderService.adoc                   |   0
 .../presentation-layer-spi/TranslationService.adoc |   0
 .../TranslationsResolver.adoc                      |   0
 .../presentation-layer-spi/UrlEncodingService.adoc |   0
 .../presentation-layer-spi/UserProfileService.adoc |   0
 .../modules/applib-svc/pages/testing.adoc          |   0
 .../pages/testing/ExecutionParametersService.adoc  |   0
 .../applib-svc/pages/testing/FixtureScripts.adoc   |   0
 .../FixtureScriptsSpecificationProvider.adoc       |   0
 .../applib-svc/pages/testing/SudoService.adoc      |   0
 .../pages/testing/SwitchUserService.adoc           |   0
 .../modules/applib-svc/partials/module-nav.adoc    |   0
 api/schema/src/main/{doc => adoc}/antora.yml       |   0
 .../reference-classes/issue-in-more-detail.png     | Bin
 .../prefixes/choices/dependent.png                 | Bin
 .../reserved/cssClass/strikethrough.png            | Bin
 .../reserved/iconName/differing.pdn                | Bin
 .../reserved/iconName/differing.png                | Bin
 .../reserved/iconName/png-files.png                | Bin
 .../modules/schema}/images/value-types/markup.png  | Bin
 .../src/main/adoc/modules/schema}/nav.adoc         |   0
 .../{doc => adoc}/modules/schema/pages/about.adoc  |   0
 .../{doc => adoc}/modules/schema/pages/aim.adoc    |   0
 .../{doc => adoc}/modules/schema/pages/chg.adoc    |   0
 .../{doc => adoc}/modules/schema/pages/cmd.adoc    |   0
 .../{doc => adoc}/modules/schema/pages/common.adoc |   0
 .../{doc => adoc}/modules/schema/pages/ixn.adoc    |   0
 .../{doc => adoc}/modules/schema/pages/mml.adoc    |   0
 .../modules/schema/partials/module-nav.adoc        |   0
 .../codegen-bytebuddy/src/main/adoc}/antora.yml    |   0
 .../main/adoc/modules/codegen-bytebuddy}/nav.adoc  |   0
 .../modules/codegen-bytebuddy/pages/about.adoc     |   0
 .../codegen-bytebuddy/partials/module-nav.adoc     |   0
 .../main/doc => commons/src/main/adoc}/antora.yml  |   0
 .../modules/commons/examples/.gitignore            |   0
 .../src/main/adoc/modules/commons}/nav.adoc        |   0
 .../{doc => adoc}/modules/commons/pages/about.adoc |   0
 .../modules/commons/partials/module-nav.adoc       |   0
 .../doc => core/config/src/main/adoc}/antora.yml   |   0
 .../modules/config/examples/generated/Other.adoc   |   0
 .../generated/isis.authentication.shiro.adoc       |   0
 .../config/examples/generated/isis.persistor.adoc  |   0
 .../generated/isis.persistor.datanucleus.adoc      |   0
 .../generated/isis.persistor.datanucleus.impl.adoc |   0
 .../config/examples/generated/isis.reflector.adoc  |   0
 .../examples/generated/isis.reflector.facet.adoc   |   0
 .../generated/isis.reflector.validator.adoc        |   0
 .../examples/generated/isis.service.email.adoc     |   0
 .../config/examples/generated/isis.services.adoc   |   0
 .../generated/isis.viewer.restfulobjects.adoc      |   0
 .../examples/generated/isis.viewer.wicket.adoc     |   0
 .../config/examples/generated/isis.viewers.adoc    |   0
 .../config/examples/generated/resteasy.adoc        |   0
 .../config/src/main/adoc/modules/config}/nav.adoc  |   0
 .../{doc => adoc}/modules/config/pages/about.adoc  |   0
 .../modules/config/pages/configuration-files.adoc  |   0
 .../config/pages/configuration-properties.adoc     |   0
 .../modules/config/pages/configuring-core.adoc     |   0
 .../modules/config/pages/deployment-types.adoc     |   0
 .../config/pages/specifying-components.adoc        |   0
 .../modules/config/partials/Other.adoc             |   0
 .../modules/config/partials/module-nav.adoc        |   0
 .../src/main/adoc}/antora.yml                      |   0
 .../src/main/adoc/modules/detached-tests}/nav.adoc |   0
 .../modules/detached-tests/pages/about.adoc        |   0
 .../detached-tests/partials/module-nav.adoc        |   0
 .../doc => metamodel/src/main/adoc}/antora.yml     |   0
 .../src/main/adoc/modules/metamodel}/nav.adoc      |   0
 .../modules/metamodel/pages/about.adoc             |   0
 .../modules/metamodel/partials/module-nav.adoc     |   0
 .../main/doc => runtime/src/main/adoc}/antora.yml  |   0
 .../src/main/adoc/modules/runtime}/nav.adoc        |   0
 .../{doc => adoc}/modules/runtime/pages/about.adoc |   0
 .../modules/runtime/partials/module-nav.adoc       |   0
 .../src/main/adoc}/antora.yml                      |   0
 .../ContentNegotiationService/accept-json.png      | Bin
 .../ContentNegotiationService/accept-xml.png       | Bin
 .../ContentNegotiationService/facade-choices.png   | Bin
 .../ContentNegotiationService/facade-choices.pptx  | Bin
 .../service-collaborations.png                     | Bin
 .../service-collaborations.pptx                    | Bin
 .../main/adoc/modules/runtime-services}/nav.adoc   |   0
 .../modules/runtime-services/pages/about.adoc      |   0
 .../runtime-services/pages/application-layer.adoc  |   0
 .../AuthenticationSessionProvider.adoc             |   0
 .../CommandDtoServiceInternal.adoc                 |   0
 .../InteractionDtoServiceInternal.adoc             |   0
 .../runtime-services/pages/persistence-layer.adoc  |   0
 .../persistence-layer/AuditingServiceInternal.adoc |   0
 .../ChangedObjectsServiceInternal.adoc             |   0
 .../PersistenceSessionServiceInternal.adoc         |   0
 .../PublishingServiceInternal.adoc                 |   0
 .../runtime-services/pages/presentation-layer.adoc |   0
 .../ContentNegotiationService.adoc                 |   0
 .../presentation-layer/RepresentationService.adoc  |   0
 .../runtime-services/partials/module-nav.adoc      |   0
 .../doc => core/security/src/main/adoc}/antora.yml |   0
 .../configure-isis-to-use-bypass.PNG               | Bin
 .../security/src/main/adoc/modules/core}/nav.adoc  |   0
 .../{doc => adoc}/modules/core/pages/about.adoc    |   0
 .../modules/core/partials/module-nav.adoc          |   0
 .../unittestsupport/src/main/adoc}/antora.yml      |   0
 .../main/adoc/modules/unittestsupport}/nav.adoc    |   0
 .../modules/unittestsupport/pages/about.adoc       |   0
 .../unittestsupport/pages/contract-tests.adoc      |   0
 .../unittestsupport/pages/jmock-extensions.adoc    |   0
 .../unittestsupport/pages/maven-configuration.adoc |   0
 .../pages/soap-fake-server-junit-rule.adoc         |   0
 .../unittestsupport/partials/module-nav.adoc       |   0
 .../main/doc => webapp/src/main/adoc}/antora.yml   |   0
 .../src/main/{doc => adoc}/modules/webapp/nav.adoc |   0
 .../{doc => adoc}/modules/webapp/pages/about.adoc  |   0
 .../modules/webapp/partials/module-nav.adoc        |   0
 .../webspringboot/src/main/adoc}/antora.yml        |   0
 .../main/adoc/modules/webboot-springboot}/nav.adoc |   0
 .../modules/webboot-springboot/pages/about.adoc    |   3 +
 .../webboot-springboot/partials/module-nav.adoc    |   1 +
 examples/demo/src/main/{doc => adoc}/antora.yml    |   0
 .../src/main/{doc => adoc}/modules/ROOT/nav.adoc   |   0
 .../{doc => adoc}/modules/ROOT/pages/about.adoc    |   0
 .../smoketests/src/main/adoc}/antora.yml           |   0
 .../main/{doc => adoc}/modules/smoketests/nav.adoc |   0
 .../modules/smoketests/pages/about.adoc            |   0
 .../modules/smoketests/partials/module-nav.adoc    |   0
 .../flywayjdo/src/main/{doc => adoc}/antora.yml    |   0
 .../main/{doc => adoc}/modules/flywayjdo/nav.adoc  |   0
 .../modules/flywayjdo/pages/about.adoc             |   0
 .../modules/flywayjdo/partials/module-nav.adoc     |   0
 .../secman/src/main/{doc => adoc}/antora.yml       |   0
 ...s-security-module-realm-with-delegate-realm.PNG | Bin
 ...iro-to-use-isisaddons-security-module-realm.PNG | Bin
 .../src/main/{doc => adoc}/modules/secman/nav.adoc |   0
 .../{doc => adoc}/modules/secman/pages/about.adoc  |   0
 .../{doc => adoc}/modules/secman/pages/api.adoc    |   0
 .../modules/secman/pages/jbcrypt-encryption.adoc   |   0
 .../modules/secman/pages/jdo-persistence.adoc      |   0
 .../{doc => adoc}/modules/secman/pages/model.adoc  |   0
 .../modules/secman/pages/shiro-realm.adoc          |   0
 .../modules/secman/partials/module-nav.adoc        |   0
 .../shiro-realm-ldap/src/main/adoc}/antora.yml     |   0
 .../modules/shiro-realm-ldap/examples/shiro.ini    |   0
 .../main/adoc/modules/shiro-realm-ldap}/nav.adoc   |   0
 .../modules/shiro-realm-ldap/pages/about.adoc      |   0
 .../shiro-realm-ldap/partials/module-nav.adoc      |   0
 .../vro/cors/src/main/{doc => adoc}/antora.yml     |   0
 .../src/main/{doc => adoc}/modules/cors/nav.adoc   |   0
 .../src/main/adoc/modules/cors}/pages/about.adoc   |   0
 .../modules/cors/partials/module-nav.adoc          |   0
 .../doc => exceldownload/src/main/adoc}/antora.yml |   0
 .../src/main/adoc/modules/exceldownload}/nav.adoc  |   0
 .../modules/exceldownload/pages/about.adoc         |   0
 .../modules/exceldownload/partials/module-nav.adoc |   0
 .../main/doc => pdfjs/src/main/adoc}/antora.yml    |   0
 .../vw/pdfjs/src/main/adoc/modules/pdfjs}/nav.adoc |   0
 .../{doc => adoc}/modules/pdfjs/pages/about.adoc   |   0
 .../modules/pdfjs/partials/module-nav.adoc         |   0
 .../core/microprofile/src/main/adoc}/antora.yml    |   2 +-
 .../src/main/adoc/modules/microprofile/nav.adoc    |   1 +
 .../adoc/modules/microprofile}/pages/about.adoc    |   5 +-
 .../modules/microprofile/partials/module-nav.adoc  |   4 +
 .../core/model/src/main/adoc}/antora.yml           |   2 +-
 .../model/src/main/adoc/modules/model/nav.adoc     |   1 +
 .../src/main/adoc/modules/model}/pages/about.adoc  |   5 +-
 .../adoc/modules/model/partials/module-nav.adoc    |   4 +
 .../core/applib/src/main/adoc}/antora.yml          |   0
 .../applib/src/main/adoc/modules/applib}/nav.adoc  |   0
 .../{doc => adoc}/modules/applib/pages/about.adoc  |   0
 .../modules/applib/partials/module-nav.adoc        |   0
 .../core/commons/src/main/adoc}/antora.yml         |   0
 .../src/main/adoc/modules/commons}/nav.adoc        |   0
 .../{doc => adoc}/modules/commons/pages/about.adoc |   0
 .../modules/commons/partials/module-nav.adoc       |   0
 .../core/runtime/src/main/{doc => adoc}/antora.yml |   0
 .../src/main/adoc/modules/runtime}/nav.adoc        |   0
 .../{doc => adoc}/modules/runtime/pages/about.adoc |   0
 .../modules/runtime/partials/module-nav.adoc       |   0
 .../restclient/src/main/adoc}/antora.yml           |   0
 .../src/main/adoc/modules/restclient}/nav.adoc     |   0
 .../modules/restclient/pages/about.adoc            |   0
 .../modules/restclient/partials/module-nav.adoc    |   0
 .../servletapi/src/main/adoc}/antora.yml           |   0
 .../src/main/adoc/modules/servletapi}/nav.adoc     |   0
 .../main/adoc}/modules/servletapi/pages/about.adoc |   0
 .../modules/servletapi/partials/module-nav.adoc    |   0
 .../doc => jaxrsclient/src/main/adoc}/antora.yml   |   0
 .../src/main/adoc/modules/jaxrsclient}/nav.adoc    |   0
 .../modules/jaxrsclient/pages/about.adoc           |   0
 .../modules/jaxrsclient/partials/module-nav.adoc   |   0
 .../main/doc => minio/src/main/adoc}/antora.yml    |   0
 .../src/main/{doc => adoc}/modules/minio/nav.adoc  |   0
 .../{doc => adoc}/modules/minio/pages/about.adoc   |   0
 .../modules/minio/partials/module-nav.adoc         |   0
 .../doc => restclient/src/main/adoc}/antora.yml    |   0
 .../main/{doc => adoc}/modules/restclient/nav.adoc |   0
 .../modules/restclient/pages/about.adoc            |   0
 .../modules/restclient/partials/module-nav.adoc    |   0
 .../main/doc => slack/src/main/adoc}/antora.yml    |   0
 .../src/main/adoc/modules/slack}/nav.adoc          |   0
 .../{doc => adoc}/modules/slack/pages/about.adoc   |   0
 .../modules/slack/partials/module-nav.adoc         |   0
 mavendeps/src/main/{doc => adoc}/antora.yml        |   0
 .../main/{doc => adoc}/modules/mavendeps/nav.adoc  |   0
 .../modules/mavendeps/pages/about.adoc             |   0
 persistence/jdo/src/main/{doc => adoc}/antora.yml  |   0
 .../images/hints-n-tips/diagnosing-n-plus-1.png    | Bin
 .../party-agreementrole-agreement.png              | Bin
 .../src/main/{doc => adoc}/modules/ROOT/nav.adoc   |   0
 .../{doc => adoc}/modules/ROOT/pages/about.adoc    |   0
 .../modules/ROOT/pages/configuring.adoc            |   0
 .../modules/ROOT/pages/configuring/bulk-load.adoc  |   0
 .../disabling-persistence-by-reachability.adoc     |   0
 .../ROOT/pages/configuring/persistence-xml.adoc    |   0
 .../modules/ROOT/pages/configuring/properties.adoc |   0
 .../pages/configuring/using-jndi-data-source.adoc  |   0
 .../modules/ROOT/pages/db-schemas.adoc             |   0
 .../modules/ROOT/pages/hints-and-tips.adoc         |   0
 .../pages/hints-and-tips/diagnosing-n-plus-1.adoc  |   0
 .../modules/ROOT/pages/hints-and-tips/java8.adoc   |   0
 .../pages/hints-and-tips/jdoql-and-timestamps.adoc |   0
 .../hints-and-tips/overriding-jdo-annotations.adoc |   0
 .../subtype-entity-not-fully-populated.adoc        |   0
 .../typesafe-queries-and-fetchgroups.adoc          |   0
 .../modules/ROOT/pages/jdo-mappings.adoc           |   0
 .../mandatory-properties-in-subtypes.adoc          |   0
 .../ROOT/pages/jdo-mappings/mapping-to-a-view.adoc |   0
 .../one-to-m-bidirectional-relationships.adoc      |   0
 .../modules/ROOT/partials/component-nav.adoc       |   0
 .../modules/ROOT/partials/module-nav.adoc          |   0
 starters/src/main/{doc => adoc}/antora.yml         |   0
 .../helloworld => adoc/modules/ROOT}/nav.adoc      |   0
 .../{doc => adoc}/modules/ROOT/pages/about.adoc    |   0
 .../main/adoc/modules/helloworld}/images/.gitkeep  |   0
 .../helloworld/images/helloworld-before-launch.png | Bin
 .../modules/helloworld/images/helloworld.png       | Bin
 .../images/using-hello-world/010-root-page.png     | Bin
 .../020-login-to-wicket-viewer.png                 | Bin
 .../images/using-hello-world/030-home-page.png     | Bin
 .../040-create-object-from-menu.png                | Bin
 .../050-create-object-from-menu-prompt.png         | Bin
 .../using-hello-world/060-created-object.png       | Bin
 .../images/using-hello-world/070-update-name.png   | Bin
 .../images/using-hello-world/080-edit-notes.png    | Bin
 .../images/using-hello-world/090-delete-object.png | Bin
 .../using-hello-world/100-object-deleted.png       | Bin
 .../200-swagger-ui-before-reload.png               | Bin
 .../using-hello-world/210-helloworld-resources.png | Bin
 .../220-create-object-thru-rest-api.png            | Bin
 .../230-create-object-thru-rest-api-response.png   | Bin
 .../240-retrieve-object-using-rest-api.png         | Bin
 ...250-retrieve-object-using-rest-api-response.png | Bin
 .../ROOT => adoc/modules/helloworld}/nav.adoc      |   0
 .../modules/helloworld/pages/about.adoc            |   0
 .../modules/simpleapp/images/dockerhub-tags.png    | Bin
 .../images/simpleapp-webapp-before-launch.png      | Bin
 .../images/simpleapp-webapp-with-fixtures.png      | Bin
 .../modules/simpleapp/images/simpleapp-webapp.png  | Bin
 .../images/using-simple-app/030-home-page.png      | Bin
 .../040-run-fixture-script-menu.png                | Bin
 .../050-run-fixture-script-prompt.png              | Bin
 .../060-run-fixture-script-result.png              | Bin
 .../images/using-simple-app/070-home-page.png      | Bin
 .../using-simple-app/structure/structure.pptx      | Bin
 .../structure/structure/Slide1.PNG                 | Bin
 .../structure/structure/Slide2.PNG                 | Bin
 .../main/{doc => adoc}/modules/simpleapp/nav.adoc  |   0
 .../modules/simpleapp/pages/about.adoc             |   0
 .../main/doc => fakedata/src/main/adoc}/antora.yml |   0
 .../src/main/adoc/modules/fakedata}/nav.adoc       |   0
 .../modules/fakedata/pages/about.adoc              |   0
 .../modules/fakedata/partials/module-nav.adoc      |   0
 .../main/doc => fixtures/src/main/adoc}/antora.yml |   0
 .../modules/fixtures/images/composite.png          | Bin
 .../modules/fixtures/images/flat-1.png             | Bin
 .../modules/fixtures/images/flat-2.png             | Bin
 .../images/organizing-fixture-scripts.pptx         | Bin
 .../fixtures/images/prompt-specifying-number.png   | Bin
 .../modules/fixtures/images/prompt.png             | Bin
 .../modules/fixtures/images/prototyping-menu.png   | Bin
 .../modules/fixtures/images/result-list.png        | Bin
 .../src/main/adoc/modules/fixtures}/nav.adoc       |   0
 .../modules/fixtures/pages/about.adoc              |   0
 .../pages/fixture-scripts/api-and-usage.adoc       |   0
 .../pages/fixture-scripts/sudo-service.adoc        |   0
 .../fixture-scripts/ticking-clock-fixture.adoc     |   0
 .../modules/fixtures/partials/module-nav.adoc      |   0
 .../doc => h2console/src/main/adoc}/antora.yml     |   0
 .../src/main/adoc/modules/h2console}/nav.adoc      |   0
 .../modules/h2console/pages/about.adoc             |   0
 .../modules/h2console/partials/module-nav.adoc     |   0
 .../doc => hsqldbmgr/src/main/adoc}/antora.yml     |   0
 .../main/{doc => adoc}/modules/hsqldbmgr/nav.adoc  |   0
 .../modules/hsqldbmgr/pages/about.adoc             |   0
 .../modules/hsqldbmgr/partials/module-nav.adoc     |   0
 .../src/main/adoc}/antora.yml                      |   0
 .../integtestsupport/images/integ-tests.png        | Bin
 .../integtestsupport/images/integ-tests.pptx       | Bin
 .../integtestsupport/images/wrapper-factory.png    | Bin
 .../main/adoc/modules/integtestsupport}/nav.adoc   |   0
 .../modules/integtestsupport/pages/about.adoc      |   0
 .../integtestsupport/pages/abstract-class.adoc     |   0
 .../integtestsupport/pages/bootstrapping.adoc      |   0
 .../pages/configuration-properties.adoc            |   0
 .../pages/maven-configuration.adoc                 |   0
 .../integtestsupport/pages/typical-usage.adoc      |   0
 .../integtestsupport/pages/wrapper-factory.adoc    |   0
 .../integtestsupport/partials/module-nav.adoc      |   0
 .../doc => specsupport/src/main/adoc}/antora.yml   |   0
 .../src/main/adoc/modules/specsupport}/nav.adoc    |   0
 .../modules/specsupport/pages/about.adoc           |   0
 .../modules/specsupport/pages/how-it-works.adoc    |   0
 .../specsupport/pages/maven-configuration.adoc     |   0
 .../specsupport/pages/writing-a-bdd-spec.adoc      |   0
 .../modules/specsupport/partials/module-nav.adoc   |   0
 .../unittestsupport/src/main/adoc}/antora.yml      |   0
 .../adoc/modules/unit-test-support-ext}/nav.adoc   |   0
 .../modules/unit-test-support-ext/pages/about.adoc |   0
 .../unit-test-support-ext/partials/module-nav.adoc |   0
 .../main/doc => asciidoc/src/main/adoc}/antora.yml |   0
 .../main/{doc => adoc}/modules/asciidoc/nav.adoc   |   0
 .../modules/asciidoc/pages/about.adoc              |   0
 .../modules/asciidoc/partials/module-nav.adoc      |   0
 .../markdown/src/main/{doc => adoc}/antora.yml     |   0
 .../src/main/adoc/modules/markdown}/nav.adoc       |   0
 .../main/adoc/modules/markdown}/pages/about.adoc   |   0
 .../modules/markdown/partials/module-nav.adoc      |   0
 .../src/main/doc => sse/src/main/adoc}/antora.yml  |   0
 .../src/main/{doc => adoc}/modules/sse/nav.adoc    |   0
 .../{doc => adoc}/modules/sse/pages/about.adoc     |   0
 .../modules/sse/partials/module-nav.adoc           |   0
 .../src/main/{doc => adoc}/antora.yml              |   0
 .../ro-spec-resources-and-representations.png      | Bin
 .../ROOT/images/rgfis}/service-collaborations.png  | Bin
 .../src/main/{doc => adoc}/modules/ROOT/nav.adoc   |   0
 .../{doc => adoc}/modules/ROOT/pages/about.adoc    |   0
 .../modules/ROOT/pages/architecture.adoc           |   0
 .../ROOT/pages/configuration-properties.adoc       |   0
 .../modules/ROOT/pages/health-check.adoc           |   0
 .../modules/ROOT/pages/hints-and-tips.adoc         |   0
 .../ROOT/pages/hints-and-tips/angular-tips.adoc    |   0
 .../ROOT/pages/hints-and-tips/pretty-printing.adoc |   0
 .../hints-and-tips/restful-image-property.adoc     |   0
 .../ROOT/pages/hints-and-tips/troubleshooting.adoc |   0
 .../hints-and-tips/using-chrome-devtools.adoc      |   0
 .../hints-and-tips/view-model-as-parameter.adoc    |   0
 .../modules/ROOT/pages/layout-resources.adoc       |   0
 .../{doc => adoc}/modules/ROOT/pages/ro-spec.adoc  |   0
 .../{doc => adoc}/modules/ROOT/pages/security.adoc |   0
 .../ROOT/pages/simplified-representations.adoc     |   0
 .../action-invocation.adoc                         |   0
 .../apache-isis-profile.adoc                       |   0
 .../configuration-properties.adoc                  |   0
 .../simplified-representations/domain-object.adoc  |   0
 .../object-collection.adoc                         |   0
 .../other-representations.adoc                     |   0
 .../modules/ROOT/partials/component-nav.adoc       |   0
 .../modules/ROOT/partials/module-nav.adoc          |   0
 .../ROOT/partials/security/user-registration.adoc  |   0
 .../modules/ROOT/partials/security/web-xml.adoc    |   0
 viewers/wicket/src/main/{doc => adoc}/antora.yml   |   0
 .../modules/ROOT/images/about-page/about-page.png  | Bin
 .../ROOT/images/application-menu/dividers.png      | Bin
 .../ROOT/images/application-menu/layout-menus.pdn  | Bin
 .../ROOT/images/application-menu/layout-menus.png  | Bin
 .../ROOT/images/application-menu/tertiary.png      | Bin
 .../blob-attachments/010-attachment-field-940.png  | Bin
 .../blob-attachments/010-attachment-field.png      | Bin
 .../blob-attachments/020-edit-choose-file-940.png  | Bin
 .../blob-attachments/020-edit-choose-file.png      | Bin
 .../030-choose-file-using-browser-520.png          | Bin
 .../030-choose-file-using-browser.png              | Bin
 .../040-edit-chosen-file-indicated-940.png         | Bin
 .../040-edit-chosen-file-indicated.png             | Bin
 .../050-ok-if-image-then-rendered-940.png          | Bin
 .../050-ok-if-image-then-rendered.png              | Bin
 .../images/blob-attachments/060-download-940.png   | Bin
 .../ROOT/images/blob-attachments/060-download.png  | Bin
 .../images/blob-attachments/070-edit-clear-940.png | Bin
 .../images/blob-attachments/070-edit-clear.png     | Bin
 .../ROOT/images/bookmarked-pages/panel-940.png     | Bin
 .../images/bookmarked-pages/panel-estatio-940.png  | Bin
 .../ROOT/images/bookmarked-pages/panel-estatio.png | Bin
 .../modules/ROOT/images/bookmarked-pages/panel.png | Bin
 .../ROOT/images/brand-logo/brand-logo-signin.png   | Bin
 .../modules/ROOT/images/brand-logo/brand-logo.png  | Bin
 .../images/copy-link/010-copy-link-button-940.png  | Bin
 .../ROOT/images/copy-link/010-copy-link-button.png | Bin
 .../images/copy-link/020-copy-link-dialog-940.png  | Bin
 .../ROOT/images/copy-link/020-copy-link-dialog.png | Bin
 .../ROOT/images/copy-link/030-hints-940.png        | Bin
 .../modules/ROOT/images/copy-link/030-hints.png    | Bin
 .../copy-link/040-copy-link-with-hints-940.png     | Bin
 .../images/copy-link/040-copy-link-with-hints.png  | Bin
 .../ROOT/images/copy-link/050-title-url-940.png    | Bin
 .../ROOT/images/copy-link/050-title-url.png        | Bin
 .../modules/ROOT/images/dialog-mode/modal.png      | Bin
 .../modules/ROOT/images/dialog-mode/sidebar.png    | Bin
 .../ROOT/images/embedded-view/no-footer.png        | Bin
 .../images/embedded-view/no-header-no-footer.png   | Bin
 .../ROOT/images/embedded-view/no-header.png        | Bin
 .../modules/ROOT/images/embedded-view/regular.png  | Bin
 .../images/features/recent-pages/recent-pages.png  | Bin
 .../object-titles-and-icons/cust-order-product.png | Bin
 .../images/layout-dynamic-xml/ToDoAppDashboard.png | Bin
 .../ROOT/images/layout-dynamic-xml/ToDoItem.png    | Bin
 .../modules/ROOT/images/layouts/customer-order.png | Bin
 .../ROOT/images/layouts/estatio-Invoice.png        | Bin
 .../modules/ROOT/images/layouts/estatio-Lease.png  | Bin
 .../ROOT/images/layouts/estatio-LeaseItem.png      | Bin
 .../ROOT/images/layouts/todoapp-ToDoItem.png       | Bin
 .../modules/ROOT/images/menubars/010-download.png  | Bin
 .../modules/ROOT/images/menubars/020-download.png  | Bin
 .../ROOT/images/reference-layout/4-0-8-0.png       | Bin
 .../ROOT/images/reference-layout/4-4-4-12.png      | Bin
 .../ROOT/images/reference-layout/6-6-0-12.png      | Bin
 .../reference-layout/isis-layout-show-facets.css   |   0
 .../ROOT/images/reference-layout/isis-layout.css   |   0
 .../images/reference-layout/layout-4-0-8-0.html    |   0
 .../images/reference-layout/layout-4-4-4-12.html   |   0
 .../images/reference-layout/layout-6-6-0-12.html   |   0
 .../login-page-default.png                         | Bin
 .../login-page-suppress-password-reset.png         | Bin
 .../suppress-remember-me}/login-page-default.png   | Bin
 .../login-page-suppress-remember-me.png            | Bin
 .../suppress-sign-up}/login-page-default.png       | Bin
 .../login-page-suppress-sign-up.png                | Bin
 .../ROOT/images/theme-chooser/example-1.png        | Bin
 .../ROOT/images/theme-chooser/example-2.png        | Bin
 .../user-registration}/login-page-default.png      | Bin
 .../sign-up-after-registration.png                 | Bin
 .../sign-up-email-with-verification-link.png       | Bin
 .../sign-up-login-page-after-sign-up.png           | Bin
 .../ROOT/images/user-registration/sign-up-page.png | Bin
 .../sign-up-registration-page.png                  | Bin
 .../ROOT/images/where-am-i/hello_grey_bg.png       | Bin
 .../wicket/src/main/adoc/modules/ROOT}/nav.adoc    |   0
 .../{doc => adoc}/modules/ROOT/pages/about.adoc    |   0
 .../ROOT/pages/configuration-properties.adoc       |   0
 .../modules/ROOT/pages/customisation.adoc          |   0
 .../ROOT/pages/customisation/about-page.adoc       |   0
 .../ROOT/pages/customisation/auto-refresh.adoc     |   0
 .../ROOT/pages/customisation/brand-logo.adoc       |   0
 .../customisation/cheap-n-cheerful-theme.adoc      |   0
 .../pages/customisation/custom-javascript.adoc     |   0
 .../pages/customisation/request-parameters.adoc    |   0
 .../pages/customisation/top-level-index-page.adoc  |   0
 .../pages/customisation/tweaking-css-classes.adoc  |   0
 .../customisation/using-different-css-file.adoc    |   0
 .../ROOT/pages/customisation/welcome-page.adoc     |   0
 .../modules/ROOT/pages/extending.adoc              |   0
 .../pages/extending/custom-bootstrap-theme.adoc    |   0
 .../modules/ROOT/pages/extending/custom-pages.adoc |   0
 .../login-via-query-args-prototyping.adoc          |   0
 .../pages/extending/replacing-page-elements.adoc   |   0
 .../{doc => adoc}/modules/ROOT/pages/features.adoc |   0
 .../ROOT/pages/features/blob-attachments.adoc      |   0
 .../ROOT/pages/features/bookmarked-pages.adoc      |   0
 .../ROOT/pages/features/hints-and-copy-url.adoc    |   0
 .../modules/ROOT/pages/features/recent-pages.adoc  |   0
 .../pages/features/sidebar-vs-modal-dialogs.adoc   |   0
 .../ROOT/pages/features/titles-in-tables.adoc      |   0
 .../ROOT/pages/features/user-registration.adoc     |   0
 .../modules/ROOT/pages/features/where-am-i.adoc    |   0
 .../modules/ROOT/pages/hints-and-tips.adoc         |   0
 .../hints-and-tips/highlight-current-row.adoc      |   0
 .../i18n-label-in-wicket-viewer.adoc               |   0
 .../ROOT/pages/hints-and-tips/per-user-themes.adoc |   0
 .../ROOT/pages/hints-and-tips/svg-support.adoc     |   0
 .../modules/ROOT/pages/incode-platform.adoc        |   0
 .../{doc => adoc}/modules/ROOT/pages/layout.adoc   |   0
 .../ROOT/pages/layout/annotation-based.adoc        |   0
 .../modules/ROOT/pages/layout/file-based.adoc      |   0
 .../modules/ROOT/pages/layout/table-columns.adoc   |   0
 .../modules/ROOT/pages/menubars-layout.adoc        |   0
 .../pages/menubars-layout/annotation-based.adoc    |   0
 .../ROOT/pages/menubars-layout/file-based.adoc     |   0
 .../{doc => adoc}/modules/ROOT/pages/security.adoc |   0
 .../modules/ROOT/partials/component-nav.adoc       |   0
 .../modules/ROOT/partials/module-nav.adoc          |   0
 .../modules/ROOT/partials/security/pages.adoc      |   0
 .../ROOT/partials/security/user-registration.adoc  |   0
 1247 files changed, 346 insertions(+), 128 deletions(-)

diff --git a/antora/playbooks/site-core.yml b/antora/playbooks/site-core.yml
index 93d14c2..f4d0d65 100644
--- a/antora/playbooks/site-core.yml
+++ b/antora/playbooks/site-core.yml
@@ -17,30 +17,37 @@ content:
 
 # core
     - url: .
-      start_path: core/codegen-bytebuddy/src/main/doc # core
+      start_path: core/codegen-bytebuddy/src/main/adoc # core
       branches: HEAD
     - url: .
-      start_path: core/commons/src/main/doc # core
+      start_path: core/commons/src/main/adoc # core
       branches: HEAD
     - url: .
-      start_path: core/detached-tests/src/main/doc # core
+      start_path: core/detached-tests/src/main/adoc # core
       branches: HEAD
     - url: .
-      start_path: core/metamodel/src/main/doc # core
+      start_path: core/metamodel/src/main/adoc # core
       branches: HEAD
     - url: .
-      start_path: core/runtime/src/main/doc # core
+      start_path: core/runtime/src/main/adoc # core
       branches: HEAD
     - url: .
+<<<<<<< HEAD
       start_path: core/runtimeservices/src/main/doc # core
+=======
+      start_path: core/webspringboot/src/main/adoc # core
       branches: HEAD
     - url: .
-      start_path: core/webapp/src/main/doc # core
+      start_path: core/runtimeservices/src/main/adoc # core
+>>>>>>> ISIS-2062: moves src/main/doc to src/main/adoc
+      branches: HEAD
+    - url: .
+      start_path: core/webapp/src/main/adoc # core
       branches: HEAD
 
 # examples
     - url: .
-      start_path: examples/smoketests/src/main/doc # core
+      start_path: examples/smoketests/src/main/adoc # core
       branches: HEAD
 
 ui:
diff --git a/antora/playbooks/site-extensions.yml b/antora/playbooks/site-extensions.yml
index b776e44..a8bb75b 100644
--- a/antora/playbooks/site-extensions.yml
+++ b/antora/playbooks/site-extensions.yml
@@ -17,39 +17,39 @@ content:
 
 # extensions
     - url: .
-      start_path: extensions/persistence/flywayjdo/src/main/doc # extensions
+      start_path: extensions/persistence/flywayjdo/src/main/adoc # extensions
       branches: HEAD
 
     - url: .
-      start_path: extensions/security/secman/src/main/doc # security
+      start_path: extensions/security/secman/src/main/adoc # security
       branches: HEAD
     - url: .
-      start_path: extensions/security/secman/api/src/main/doc # security
+      start_path: extensions/security/secman/api/src/main/adoc # security
       branches: HEAD
     - url: .
-      start_path: extensions/security/secman/encryption-jbcrypt/src/main/doc # security
+      start_path: extensions/security/secman/encryption-jbcrypt/src/main/adoc # security
       branches: HEAD
     - url: .
-      start_path: extensions/security/secman/model/src/main/doc # security
+      start_path: extensions/security/secman/model/src/main/adoc # security
       branches: HEAD
     - url: .
-      start_path: extensions/security/secman/persistence-jdo/src/main/doc # security
+      start_path: extensions/security/secman/persistence-jdo/src/main/adoc # security
       branches: HEAD
     - url: .
-      start_path: extensions/security/secman/shiro-realm/src/main/doc # security
+      start_path: extensions/security/secman/shiro-realm/src/main/adoc # security
       branches: HEAD
     - url: .
-      start_path: extensions/security/shiro-realm-ldap/src/main/doc # security
+      start_path: extensions/security/shiro-realm-ldap/src/main/adoc # security
       branches: HEAD
 
     - url: .
-      start_path: extensions/vro/cors/src/main/doc # vro
+      start_path: extensions/vro/cors/src/main/adoc # vro
       branches: HEAD
     - url: .
-      start_path: extensions/vw/exceldownload/src/main/doc # vw
+      start_path: extensions/vw/exceldownload/src/main/adoc # vw
       branches: HEAD
     - url: .
-      start_path: extensions/vw/pdfjs/src/main/doc # vw
+      start_path: extensions/vw/pdfjs/src/main/adoc # vw
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-incubator.yml b/antora/playbooks/site-incubator.yml
index 52a389f..4d111a8 100644
--- a/antora/playbooks/site-incubator.yml
+++ b/antora/playbooks/site-incubator.yml
@@ -17,10 +17,17 @@ content:
 
 # incubator
     - url: .
+<<<<<<< HEAD
       start_path: incubator/core/model/src/main/doc # incubator
       branches: HEAD
     - url: .
       start_path: incubator/mappings/microprofile/src/main/doc # incubator
+=======
+      start_path: incubator/extensions/core/model/src/main/adoc # incubator
+      branches: HEAD
+    - url: .
+      start_path: incubator/extensions/core/microprofile/src/main/adoc # incubator
+>>>>>>> ISIS-2062: moves src/main/doc to src/main/adoc
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-legacy.yml b/antora/playbooks/site-legacy.yml
index 47e6b91..8d038eb 100644
--- a/antora/playbooks/site-legacy.yml
+++ b/antora/playbooks/site-legacy.yml
@@ -17,19 +17,19 @@ content:
 
 # legacy
     - url: .
-      start_path: legacy/extensions/core/applib/src/main/doc # legacy
+      start_path: legacy/extensions/core/applib/src/main/adoc # legacy
       branches: HEAD
     - url: .
-      start_path: legacy/extensions/core/commons/src/main/doc # legacy
+      start_path: legacy/extensions/core/commons/src/main/adoc # legacy
       branches: HEAD
     - url: .
-      start_path: legacy/extensions/core/runtime/src/main/doc # legacy
+      start_path: legacy/extensions/core/runtime/src/main/adoc # legacy
       branches: HEAD
     - url: .
-      start_path: legacy/mappings/restclient/src/main/doc # legacy
+      start_path: legacy/mappings/restclient/src/main/adoc # legacy
       branches: HEAD
     - url: .
-      start_path: legacy/subdomains/servletapi/impl/src/main/doc # legacy
+      start_path: legacy/subdomains/servletapi/impl/src/main/adoc # legacy
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-mappings.yml b/antora/playbooks/site-mappings.yml
index 1feefeb..ab3d81c 100644
--- a/antora/playbooks/site-mappings.yml
+++ b/antora/playbooks/site-mappings.yml
@@ -17,16 +17,16 @@ content:
 
     # mappings
     - url: .
-      start_path: mappings/jaxrsclient/src/main/doc # mappings
+      start_path: mappings/jaxrsclient/src/main/adoc # mappings
       branches: HEAD
     - url: .
-      start_path: mappings/minio/src/main/doc # mappings
+      start_path: mappings/minio/src/main/adoc # mappings
       branches: HEAD
     - url: .
-      start_path: mappings/restclient/src/main/doc # mappings
+      start_path: mappings/restclient/src/main/adoc # mappings
       branches: HEAD
     - url: .
-      start_path: mappings/slack/src/main/doc # mappings
+      start_path: mappings/slack/src/main/adoc # mappings
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-pjdo.yml b/antora/playbooks/site-pjdo.yml
index 22b98bc..035583f 100644
--- a/antora/playbooks/site-pjdo.yml
+++ b/antora/playbooks/site-pjdo.yml
@@ -13,7 +13,7 @@ content:
 
 # core
     - url: .
-      start_path: persistence/jdo/src/main/doc # pjdo
+      start_path: persistence/jdo/src/main/adoc # pjdo
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-refguide.yml b/antora/playbooks/site-refguide.yml
index 5fcad68..8157431 100644
--- a/antora/playbooks/site-refguide.yml
+++ b/antora/playbooks/site-refguide.yml
@@ -17,15 +17,15 @@ content:
 
 # api
     - url: .
-      start_path: api/applib/src/main/doc # refguide
+      start_path: api/applib/src/main/adoc # refguide
       branches: HEAD
     - url: .
-      start_path: api/schema/src/main/doc # refguide
+      start_path: api/schema/src/main/adoc # refguide
       branches: HEAD
 
 # core
     - url: .
-      start_path: core/config/src/main/doc # refguide
+      start_path: core/config/src/main/adoc # refguide
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-security.yml b/antora/playbooks/site-security.yml
index 24c5818..1a7ec2e 100644
--- a/antora/playbooks/site-security.yml
+++ b/antora/playbooks/site-security.yml
@@ -17,26 +17,26 @@ content:
 
 # core
     - url: .
-      start_path: core/security/src/main/doc # security
+      start_path: core/security/src/main/adoc # security
       branches: HEAD
 
 # security
     - url: .
-      start_path: security/bypass/src/main/doc # security
+      start_path: security/bypass/src/main/adoc # security
       branches: HEAD
     - url: .
-      start_path: security/shiro/src/main/doc # security
+      start_path: security/shiro/src/main/adoc # security
       branches: HEAD
     - url: .
-      start_path: security/keycloak/src/main/doc # security
+      start_path: security/keycloak/src/main/adoc # security
       branches: HEAD
 
 # extensions
     - url: .
-      start_path: extensions/security/secman/src/main/doc # security
+      start_path: extensions/security/secman/src/main/adoc # security
       branches: HEAD
     - url: .
-      start_path: extensions/security/shiro-realm-ldap/src/main/doc # security
+      start_path: extensions/security/shiro-realm-ldap/src/main/adoc # security
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index d491273..f2a0621 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -17,31 +17,31 @@ content:
 
     # subdomains
     - url: .
-      start_path: subdomains/base/src/main/doc # subdomains
+      start_path: subdomains/base/src/main/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/docx/src/main/doc # subdomains
+      start_path: subdomains/docx/src/main/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/excel/src/main/doc # subdomains
+      start_path: subdomains/excel/src/main/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/freemarker/src/main/doc # subdomains
+      start_path: subdomains/freemarker/src/main/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/ognl/src/main/doc # subdomains
+      start_path: subdomains/ognl/src/main/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/pdfbox/src/main/doc # subdomains
+      start_path: subdomains/pdfbox/src/main/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/spring/src/main/doc # subdomains
+      start_path: subdomains/spring/src/main/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/xdocreport/src/main/doc # subdomains
+      start_path: subdomains/xdocreport/src/main/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/zip/src/main/doc # subdomains
+      start_path: subdomains/zip/src/main/adoc # subdomains
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-testing.yml b/antora/playbooks/site-testing.yml
index fd0499d..49fb3d1 100644
--- a/antora/playbooks/site-testing.yml
+++ b/antora/playbooks/site-testing.yml
@@ -17,30 +17,30 @@ content:
 
 # core
     - url: .
-      start_path: core/unittestsupport/src/main/doc # testing
+      start_path: core/unittestsupport/src/main/adoc # testing
       branches: HEAD
 
 # testing
     - url: .
-      start_path: testing/fakedata/src/main/doc # testing
+      start_path: testing/fakedata/src/main/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/fixtures/src/main/doc # testing
+      start_path: testing/fixtures/src/main/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/h2console/src/main/doc # testing
+      start_path: testing/h2console/src/main/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/hsqldbmgr/impl/src/main/doc # testing
+      start_path: testing/hsqldbmgr/impl/src/main/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/integtestsupport/src/main/doc # testing
+      start_path: testing/integtestsupport/src/main/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/specsupport/src/main/doc # testing
+      start_path: testing/specsupport/src/main/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/unittestsupport/src/main/doc # testing
+      start_path: testing/unittestsupport/src/main/adoc # testing
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-toc.yml b/antora/playbooks/site-toc.yml
index 1ce43e4..74e27f7 100644
--- a/antora/playbooks/site-toc.yml
+++ b/antora/playbooks/site-toc.yml
@@ -13,12 +13,12 @@ content:
 
 # starters
     - url: .
-      start_path: starters/src/main/doc # toc
+      start_path: starters/src/main/adoc # toc
       branches: HEAD
 
 # mavendeps
     - url: .
-      start_path: mavendeps/src/main/doc # toc
+      start_path: mavendeps/src/main/adoc # toc
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-valuetypes.yml b/antora/playbooks/site-valuetypes.yml
index 8684020..6b42a13 100644
--- a/antora/playbooks/site-valuetypes.yml
+++ b/antora/playbooks/site-valuetypes.yml
@@ -17,13 +17,13 @@ content:
 
     # valuetypes
     - url: .
-      start_path: valuetypes/asciidoc/src/main/doc # vw
+      start_path: valuetypes/asciidoc/src/main/adoc # vw
       branches: HEAD
     - url: .
-      start_path: valuetypes/markdown/src/main/doc # vw
+      start_path: valuetypes/markdown/src/main/adoc # vw
       branches: HEAD
     - url: .
-      start_path: valuetypes/sse/src/main/doc # vw
+      start_path: valuetypes/sse/src/main/adoc # vw
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-vro.yml b/antora/playbooks/site-vro.yml
index 2fd06f4..f838515 100644
--- a/antora/playbooks/site-vro.yml
+++ b/antora/playbooks/site-vro.yml
@@ -13,18 +13,18 @@ content:
 
 # core
     - url: .
-      start_path: viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc # vro
+      start_path: viewers/restfulobjects/jaxrs-resteasy-4/src/main/adoc # vro
       branches: HEAD
     - url: .
-      start_path: viewers/restfulobjects/src/main/doc # vro
+      start_path: viewers/restfulobjects/src/main/adoc # vro
       branches: HEAD
 
 # extensions
     - url: .
-      start_path: extensions/vro/cors/src/main/doc # vro
+      start_path: extensions/vro/cors/src/main/adoc # vro
       branches: HEAD
     - url: .
-      start_path: extensions/vro/restclient/src/main/doc # vro
+      start_path: extensions/vro/restclient/src/main/adoc # vro
       branches: HEAD
 
 
diff --git a/antora/playbooks/site-vw.yml b/antora/playbooks/site-vw.yml
index e6749d8..b0de651 100644
--- a/antora/playbooks/site-vw.yml
+++ b/antora/playbooks/site-vw.yml
@@ -13,7 +13,7 @@ content:
 
 # core
     - url: .
-      start_path: core/viewers/wicket/src/main/doc # vw
+      start_path: core/viewers/wicket/src/main/adoc # vw
       branches: HEAD
 
 
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index e9bb2c8..0c401d1 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -47,207 +47,221 @@ content:
 
 # api
     - url: .
-      start_path: api/applib/src/main/doc # refguide
+      start_path: api/applib/src/main/adoc # refguide
       branches: HEAD
     - url: .
-      start_path: api/schema/src/main/doc # refguide
+      start_path: api/schema/src/main/adoc # refguide
       branches: HEAD
 
 # core
     - url: .
-      start_path: core/codegen-bytebuddy/src/main/doc # core
+      start_path: core/codegen-bytebuddy/src/main/adoc # core
       branches: HEAD
     - url: .
-      start_path: core/commons/src/main/doc # core
+      start_path: core/commons/src/main/adoc # core
       branches: HEAD
     - url: .
-      start_path: core/config/src/main/doc # refguide
+      start_path: core/config/src/main/adoc # refguide
       branches: HEAD
     - url: .
-      start_path: core/detached-tests/src/main/doc # core
+      start_path: core/detached-tests/src/main/adoc # core
       branches: HEAD
     - url: .
-      start_path: core/metamodel/src/main/doc # core
+      start_path: core/metamodel/src/main/adoc # core
       branches: HEAD
     - url: .
-      start_path: persistence/jdo/src/main/doc # pjdo
+      start_path: persistence/jdo/src/main/adoc # pjdo
       branches: HEAD
     - url: .
-      start_path: core/runtime/src/main/doc # core
+      start_path: core/runtime/src/main/adoc # core
       branches: HEAD
     - url: .
+<<<<<<< HEAD
       start_path: core/runtimeservices/src/main/doc # core
+=======
+      start_path: core/webspringboot/src/main/adoc # core
       branches: HEAD
     - url: .
-      start_path: core/webapp/src/main/doc # core
+      start_path: core/runtimeservices/src/main/adoc # core
+>>>>>>> ISIS-2062: moves src/main/doc to src/main/adoc
       branches: HEAD
     - url: .
-      start_path: core/security/src/main/doc # security
+      start_path: core/webapp/src/main/adoc # core
       branches: HEAD
     - url: .
-      start_path: core/unittestsupport/src/main/doc # testing
+      start_path: core/security/src/main/adoc # security
       branches: HEAD
     - url: .
-      start_path: viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc # vro
+      start_path: core/unittestsupport/src/main/adoc # testing
       branches: HEAD
     - url: .
-      start_path: viewers/restfulobjects/src/main/doc # vro
+      start_path: viewers/restfulobjects/jaxrs-resteasy-4/src/main/adoc # vro
       branches: HEAD
     - url: .
-      start_path: viewers/wicket/src/main/doc # vw
+      start_path: viewers/restfulobjects/src/main/adoc # vro
+      branches: HEAD
+    - url: .
+      start_path: viewers/wicket/src/main/adoc # vw
       branches: HEAD
 
 # examples
     - url: .
-      start_path: examples/demo/src/main/doc # demoapp
+      start_path: examples/demo/src/main/adoc # demoapp
       branches: HEAD
     - url: .
-      start_path: examples/smoketests/src/main/doc # core
+      start_path: examples/smoketests/src/main/adoc # core
       branches: HEAD
 
 # extensions
     - url: .
-      start_path: extensions/persistence/jdo/flywayjdo/src/main/doc # extensions
+      start_path: extensions/persistence/jdo/flywayjdo/src/main/adoc # extensions
       branches: HEAD
 
     - url: .
-      start_path: extensions/security/secman/src/main/doc # security
+      start_path: extensions/security/secman/src/main/adoc # security
       branches: HEAD
     - url: .
-      start_path: extensions/security/shiro-realm-ldap/src/main/doc # security
+      start_path: extensions/security/shiro-realm-ldap/src/main/adoc # security
       branches: HEAD
 
     - url: .
-      start_path: extensions/vro/cors/src/main/doc # vro
+      start_path: extensions/vro/cors/src/main/adoc # vro
       branches: HEAD
     - url: .
-      start_path: extensions/vw/exceldownload/src/main/doc # vw
+      start_path: extensions/vw/exceldownload/src/main/adoc # vw
       branches: HEAD
     - url: .
-      start_path: extensions/vw/pdfjs/src/main/doc # vw
+      start_path: extensions/vw/pdfjs/src/main/adoc # vw
       branches: HEAD
 
 # incubator
     - url: .
+<<<<<<< HEAD
       start_path: incubator/core/model/src/main/doc # incubator
       branches: HEAD
     - url: .
       start_path: incubator/mappings/microprofile/src/main/doc # incubator
+=======
+      start_path: incubator/extensions/core/model/src/main/adoc # incubator
+      branches: HEAD
+    - url: .
+      start_path: incubator/extensions/core/microprofile/src/main/adoc # incubator
+>>>>>>> ISIS-2062: moves src/main/doc to src/main/adoc
       branches: HEAD
 
 # legacy
     - url: .
-      start_path: legacy/extensions/core/applib/src/main/doc # legacy
+      start_path: legacy/extensions/core/applib/src/main/adoc # legacy
       branches: HEAD
     - url: .
-      start_path: legacy/extensions/core/commons/src/main/doc # legacy
+      start_path: legacy/extensions/core/commons/src/main/adoc # legacy
       branches: HEAD
     - url: .
-      start_path: legacy/extensions/core/runtime/src/main/doc # legacy
+      start_path: legacy/extensions/core/runtime/src/main/adoc # legacy
       branches: HEAD
     - url: .
-      start_path: legacy/mappings/restclient/src/main/doc # legacy
+      start_path: legacy/mappings/restclient/src/main/adoc # legacy
       branches: HEAD
     - url: .
-      start_path: legacy/subdomains/servletapi/impl/src/main/doc # legacy
+      start_path: legacy/subdomains/servletapi/impl/src/main/adoc # legacy
       branches: HEAD
 
 # mappings
     - url: .
-      start_path: mappings/jaxrsclient/src/main/doc # mappings
+      start_path: mappings/jaxrsclient/src/main/adoc # mappings
       branches: HEAD
     - url: .
-      start_path: mappings/minio/src/main/doc # mappings
+      start_path: mappings/minio/src/main/adoc # mappings
       branches: HEAD
     - url: .
-      start_path: mappings/restclient/src/main/doc # mappings
+      start_path: mappings/restclient/src/main/adoc # mappings
       branches: HEAD
     - url: .
-      start_path: mappings/slack/src/main/doc # mappings
+      start_path: mappings/slack/src/main/adoc # mappings
       branches: HEAD
 
 # mavendeps
     - url: .
-      start_path: mavendeps/src/main/doc # toc
+      start_path: mavendeps/src/main/adoc # toc
       branches: HEAD
 
 # security
     - url: .
-      start_path: security/bypass/src/main/doc # security
+      start_path: security/bypass/src/main/adoc # security
       branches: HEAD
     - url: .
-      start_path: security/shiro/src/main/doc # security
+      start_path: security/shiro/src/main/adoc # security
       branches: HEAD
     - url: .
-      start_path: security/keycloak/src/main/doc # security
+      start_path: security/keycloak/src/main/adoc # security
       branches: HEAD
 
 # starters
     - url: .
-      start_path: starters/src/main/doc # toc
+      start_path: starters/src/main/adoc # toc
       branches: HEAD
 
 # subdomains
     - url: .
-      start_path: subdomains/base/src/main/doc # subdomains
+      start_path: subdomains/base/src/main/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/docx/src/main/doc # subdomains
+      start_path: subdomains/docx/src/main/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/excel/src/main/doc # subdomains
+      start_path: subdomains/excel/src/main/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/freemarker/src/main/doc # subdomains
+      start_path: subdomains/freemarker/src/main/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/ognl/src/main/doc # subdomains
+      start_path: subdomains/ognl/src/main/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/pdfbox/src/main/doc # subdomains
+      start_path: subdomains/pdfbox/src/main/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/spring/src/main/doc # subdomains
+      start_path: subdomains/spring/src/main/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/xdocreport/src/main/doc # subdomains
+      start_path: subdomains/xdocreport/src/main/adoc # subdomains
       branches: HEAD
     - url: .
-      start_path: subdomains/zip/src/main/doc # subdomains
+      start_path: subdomains/zip/src/main/adoc # subdomains
       branches: HEAD
 
 # testing
     - url: .
-      start_path: testing/fakedata/src/main/doc # testing
+      start_path: testing/fakedata/src/main/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/fixtures/src/main/doc # testing
+      start_path: testing/fixtures/src/main/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/h2console/src/main/doc # testing
+      start_path: testing/h2console/src/main/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/hsqldbmgr/src/main/doc # testing
+      start_path: testing/hsqldbmgr/src/main/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/integtestsupport/src/main/doc # testing
+      start_path: testing/integtestsupport/src/main/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/specsupport/src/main/doc # testing
+      start_path: testing/specsupport/src/main/adoc # testing
       branches: HEAD
     - url: .
-      start_path: testing/unittestsupport/src/main/doc # testing
+      start_path: testing/unittestsupport/src/main/adoc # testing
       branches: HEAD
 
 # valuetypes
     - url: .
-      start_path: valuetypes/asciidoc/src/main/doc # vw
+      start_path: valuetypes/asciidoc/src/main/adoc # vw
       branches: HEAD
     - url: .
-      start_path: valuetypes/markdown/src/main/doc # vw
+      start_path: valuetypes/markdown/src/main/adoc # vw
       branches: HEAD
     - url: .
-      start_path: valuetypes/sse/src/main/doc # vw
+      start_path: valuetypes/sse/src/main/adoc # vw
       branches: HEAD
 
 ui:
diff --git a/core/config/src/main/doc/antora.yml b/api/applib/src/main/adoc/antora.yml
similarity index 100%
rename from core/config/src/main/doc/antora.yml
rename to api/applib/src/main/adoc/antora.yml
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples.sh b/api/applib/src/main/adoc/modules/applib-ant/examples.sh
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples.sh
rename to api/applib/src/main/adoc/modules/applib-ant/examples.sh
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Action.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Action.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Action.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Action.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/ActionLayout.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/ActionLayout.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/ActionLayout.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/ActionLayout.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Auditing.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Auditing.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Auditing.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Auditing.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/BookmarkPolicy.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/BookmarkPolicy.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/BookmarkPolicy.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/BookmarkPolicy.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Bounding.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Bounding.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Bounding.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Bounding.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Collection.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Collection.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Collection.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Collection.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/CollectionLayout.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/CollectionLayout.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/CollectionLayout.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/CollectionLayout.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/CommandExecuteIn.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/CommandExecuteIn.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/CommandExecuteIn.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/CommandExecuteIn.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/CommandPersistence.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/CommandPersistence.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/CommandPersistence.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/CommandPersistence.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/CommandReification.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/CommandReification.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/CommandReification.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/CommandReification.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Constants.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Constants.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Constants.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Constants.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Contributed.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Contributed.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Contributed.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Contributed.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Defaulted.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Defaulted.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainObject.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainObject.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainObject.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainObject.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainObjectLayout.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainObjectLayout.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainObjectLayout.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainObjectLayout.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainService.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainService.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainService.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainServiceLayout.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainServiceLayout.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/DomainServiceLayout.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainServiceLayout.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Editing.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Editing.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Editing.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Editing.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/EqualByContent.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/EqualByContent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/EqualByContent.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/EqualByContent.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Facets.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Facets.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Facets.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Facets.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/HomePage.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/HomePage.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/HomePage.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/HomePage.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/LabelPosition.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/LabelPosition.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/LabelPosition.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/LabelPosition.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/MemberOrder.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/MemberOrder.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/MemberOrder.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/MemberOrder.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/MementoSerialization.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/MementoSerialization.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/MementoSerialization.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/MementoSerialization.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/MinLength.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/MinLength.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/MinLength.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/MinLength.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Mixin.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Mixin.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Mixin.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Mixin.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Module.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Module.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Module.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Module.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Nature.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Nature.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Nature.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Nature.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/NatureOfService.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/NatureOfService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/NatureOfService.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/NatureOfService.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Navigable.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Navigable.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Navigable.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Navigable.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Optionality.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Optionality.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Optionality.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Optionality.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/OrderPrecedence.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/OrderPrecedence.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/OrderPrecedence.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/OrderPrecedence.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Parameter.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Parameter.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Parameter.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Parameter.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/ParameterLayout.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/ParameterLayout.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/ParameterLayout.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/ParameterLayout.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Programmatic.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Programmatic.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Programmatic.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Programmatic.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Projecting.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Projecting.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Projecting.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Projecting.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/PromptStyle.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/PromptStyle.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/PromptStyle.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/PromptStyle.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Property.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Property.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Property.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Property.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/PropertyLayout.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/PropertyLayout.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/PropertyLayout.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/PropertyLayout.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Publishing.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Publishing.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Publishing.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Publishing.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/PublishingChangeKind.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/PublishingChangeKind.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/PublishingChangeKind.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/PublishingChangeKind.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Redirect.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Redirect.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Redirect.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Redirect.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/RenderDay.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/RenderDay.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/RenderDay.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/RenderDay.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Repainting.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Repainting.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Repainting.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Repainting.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/RestrictTo.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/RestrictTo.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/RestrictTo.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/RestrictTo.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/SemanticsOf.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/SemanticsOf.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/SemanticsOf.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/SemanticsOf.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Title.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Title.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Title.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Title.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Value.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Value.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/ViewModel.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/ViewModel.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/ViewModel.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/ViewModel.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/ViewModelLayout.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/ViewModelLayout.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/ViewModelLayout.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/ViewModelLayout.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Where.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Where.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/Where.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Where.java
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/package-info.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/examples/annotation/package-info.java
rename to api/applib/src/main/adoc/modules/applib-ant/examples/annotation/package-info.java
diff --git a/starters/src/main/doc/modules/helloworld/images/.gitkeep b/api/applib/src/main/adoc/modules/applib-ant/images/.gitkeep
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/.gitkeep
rename to api/applib/src/main/adoc/modules/applib-ant/images/.gitkeep
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainObjectLayout/bookmarking.png b/api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/ActionLayout/bookmarking.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainObjectLayout/bookmarking.png
rename to api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/ActionLayout/bookmarking.png
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-BELOW.png b/api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/ActionLayout/position-BELOW.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-BELOW.png
rename to api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/ActionLayout/position-BELOW.png
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL.png b/api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL.png
rename to api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL.png
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png b/api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png
rename to api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-RIGHT.png b/api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/ActionLayout/position-RIGHT.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-RIGHT.png
rename to api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/ActionLayout/position-RIGHT.png
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/CollectionLayout/sortedby-dependencies.png b/api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/CollectionLayout/sortedby-dependencies.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/CollectionLayout/sortedby-dependencies.png
rename to api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/CollectionLayout/sortedby-dependencies.png
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png b/api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png
rename to api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/bookmarking.png b/api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/DomainObjectLayout/bookmarking.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/bookmarking.png
rename to api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/DomainObjectLayout/bookmarking.png
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-primary.png b/api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-primary.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-primary.png
rename to api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-primary.png
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png b/api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png
rename to api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png b/api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png
rename to api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuOrder.png b/api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuOrder.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuOrder.png
rename to api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuOrder.png
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/HomePage/HomePage.png b/api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/HomePage/HomePage.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/HomePage/HomePage.png
rename to api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/HomePage/HomePage.png
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png b/api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png
rename to api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-NONE.png b/api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-NONE.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-NONE.png
rename to api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-NONE.png
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-TOP.png b/api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-TOP.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-TOP.png
rename to api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-TOP.png
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png b/api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png
rename to api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png b/api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png
rename to api/applib/src/main/adoc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png
diff --git a/core/config/src/main/doc/modules/config/nav.adoc b/api/applib/src/main/adoc/modules/applib-ant/nav.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/nav.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/nav.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Action.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Action.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Action.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Action.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Action/associateWith.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Action/associateWith.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Action/associateWith.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Action/associateWith.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Action/command.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Action/command.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Action/command.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Action/command.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Action/domainEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Action/domainEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Action/domainEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Action/domainEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Action/hidden.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Action/hidden.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Action/hidden.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Action/hidden.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Action/invokeOn.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Action/invokeOn.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Action/invokeOn.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Action/invokeOn.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Action/publishing.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Action/publishing.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Action/publishing.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Action/publishing.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Action/restrictTo.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Action/restrictTo.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Action/restrictTo.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Action/restrictTo.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Action/semantics.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Action/semantics.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Action/semantics.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Action/semantics.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Action/typeOf.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Action/typeOf.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Action/typeOf.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Action/typeOf.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/bookmarking.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/bookmarking.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/bookmarking.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/bookmarking.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/contributedAs.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/contributedAs.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/contributedAs.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/contributedAs.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/cssClass.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/cssClass.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/cssClass.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/cssClass.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/cssClassFa.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/cssClassFa.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/cssClassFa.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/cssClassFa.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/describedAs.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/describedAs.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/describedAs.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/describedAs.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/hidden.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/hidden.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/hidden.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/hidden.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/named.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/named.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/named.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/named.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/position.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/position.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/position.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/position.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/promptStyle.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/promptStyle.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/promptStyle.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/promptStyle.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/redirect.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/redirect.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/redirect.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ActionLayout/redirect.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Collection.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Collection.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Collection.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Collection.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Collection/domainEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Collection/domainEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Collection/domainEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Collection/domainEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Collection/editing.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Collection/editing.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Collection/editing.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Collection/editing.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Collection/hidden.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Collection/hidden.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Collection/hidden.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Collection/hidden.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Collection/notPersisted.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Collection/notPersisted.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Collection/notPersisted.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Collection/notPersisted.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Collection/typeOf.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Collection/typeOf.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Collection/typeOf.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Collection/typeOf.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/cssClass.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout/cssClass.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/cssClass.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout/cssClass.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/defaultView.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout/defaultView.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/defaultView.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout/defaultView.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/describedAs.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout/describedAs.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/describedAs.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout/describedAs.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/hidden.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout/hidden.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/hidden.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout/hidden.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/named.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout/named.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/named.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout/named.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/paged.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout/paged.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/paged.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout/paged.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/sortedBy.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout/sortedBy.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/sortedBy.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/CollectionLayout/sortedBy.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Column.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Column.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Column.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Column.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Digits.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Digits.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Digits.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Digits.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Discriminator.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Discriminator.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Discriminator.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Discriminator.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/actionDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/actionDomainEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/actionDomainEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/actionDomainEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/auditing.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/auditing.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/auditing.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/auditing.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/autoCompleteRepository.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/autoCompleteRepository.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/autoCompleteRepository.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/autoCompleteRepository.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/bounding.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/bounding.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/bounding.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/bounding.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/collectionDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/collectionDomainEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/collectionDomainEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/collectionDomainEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/createdLifecycleEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/createdLifecycleEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/createdLifecycleEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/createdLifecycleEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/editing.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/editing.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/editing.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/editing.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/loadedLifecycleEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/loadedLifecycleEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/loadedLifecycleEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/loadedLifecycleEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/mixinMethod.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/mixinMethod.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/mixinMethod.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/mixinMethod.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/nature.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/nature.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/nature.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/nature.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/objectType.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/objectType.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/objectType.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/objectType.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/persistedLifecycleEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/persistedLifecycleEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/persistedLifecycleEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/persistedLifecycleEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/persistingLifecycleEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/persistingLifecycleEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/persistingLifecycleEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/persistingLifecycleEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/propertyDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/propertyDomainEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/propertyDomainEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/propertyDomainEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/publishing.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/publishing.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/publishing.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/publishing.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/removingLifecycleEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/removingLifecycleEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/removingLifecycleEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/removingLifecycleEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/updatedLifecycleEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/updatedLifecycleEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/updatedLifecycleEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/updatedLifecycleEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/updatingLifecycleEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/updatingLifecycleEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObject/updatingLifecycleEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObject/updatingLifecycleEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/bookmarking.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/bookmarking.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/bookmarking.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/bookmarking.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClass.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/cssClass.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClass.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/cssClass.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClassFa.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/cssClassFa.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClassFa.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/cssClassFa.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClassUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/cssClassUiEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClassUiEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/cssClassUiEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/describedAs.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/describedAs.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/describedAs.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/describedAs.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/iconUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/iconUiEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/iconUiEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/iconUiEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/layoutUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/layoutUiEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/layoutUiEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/layoutUiEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/named.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/named.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/named.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/named.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/paged.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/paged.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/paged.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/paged.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/plural.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/plural.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/plural.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/plural.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/titleUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/titleUiEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/titleUiEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainObjectLayout/titleUiEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainService.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainService.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainService/nature.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainService/nature.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainService/nature.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainService/nature.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainService/objectType.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainService/objectType.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainService/objectType.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainService/objectType.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainService/repositoryFor.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainService/repositoryFor.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainService/repositoryFor.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainService/repositoryFor.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainServiceLayout.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainServiceLayout.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/menuBar.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainServiceLayout/menuBar.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/menuBar.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainServiceLayout/menuBar.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/menuOrder.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainServiceLayout/menuOrder.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/menuOrder.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainServiceLayout/menuOrder.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/named.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainServiceLayout/named.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/named.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/DomainServiceLayout/named.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Facets.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Facets.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Facets.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Facets.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/HomePage.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/HomePage.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/HomePage.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/HomePage.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Inject.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Inject.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Inject.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Inject.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/MemberGroupLayout.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/MemberGroupLayout.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/MemberGroupLayout.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/MemberGroupLayout.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/MemberOrder.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/MemberOrder.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/MemberOrder.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/MemberOrder.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/MemberOrder/name.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/MemberOrder/name.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/MemberOrder/name.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/MemberOrder/name.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/MemberOrder/sequence.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/MemberOrder/sequence.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/MemberOrder/sequence.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/MemberOrder/sequence.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/MinLength.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/MinLength.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/MinLength.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/MinLength.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Mixin.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Mixin.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Mixin.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Mixin.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Mixin/method.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Mixin/method.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Mixin/method.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Mixin/method.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/NotPersistent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/NotPersistent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/NotPersistent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/NotPersistent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Nullable.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Nullable.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Nullable.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Nullable.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Parameter.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Parameter.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Parameter.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Parameter.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Parameter/fileAccept.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Parameter/fileAccept.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Parameter/fileAccept.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Parameter/fileAccept.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Parameter/maxLength.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Parameter/maxLength.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Parameter/maxLength.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Parameter/maxLength.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Parameter/mustSatisfy.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Parameter/mustSatisfy.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Parameter/mustSatisfy.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Parameter/mustSatisfy.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Parameter/optionality.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Parameter/optionality.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Parameter/optionality.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Parameter/optionality.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Parameter/regexPattern.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Parameter/regexPattern.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Parameter/regexPattern.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Parameter/regexPattern.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/cssClass.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout/cssClass.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/cssClass.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout/cssClass.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/describedAs.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout/describedAs.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/describedAs.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout/describedAs.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/labelPosition.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout/labelPosition.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/labelPosition.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout/labelPosition.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/multiLine.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout/multiLine.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/multiLine.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout/multiLine.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/named.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout/named.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/named.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout/named.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/renderedAsDayBefore.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout/renderedAsDayBefore.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/renderedAsDayBefore.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout/renderedAsDayBefore.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/typicalLength.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout/typicalLength.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/typicalLength.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ParameterLayout/typicalLength.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Pattern.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Pattern.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Pattern.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Pattern.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/PersistenceCapable.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PersistenceCapable.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/PersistenceCapable.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/PersistenceCapable.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/PostConstruct.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PostConstruct.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/PostConstruct.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/PostConstruct.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/PreDestroy.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PreDestroy.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/PreDestroy.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/PreDestroy.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/PrimaryKey.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PrimaryKey.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/PrimaryKey.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/PrimaryKey.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Programmatic.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Programmatic.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Programmatic.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Programmatic.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Property.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Property.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Property.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Property.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Property/command.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Property/command.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Property/command.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Property/command.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Property/domainEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Property/domainEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Property/domainEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Property/domainEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Property/editing.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Property/editing.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Property/editing.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Property/editing.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Property/fileAccept.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Property/fileAccept.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Property/fileAccept.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Property/fileAccept.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Property/hidden.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Property/hidden.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Property/hidden.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Property/hidden.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Property/maxLength.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Property/maxLength.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Property/maxLength.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Property/maxLength.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Property/mustSatisfy.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Property/mustSatisfy.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Property/mustSatisfy.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Property/mustSatisfy.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Property/notPersisted.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Property/notPersisted.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Property/notPersisted.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Property/notPersisted.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Property/optionality.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Property/optionality.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Property/optionality.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Property/optionality.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Property/projecting.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Property/projecting.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Property/projecting.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Property/projecting.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Property/publishing.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Property/publishing.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Property/publishing.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Property/publishing.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Property/regexPattern.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Property/regexPattern.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Property/regexPattern.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Property/regexPattern.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/cssClass.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/cssClass.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/cssClass.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/cssClass.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/describedAs.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/describedAs.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/describedAs.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/describedAs.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/hidden.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/hidden.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/hidden.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/hidden.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/labelPosition.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/labelPosition.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/labelPosition.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/labelPosition.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/multiLine.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/multiLine.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/multiLine.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/multiLine.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/named.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/named.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/named.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/named.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/navigable.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/navigable.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/navigable.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/navigable.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/promptStyle.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/promptStyle.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/promptStyle.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/promptStyle.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/renderedAsDayBefore.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/renderedAsDayBefore.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/renderedAsDayBefore.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/renderedAsDayBefore.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/typicalLength.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/typicalLength.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/typicalLength.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/typicalLength.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/unchanging.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/unchanging.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/unchanging.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/PropertyLayout/unchanging.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/RequestScoped.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/RequestScoped.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/RequestScoped.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/RequestScoped.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/Title.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/Title.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/Title.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/Title.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ViewModel.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ViewModel.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ViewModel.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ViewModel.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ViewModel/objectType.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ViewModel/objectType.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ViewModel/objectType.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ViewModel/objectType.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/bookmarking.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/bookmarking.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/bookmarking.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/bookmarking.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClass.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/cssClass.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClass.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/cssClass.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClassFa.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/cssClassFa.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClassFa.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/cssClassFa.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClassUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/cssClassUiEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClassUiEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/cssClassUiEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/describedAs.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/describedAs.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/describedAs.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/describedAs.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/iconUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/iconUiEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/iconUiEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/iconUiEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/layoutUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/layoutUiEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/layoutUiEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/layoutUiEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/named.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/named.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/named.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/named.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/paged.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/paged.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/paged.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/paged.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/plural.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/plural.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/plural.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/plural.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/titleUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/titleUiEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/titleUiEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/ViewModelLayout/titleUiEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/XmlJavaTypeAdapter.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/XmlJavaTypeAdapter.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/XmlJavaTypeAdapter.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/XmlJavaTypeAdapter.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/XmlRootElement.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/XmlRootElement.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/XmlRootElement.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/XmlRootElement.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/about.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/about.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/about.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/about.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/about/jdo.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/about/jdo.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/about/jdo.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/about/jdo.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/about/jee.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/about/jee.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/about/jee.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/about/jee.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/about/main.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/about/main.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/about/main.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/about/main.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/about/other.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/about/other.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/about/other.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/about/other.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/pages/about/partial.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/about/partial.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/pages/about/partial.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/pages/about/partial.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/partials/module-nav.adoc b/api/applib/src/main/adoc/modules/applib-ant/partials/module-nav.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/partials/module-nav.adoc
rename to api/applib/src/main/adoc/modules/applib-ant/partials/module-nav.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples.sh b/api/applib/src/main/adoc/modules/applib-cm/examples.sh
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples.sh
rename to api/applib/src/main/adoc/modules/applib-cm/examples.sh
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/clock/Clock.java b/api/applib/src/main/adoc/modules/applib-cm/examples/clock/Clock.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/clock/Clock.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/clock/Clock.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/clock/package-info.java b/api/applib/src/main/adoc/modules/applib-cm/examples/clock/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/clock/package-info.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/clock/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java b/api/applib/src/main/adoc/modules/applib-cm/examples/domain/DomainObjectList.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/domain/DomainObjectList.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/ActionArgumentUsabilityEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/ActionArgumentUsabilityEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/ActionArgumentUsabilityEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/ActionArgumentUsabilityEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/ActionArgumentVisibilityEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/ActionArgumentVisibilityEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/ActionArgumentVisibilityEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/ActionArgumentVisibilityEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/ActionDomainEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/ActionDomainEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/domain/ActionDomainEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/ActionDomainEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/CollectionDomainEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/CollectionDomainEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/domain/CollectionDomainEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/CollectionDomainEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/EventObjectBase.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/EventObjectBase.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/domain/EventObjectBase.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/EventObjectBase.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/PropertyDomainEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/PropertyDomainEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/domain/PropertyDomainEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/domain/PropertyDomainEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/AbstractLifecycleEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/AbstractLifecycleEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/AbstractLifecycleEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/AbstractLifecycleEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectCreatedEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectCreatedEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectCreatedEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectCreatedEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectLoadedEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectLoadedEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectLoadedEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectLoadedEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectPersistedEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectPersistedEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectPersistedEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectPersistedEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectPersistingEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectPersistingEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectPersistingEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectPersistingEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectRemovingEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectRemovingEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectRemovingEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectRemovingEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatedEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatedEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatedEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatedEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatingEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatingEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatingEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/lifecycle/ObjectUpdatingEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/CssClassUiEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/CssClassUiEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/ui/CssClassUiEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/CssClassUiEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/IconUiEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/IconUiEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/ui/IconUiEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/IconUiEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/LayoutUiEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/LayoutUiEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/ui/LayoutUiEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/LayoutUiEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/TitleUiEvent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/TitleUiEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/events/ui/TitleUiEvent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/events/ui/TitleUiEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/ActionLayoutData.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutData.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/ActionLayoutData.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutData.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ActionLayoutDataOwner.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutDataOwner.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutDataOwner.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutDataOwner.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/CollectionLayoutDataOwner.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/DomainObjectLayoutData.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/DomainObjectLayoutData.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/DomainObjectLayoutData.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/DomainObjectLayoutData.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/DomainObjectLayoutDataOwner.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/DomainObjectLayoutDataOwner.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/DomainObjectLayoutDataOwner.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/DomainObjectLayoutDataOwner.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSet.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSet.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSetOwner.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSetOwner.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSetOwner.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/FieldSetOwner.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasBookmarking.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasBookmarking.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasBookmarking.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasBookmarking.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasCssClass.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasCssClass.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasCssClass.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasCssClass.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasCssClassFa.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasCssClassFa.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasCssClassFa.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasCssClassFa.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasDescribedAs.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasDescribedAs.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasDescribedAs.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasDescribedAs.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasHidden.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasHidden.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasHidden.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasHidden.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasNamed.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasNamed.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/HasNamed.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/HasNamed.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/MemberRegion.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/MemberRegion.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/MemberRegion.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/MemberRegion.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/MemberRegionOwner.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/MemberRegionOwner.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/MemberRegionOwner.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/MemberRegionOwner.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/Owned.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/Owned.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/Owned.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/Owned.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/Owner.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/Owner.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/Owner.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/Owner.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/ServiceActionLayoutData.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ServiceActionLayoutData.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/ServiceActionLayoutData.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ServiceActionLayoutData.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/ServiceActionLayoutDataOwner.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ServiceActionLayoutDataOwner.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/ServiceActionLayoutDataOwner.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/ServiceActionLayoutDataOwner.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/package-info.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/component/package-info.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/component/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/Grid.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/Grid.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/Grid.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/Grid.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/GridAbstract.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/GridAbstract.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFix.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFix.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFix.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFix.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixHidden.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixHidden.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixHidden.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixHidden.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixVisible.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixVisible.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixVisible.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ClearFixVisible.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Element.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Element.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Element.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Element.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ElementAbstract.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ElementAbstract.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ElementAbstract.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3ElementAbstract.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContent.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContent.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContent.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContentOwner.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContentOwner.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContentOwner.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowContentOwner.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowOwner.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowOwner.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowOwner.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3RowOwner.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroupOwner.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroupOwner.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroupOwner.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroupOwner.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabOwner.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabOwner.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabOwner.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabOwner.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/HasCssId.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/HasCssId.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/HasCssId.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/HasCssId.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/Size.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/Size.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/Size.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/Size.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/SizeSpan.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/SizeSpan.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/SizeSpan.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/SizeSpan.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/WithinGrid.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/WithinGrid.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/WithinGrid.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/WithinGrid.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/package-info.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/package-info.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/grid/bootstrap3/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/links/Link.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/links/Link.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/links/Link.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/links/Link.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/links/package-info.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/links/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/links/package-info.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/links/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/Menu.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/Menu.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/Menu.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/Menu.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBar.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuBar.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBar.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuBar.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBars.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuBars.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBars.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuBars.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuSection.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuSection.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuSection.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/MenuSection.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/package-info.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/package-info.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/menubars/bootstrap3/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/package-info.java b/api/applib/src/main/adoc/modules/applib-cm/examples/layout/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/layout/package-info.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/layout/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/MixinConstants.java b/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/MixinConstants.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/mixins/MixinConstants.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/mixins/MixinConstants.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto.java b/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/Dto.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/Dto.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/DtoMappingHelper.java b/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/DtoMappingHelper.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/DtoMappingHelper.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/DtoMappingHelper.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXml.java b/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/Dto_downloadXml.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXml.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/Dto_downloadXml.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java b/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/package-info.java b/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/package-info.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/mixins/dto/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/layout/Object_downloadLayoutXml.java b/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/layout/Object_downloadLayoutXml.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/mixins/layout/Object_downloadLayoutXml.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/mixins/layout/Object_downloadLayoutXml.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/layout/Object_openRestApi.java b/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/layout/Object_openRestApi.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/mixins/layout/Object_openRestApi.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/mixins/layout/Object_openRestApi.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/layout/Object_rebuildMetamodel.java b/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/layout/Object_rebuildMetamodel.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/mixins/layout/Object_rebuildMetamodel.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/mixins/layout/Object_rebuildMetamodel.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/metamodel/Object_downloadMetaModelXml.java b/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_downloadMetaModelXml.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/mixins/metamodel/Object_downloadMetaModelXml.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_downloadMetaModelXml.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/metamodel/Object_objectIdentifier.java b/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_objectIdentifier.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/mixins/metamodel/Object_objectIdentifier.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_objectIdentifier.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/metamodel/Object_objectType.java b/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_objectType.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/mixins/metamodel/Object_objectType.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_objectType.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedAt.java b/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedAt.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedAt.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedAt.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedBy.java b/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedBy.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedBy.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/HoldsUpdatedBy.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/Timestampable.java b/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/Timestampable.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/Timestampable.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/Timestampable.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/package-info.java b/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/mixins/timestamp/package-info.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/mixins/timestamp/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/security/RoleMemento.java b/api/applib/src/main/adoc/modules/applib-cm/examples/security/RoleMemento.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/security/RoleMemento.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/security/RoleMemento.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/security/UserMemento.java b/api/applib/src/main/adoc/modules/applib-cm/examples/security/UserMemento.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/security/UserMemento.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/security/UserMemento.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/security/package-info.java b/api/applib/src/main/adoc/modules/applib-cm/examples/security/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/security/package-info.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/security/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification.java b/api/applib/src/main/adoc/modules/applib-cm/examples/spec/AbstractSpecification.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/spec/AbstractSpecification.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification2.java b/api/applib/src/main/adoc/modules/applib-cm/examples/spec/AbstractSpecification2.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification2.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/spec/AbstractSpecification2.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/spec/Specification.java b/api/applib/src/main/adoc/modules/applib-cm/examples/spec/Specification.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/spec/Specification.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/spec/Specification.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/spec/Specification2.java b/api/applib/src/main/adoc/modules/applib-cm/examples/spec/Specification2.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/spec/Specification2.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/spec/Specification2.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/spec/SpecificationAnd.java b/api/applib/src/main/adoc/modules/applib-cm/examples/spec/SpecificationAnd.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/spec/SpecificationAnd.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/spec/SpecificationAnd.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/spec/SpecificationNot.java b/api/applib/src/main/adoc/modules/applib-cm/examples/spec/SpecificationNot.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/spec/SpecificationNot.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/spec/SpecificationNot.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/spec/SpecificationOr.java b/api/applib/src/main/adoc/modules/applib-cm/examples/spec/SpecificationOr.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/spec/SpecificationOr.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/spec/SpecificationOr.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/spec/package-info.java b/api/applib/src/main/adoc/modules/applib-cm/examples/spec/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/spec/package-info.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/spec/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java b/api/applib/src/main/adoc/modules/applib-cm/examples/tree/LazyTreeNode.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/tree/LazyTreeNode.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeAdapter.java b/api/applib/src/main/adoc/modules/applib-cm/examples/tree/TreeAdapter.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeAdapter.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/tree/TreeAdapter.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode.java b/api/applib/src/main/adoc/modules/applib-cm/examples/tree/TreeNode.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/tree/TreeNode.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode_iteratorBreadthFirst.java b/api/applib/src/main/adoc/modules/applib-cm/examples/tree/TreeNode_iteratorBreadthFirst.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode_iteratorBreadthFirst.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/tree/TreeNode_iteratorBreadthFirst.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode_iteratorDepthFirst.java b/api/applib/src/main/adoc/modules/applib-cm/examples/tree/TreeNode_iteratorDepthFirst.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode_iteratorDepthFirst.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/tree/TreeNode_iteratorDepthFirst.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode_iteratorHierarchyUp.java b/api/applib/src/main/adoc/modules/applib-cm/examples/tree/TreeNode_iteratorHierarchyUp.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode_iteratorHierarchyUp.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/tree/TreeNode_iteratorHierarchyUp.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreePath.java b/api/applib/src/main/adoc/modules/applib-cm/examples/tree/TreePath.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/tree/TreePath.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/tree/TreePath.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreePath_Default.java b/api/applib/src/main/adoc/modules/applib-cm/examples/tree/TreePath_Default.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/tree/TreePath_Default.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/tree/TreePath_Default.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeState.java b/api/applib/src/main/adoc/modules/applib-cm/examples/tree/TreeState.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeState.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/tree/TreeState.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeState_Default.java b/api/applib/src/main/adoc/modules/applib-cm/examples/tree/TreeState_Default.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeState_Default.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/tree/TreeState_Default.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/Enums.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/Enums.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/Enums.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/Enums.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/Equality.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/Equality.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/Equality.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/Equality.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/Hashing.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/Hashing.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/Hashing.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/Hashing.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbAdapters.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/JaxbAdapters.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbAdapters.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/JaxbAdapters.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbUtil.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/JaxbUtil.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbUtil.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/JaxbUtil.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Empty.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContract_Empty.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Empty.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContract_Empty.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Impl.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContract_Impl.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Impl.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContract_Impl.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Parser.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContract_Parser.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Parser.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContract_Parser.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContracts.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContracts.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContracts.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/ObjectContracts.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/ReasonBuffer.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/ReasonBuffer.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer2.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/ReasonBuffer2.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer2.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/ReasonBuffer2.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/Reasons.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/Reasons.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/Reasons.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/Reasons.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/TitleBuffer.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/TitleBuffer.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/TitleBuffer.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/TitleBuffer.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/TitleBufferException.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/TitleBufferException.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/TitleBufferException.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/TitleBufferException.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/ToString.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/ToString.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/ToString.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/ToString.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/ZipWriter.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/ZipWriter.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/ZipWriter.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/ZipWriter.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/package-info.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/package-info.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java b/api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/value/Blob.java b/api/applib/src/main/adoc/modules/applib-cm/examples/value/Blob.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/value/Blob.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/value/Blob.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/value/BlobClobFactory.java b/api/applib/src/main/adoc/modules/applib-cm/examples/value/BlobClobFactory.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/value/BlobClobFactory.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/value/BlobClobFactory.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/value/Clob.java b/api/applib/src/main/adoc/modules/applib-cm/examples/value/Clob.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/value/Clob.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/value/Clob.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/value/Image.java b/api/applib/src/main/adoc/modules/applib-cm/examples/value/Image.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/value/Image.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/value/Image.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/value/LocalResourcePath.java b/api/applib/src/main/adoc/modules/applib-cm/examples/value/LocalResourcePath.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/value/LocalResourcePath.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/value/LocalResourcePath.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/value/Markup.java b/api/applib/src/main/adoc/modules/applib-cm/examples/value/Markup.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/value/Markup.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/value/Markup.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/value/NamedWithMimeType.java b/api/applib/src/main/adoc/modules/applib-cm/examples/value/NamedWithMimeType.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/value/NamedWithMimeType.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/value/NamedWithMimeType.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/value/Password.java b/api/applib/src/main/adoc/modules/applib-cm/examples/value/Password.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/value/Password.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/value/Password.java
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/value/package-info.java b/api/applib/src/main/adoc/modules/applib-cm/examples/value/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/examples/value/package-info.java
rename to api/applib/src/main/adoc/modules/applib-cm/examples/value/package-info.java
diff --git a/api/schema/src/main/doc/modules/schema/images/reference-classes/issue-in-more-detail.png b/api/applib/src/main/adoc/modules/applib-cm/images/reference-classes/issue-in-more-detail.png
similarity index 100%
rename from api/schema/src/main/doc/modules/schema/images/reference-classes/issue-in-more-detail.png
rename to api/applib/src/main/adoc/modules/applib-cm/images/reference-classes/issue-in-more-detail.png
diff --git a/api/schema/src/main/doc/modules/schema/images/reference-methods/prefixes/choices/dependent.png b/api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/prefixes/choices/dependent.png
similarity index 100%
rename from api/schema/src/main/doc/modules/schema/images/reference-methods/prefixes/choices/dependent.png
rename to api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/prefixes/choices/dependent.png
diff --git a/api/schema/src/main/doc/modules/schema/images/reference-methods/reserved/cssClass/strikethrough.png b/api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/cssClass/strikethrough.png
similarity index 100%
rename from api/schema/src/main/doc/modules/schema/images/reference-methods/reserved/cssClass/strikethrough.png
rename to api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/cssClass/strikethrough.png
diff --git a/api/schema/src/main/doc/modules/schema/images/reference-methods/reserved/iconName/differing.pdn b/api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.pdn
similarity index 100%
rename from api/schema/src/main/doc/modules/schema/images/reference-methods/reserved/iconName/differing.pdn
rename to api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.pdn
diff --git a/api/schema/src/main/doc/modules/schema/images/reference-methods/reserved/iconName/differing.png b/api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.png
similarity index 100%
rename from api/schema/src/main/doc/modules/schema/images/reference-methods/reserved/iconName/differing.png
rename to api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.png
diff --git a/api/schema/src/main/doc/modules/schema/images/reference-methods/reserved/iconName/png-files.png b/api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/iconName/png-files.png
similarity index 100%
rename from api/schema/src/main/doc/modules/schema/images/reference-methods/reserved/iconName/png-files.png
rename to api/applib/src/main/adoc/modules/applib-cm/images/reference-methods/reserved/iconName/png-files.png
diff --git a/api/schema/src/main/doc/modules/schema/images/value-types/markup.png b/api/applib/src/main/adoc/modules/applib-cm/images/value-types/markup.png
similarity index 100%
rename from api/schema/src/main/doc/modules/schema/images/value-types/markup.png
rename to api/applib/src/main/adoc/modules/applib-cm/images/value-types/markup.png
diff --git a/api/schema/src/main/doc/modules/schema/nav.adoc b/api/applib/src/main/adoc/modules/applib-cm/nav.adoc
similarity index 100%
rename from api/schema/src/main/doc/modules/schema/nav.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/nav.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/about.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/about.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/about.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/about.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest2-bootstrapping.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/AppManifest2-bootstrapping.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest2-bootstrapping.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/AppManifest2-bootstrapping.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/contributee.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/contributee.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/contributee.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/contributee.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasTransactionId.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/contributee/HasTransactionId.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasTransactionId.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/contributee/HasTransactionId.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/AbstractDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/AbstractDomainEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/AbstractDomainEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/AbstractDomainEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/ActionDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/ActionDomainEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/ActionDomainEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/ActionDomainEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/CollectionDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/CollectionDomainEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/CollectionDomainEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/CollectionDomainEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/PropertyDomainEvent.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/PropertyDomainEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/PropertyDomainEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/domainevent/PropertyDomainEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/i18n.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/i18n.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/i18n.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/i18n.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/i18n/TranslatableString.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/i18n/TranslatableString.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/i18n/TranslatableString.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/i18n/TranslatableString.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/layout.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/layout.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/layout.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/layout.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/menubars.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/menubars.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/menubars.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/menubars.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/mixins.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/mixins.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Dto.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins/Dto.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Dto.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins/Dto.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Object.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins/Object.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Object.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins/Object.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Persistable.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins/Persistable.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Persistable.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/mixins/Persistable.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/roles.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/roles.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/roles/HoldsUpdatedAt.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles/HoldsUpdatedAt.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/roles/HoldsUpdatedAt.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles/HoldsUpdatedAt.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/roles/HoldsUpdatedBy.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles/HoldsUpdatedBy.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/roles/HoldsUpdatedBy.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles/HoldsUpdatedBy.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/roles/Timestampable.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles/Timestampable.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/roles/Timestampable.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/roles/Timestampable.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/spec.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/spec.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/spec.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/spec.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/super.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/super.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/super.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/super.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractService.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/super/AbstractService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractService.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/super/AbstractService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractViewModel.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/super/AbstractViewModel.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractViewModel.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/super/AbstractViewModel.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScript.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/super/FixtureScript.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScript.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/super/FixtureScript.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScripts.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/super/FixtureScripts.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScripts.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/super/FixtureScripts.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/uievent.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/uievent.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/CssClassUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent/CssClassUiEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/CssClassUiEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent/CssClassUiEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/IconUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent/IconUiEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/IconUiEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent/IconUiEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/TitleUiEvent.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent/TitleUiEvent.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/TitleUiEvent.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/uievent/TitleUiEvent.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/utility.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/utility.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/utility/Enums.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility/Enums.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/utility/Enums.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility/Enums.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/utility/ObjectContracts.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility/ObjectContracts.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/utility/ObjectContracts.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility/ObjectContracts.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/utility/Reasons.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility/Reasons.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/utility/Reasons.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility/Reasons.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/utility/TitleBuffer.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility/TitleBuffer.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/utility/TitleBuffer.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/utility/TitleBuffer.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Blob.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types/Blob.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Blob.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types/Blob.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Clob.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types/Clob.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Clob.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types/Clob.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Color.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types/Color.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Color.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types/Color.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Markup.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types/Markup.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Markup.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types/Markup.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Money.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types/Money.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Money.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types/Money.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Password.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types/Password.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Password.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/classes/value-types/Password.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/created.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/created.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/created.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/created.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/jdo-api.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/jdo-api.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/jdo-api.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/jdo-api.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/loaded.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/loaded.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/loaded.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/loaded.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/persisted.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/persisted.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/persisted.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/persisted.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/persisting.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/persisting.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/persisting.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/persisting.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/removed.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/removed.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/removed.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/removed.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/removing.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/removing.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/removing.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/removing.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/updated.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/updated.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/updated.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/updated.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/updating.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/updating.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/updating.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/lifecycle/updating.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/addTo.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/addTo.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/addTo.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/addTo.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/autoComplete.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/autoComplete.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/autoComplete.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/autoComplete.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/choices.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/choices.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/choices.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/choices.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/clear.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/clear.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/clear.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/clear.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/default.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/default.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/default.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/default.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/disable.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/disable.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/disable.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/disable.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/get.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/get.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/get.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/get.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/hide.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/hide.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/hide.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/hide.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/modify.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/modify.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/modify.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/modify.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/removeFrom.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/removeFrom.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/removeFrom.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/removeFrom.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/set.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/set.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/set.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/set.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validate.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/validate.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validate.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/validate.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validateAddTo.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/validateAddTo.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validateAddTo.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/validateAddTo.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validateRemoveFrom.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/validateRemoveFrom.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validateRemoveFrom.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/prefixes/validateRemoveFrom.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/cssClass.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/cssClass.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/cssClass.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/cssClass.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/disable.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/disable.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/disable.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/disable.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/getId.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/getId.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/getId.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/getId.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/hide.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/hide.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/hide.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/hide.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/iconName.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/iconName.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/iconName.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/iconName.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/layout.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/layout.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/layout.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/layout.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/title.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/title.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/title.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/title.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/validate.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/validate.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/validate.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/methods/reserved/validate.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/pages/rgcms.adoc b/api/applib/src/main/adoc/modules/applib-cm/pages/rgcms.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/pages/rgcms.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/pages/rgcms.adoc
diff --git a/api/applib/src/main/doc/modules/applib-cm/partials/module-nav.adoc b/api/applib/src/main/adoc/modules/applib-cm/partials/module-nav.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/partials/module-nav.adoc
rename to api/applib/src/main/adoc/modules/applib-cm/partials/module-nav.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples.sh b/api/applib/src/main/adoc/modules/applib-svc/examples.sh
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples.sh
rename to api/applib/src/main/adoc/modules/applib-svc/examples.sh
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/HasUniqueId.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/HasUniqueId.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/HasUniqueId.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/HasUniqueId.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/HasUsername.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/HasUsername.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/HasUsername.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/HasUsername.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/RepresentsInteractionMemberExecution.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/RepresentsInteractionMemberExecution.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/RepresentsInteractionMemberExecution.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/RepresentsInteractionMemberExecution.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/WithTransactionScope.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/WithTransactionScope.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/WithTransactionScope.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/WithTransactionScope.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/acceptheader/AcceptHeaderService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/acceptheader/AcceptHeaderService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/acceptheader/AcceptHeaderService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/acceptheader/AcceptHeaderService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationFeatureRepository.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/appfeat/ApplicationFeatureRepository.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationFeatureRepository.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/appfeat/ApplicationFeatureRepository.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationMemberType.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/appfeat/ApplicationMemberType.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationMemberType.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/appfeat/ApplicationMemberType.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/appfeat/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/appfeat/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditEntryPropertyIdType.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/AuditEntryPropertyIdType.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditEntryPropertyIdType.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/AuditEntryPropertyIdType.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditEntryPropertyValueType.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/AuditEntryPropertyValueType.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditEntryPropertyValueType.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/AuditEntryPropertyValueType.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditerService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/AuditerService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditerService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/AuditerService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditerServiceLogging.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/AuditerServiceLogging.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/audit/AuditerServiceLogging.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/AuditerServiceLogging.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/audit/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/audit/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/audit/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/background/BackgroundCommandService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/background/BackgroundCommandService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/background/BackgroundCommandService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/background/BackgroundCommandService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/background/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/background/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/background/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/background/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/Bookmark.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/Bookmark.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/Bookmark.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/Bookmark.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkHolder.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/BookmarkHolder.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkHolder.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/BookmarkHolder.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkHolder_lookup.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/BookmarkHolder_lookup.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkHolder_lookup.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/BookmarkHolder_lookup.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkHolder_object.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/BookmarkHolder_object.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkHolder_object.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/BookmarkHolder_object.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/BookmarkService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/BookmarkService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmarkui/BookmarkUiService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmarkui/BookmarkUiService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/bookmarkui/BookmarkUiService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmarkui/BookmarkUiService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/clock/ClockService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/clock/ClockService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/clock/ClockService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/clock/ClockService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/clock/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/clock/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/clock/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/clock/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/command/Command.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/Command.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/command/Command.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/command/Command.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandContext.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/CommandContext.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandContext.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/command/CommandContext.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDefault.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/CommandDefault.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDefault.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/command/CommandDefault.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDtoProcessor.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/CommandDtoProcessor.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDtoProcessor.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/command/CommandDtoProcessor.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDtoProcessorForActionAbstract.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/CommandDtoProcessorForActionAbstract.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDtoProcessorForActionAbstract.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/command/CommandDtoProcessorForActionAbstract.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDtoProcessorForPropertyAbstract.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/CommandDtoProcessorForPropertyAbstract.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandDtoProcessorForPropertyAbstract.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/command/CommandDtoProcessorForPropertyAbstract.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandExecutorService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/CommandExecutorService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandExecutorService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/command/CommandExecutorService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandWithDto.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/CommandWithDto.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/command/CommandWithDto.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/command/CommandWithDto.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/command/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/command/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/command/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/command/spi/CommandService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/command/spi/CommandService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/command/spi/CommandService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/command/spi/CommandService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationMenu.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/confview/ConfigurationMenu.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationMenu.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/confview/ConfigurationMenu.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/confview/ConfigurationProperty.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/confview/ConfigurationProperty.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.layout.xml b/api/applib/src/main/adoc/modules/applib-svc/examples/services/confview/ConfigurationProperty.layout.xml
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.layout.xml
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/confview/ConfigurationProperty.layout.xml
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.png b/api/applib/src/main/adoc/modules/applib-svc/examples/services/confview/ConfigurationProperty.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.png
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/confview/ConfigurationProperty.png
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationViewService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/confview/ConfigurationViewService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationViewService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/confview/ConfigurationViewService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/confview/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/confview/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/confview/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/confview/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/ContentMappingService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/conmap/ContentMappingService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/ContentMappingService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/conmap/ContentMappingService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandDto.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandDto.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandDto.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandDto.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandsDto.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandsDto.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandsDto.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/conmap/command/ContentMappingServiceForCommandsDto.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/command/spi/CommandDtoProcessorService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/conmap/command/spi/CommandDtoProcessorService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/command/spi/CommandDtoProcessorService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/conmap/command/spi/CommandDtoProcessorService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/conmap/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/conmap/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/email/EmailService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/email/EmailService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/email/EmailService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/email/EmailService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/email/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/email/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/email/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/email/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/error/ErrorDetails.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/error/ErrorDetails.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/error/ErrorDetails.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/error/ErrorDetails.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/error/ErrorReportingService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/error/ErrorReportingService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/error/ErrorReportingService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/error/ErrorReportingService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/error/Ticket.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/error/Ticket.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/error/Ticket.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/error/Ticket.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/error/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/error/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/error/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/error/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/eventbus/EventBusService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/eventbus/EventBusService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/eventbus/EventBusService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/eventbus/EventBusService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/eventbus/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/eventbus/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/eventbus/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/eventbus/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizer.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizer.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizer.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizer.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerAbstract.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerAbstract.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerAbstract.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerAbstract.java
diff --git a/api/applib/src/main/adoc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerComposite.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerComposite.java
new file mode 100644
index 0000000..d8ef200
--- /dev/null
+++ b/api/applib/src/main/adoc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerComposite.java
@@ -0,0 +1,178 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.applib.services.exceprecog;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+
+import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.services.i18n.TranslationService;
+import org.apache.isis.applib.services.inject.ServiceInjector;
+import org.apache.isis.applib.services.registry.ServiceRegistry;
+import org.apache.isis.core.commons.internal.collections._Lists;
+
+/**
+ * Convenience implementation of {@link ExceptionRecognizer} that loops through a list of
+ * {@link #add(ExceptionRecognizer) registered} services.
+ *
+ * <p>
+ * Note that the framework <i>does</i> allow multiple {@link ExceptionRecognizer service}s
+ * to be registered in <tt>isis.properties</tt>, and each will be consulted in turn.  Therefore
+ * it is not necessary to use this class to register more than one such service.  However,
+ * it may be useful to use to treat a group of similar exceptions as a single unit.  For example,
+ * the <i>JDO object store</i> (in its applib) provides a set of {@link ExceptionRecognizer} to
+ * recognize various types of constraint violations.  These are grouped together as a single
+ * set through the use of this class.
+ */
+public class ExceptionRecognizerComposite implements ExceptionRecognizer {
+
+    private final List<ExceptionRecognizer> exceptionRecognizers = _Lists.newArrayList();
+
+    public ExceptionRecognizerComposite(final ExceptionRecognizer... exceptionRecognizers) {
+        this(Arrays.asList(exceptionRecognizers));
+    }
+
+    public ExceptionRecognizerComposite(final List<? extends ExceptionRecognizer> exceptionRecognizers) {
+        for (final ExceptionRecognizer er : exceptionRecognizers) {
+            add(er);
+        }
+    }
+
+    public ExceptionRecognizerComposite(final Stream<? extends ExceptionRecognizer> exceptionRecognizers) {
+        exceptionRecognizers.forEach(this::add);
+    }
+
+    /**
+     * Register an {@link ExceptionRecognizer} to be consulted when
+     * {@link #recognize(Throwable)} is called.
+     *
+     * <p>
+     * The most specific {@link ExceptionRecognizer recognizer}s should be registered
+     * before the more general ones.  See the <i>JDO object store</i> applib for
+     * an example.
+     */
+    @Programmatic
+    public final void add(final ExceptionRecognizer ers) {
+        exceptionRecognizers.add(ers);
+    }
+
+    /**
+     * Returns the non-<tt>null</tt> message of the first {@link #add(ExceptionRecognizer) add}ed
+     * {@link ExceptionRecognizer service} that recognizes the exception.
+     */
+    @Override
+    @Programmatic
+    public final String recognize(final Throwable ex) {
+        for (final ExceptionRecognizer ers : exceptionRecognizers) {
+            final String message = ers.recognize(ex);
+            if(message != null) {
+                return message;
+            }
+        }
+        return null;
+    }
+
+
+    /**
+     * Returns the non-<tt>null</tt> recognition of the first {@link #add(ExceptionRecognizer) add}ed
+     * {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer}.
+     *
+     * <p>
+     *     If none recognize the exception, then falls back to using {@link #recognize(Throwable)}, returning a
+     *     {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer.Recognition} with a
+     *     category of {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer.Category#CLIENT_ERROR}.
+     * </p>
+     */
+    @Override
+    @Programmatic
+    public final Recognition recognize2(final Throwable ex) {
+        for (final ExceptionRecognizer ers : exceptionRecognizers) {
+            final Recognition recognition = ers.recognize2(ex);
+            if(recognition != null) {
+                return recognition;
+            }
+        }
+        // backward compatible so far as possible.
+        return Recognition.of(Category.OTHER, recognize(ex));
+    }
+
+    // //////////////////////////////////////
+
+    /**
+     * For recognizers already {@link #add(ExceptionRecognizer) add}ed, simply {@link #injectServices()} and {@link #initRecognizers(Map) initializes}.
+     *
+     * <p>
+     *     Typical usage:
+     * </p>
+     * <pre>
+     *    public void init() {
+     *        add(new ExceptionRecognizerForThisException());
+     *        add(new ExceptionRecognizerForThatException());
+     *        add(new ExceptionRecognizerForTheOtherException());
+     *        super.init();
+     *    }
+     * </pre>
+     *
+     */
+    @PostConstruct
+    @Override
+    @Programmatic
+    public void init() {
+        injectServices();
+        initRecognizers();
+    }
+
+    protected void injectServices() {
+        if(serviceRegistry != null) {
+            for (final ExceptionRecognizer ers : exceptionRecognizers) {
+                serviceInjector.injectServicesInto(ers);
+            }
+        }
+    }
+
+    protected void initRecognizers() {
+        for (final ExceptionRecognizer ers : exceptionRecognizers) {
+            ers.init();
+        }
+    }
+
+
+
+    @PreDestroy
+    @Override
+    @Programmatic
+    public void shutdown() {
+        for (final ExceptionRecognizer ers : exceptionRecognizers) {
+            ers.shutdown();
+        }
+    }
+
+    // //////////////////////////////////////
+
+    @Inject ServiceRegistry serviceRegistry;
+    @Inject ServiceInjector serviceInjector;
+    @Inject TranslationService translationService;
+
+}
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerForType.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerForType.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerForType.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerForType.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/TranslatableException.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/exceprecog/TranslatableException.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/TranslatableException.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/exceprecog/TranslatableException.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/exceprecog/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/exceprecog/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/factory/FactoryService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/factory/FactoryService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/factory/FactoryService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/factory/FactoryService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/factory/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/factory/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/factory/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/factory/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/grid/GridLoaderService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/grid/GridLoaderService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/grid/GridLoaderService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/grid/GridLoaderService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/grid/GridService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/grid/GridService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/grid/GridService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/grid/GridService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/grid/GridSystemService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/grid/GridSystemService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/grid/GridSystemService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/grid/GridSystemService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/grid/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/grid/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/grid/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/grid/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/health/Health.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/health/Health.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/health/Health.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/health/Health.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/health/HealthCheckService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/health/HealthCheckService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/health/HealthCheckService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/health/HealthCheckService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/hint/HintStore.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/hint/HintStore.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/hint/HintStore.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/hint/HintStore.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/hint/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/hint/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/hint/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/hint/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/LocaleProvider.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/i18n/LocaleProvider.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/LocaleProvider.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/i18n/LocaleProvider.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslatableString.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/i18n/TranslatableString.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslatableString.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/i18n/TranslatableString.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslationService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/i18n/TranslationService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslationService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/i18n/TranslationService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslationsResolver.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/i18n/TranslationsResolver.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslationsResolver.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/i18n/TranslationsResolver.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/i18n/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/i18n/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/Interaction.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/Interaction.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/Interaction.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/Interaction.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/InteractionContext.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/InteractionContext.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/InteractionContext.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/InteractionContext.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/iactn/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/inject/ServiceInjector.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/inject/ServiceInjector.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/inject/ServiceInjector.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/inject/ServiceInjector.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/CatalogingSchemaOutputResolver.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/jaxb/CatalogingSchemaOutputResolver.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/CatalogingSchemaOutputResolver.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/jaxb/CatalogingSchemaOutputResolver.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/jaxb/JaxbService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/jaxb/JaxbService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbServiceDefault.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/jaxb/JaxbServiceDefault.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbServiceDefault.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/jaxb/JaxbServiceDefault.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/StreamResultWithWriter.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/jaxb/StreamResultWithWriter.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/StreamResultWithWriter.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/jaxb/StreamResultWithWriter.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/jaxb/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/jaxb/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/layout/LayoutService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/layout/LayoutService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutServiceMenu.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/layout/LayoutServiceMenu.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutServiceMenu.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/layout/LayoutServiceMenu.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/layout/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/layout/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/layout/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/layout/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/linking/DeepLinkService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/linking/DeepLinkService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/linking/DeepLinkService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/linking/DeepLinkService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/linking/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/linking/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/linking/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/linking/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/menu/MenuBarsLoaderService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/menu/MenuBarsLoaderService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/menu/MenuBarsLoaderService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/menu/MenuBarsLoaderService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/menu/MenuBarsService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/menu/MenuBarsService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/menu/MenuBarsService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/menu/MenuBarsService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/message/MessageService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/message/MessageService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/message/MessageService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/message/MessageService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/message/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/message/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/message/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/message/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/DomainMember.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/metamodel/DomainMember.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/DomainMember.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/metamodel/DomainMember.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/DomainModel.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/metamodel/DomainModel.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/DomainModel.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/metamodel/DomainModel.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/metamodel/MetaModelService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/metamodel/MetaModelService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelServicesMenu.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/metamodel/MetaModelServicesMenu.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelServicesMenu.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/metamodel/MetaModelServicesMenu.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/metamodel/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/metamodel/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/metrics/MetricsService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/metrics/MetricsService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/metrics/MetricsService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/metrics/MetricsService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/metrics/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/metrics/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/metrics/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/metrics/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/publish/PublishedObjects.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/PublishedObjects.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/publish/PublishedObjects.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/PublishedObjects.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/publish/PublisherService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/PublisherService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/publish/PublisherService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/PublisherService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/publish/PublisherServiceLogging.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/PublisherServiceLogging.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/publish/PublisherServiceLogging.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/PublisherServiceLogging.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/publish/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/publish/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/publish/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultCacheControl.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/queryresultscache/QueryResultCacheControl.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultCacheControl.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/queryresultscache/QueryResultCacheControl.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCache.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCache.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCache.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCache.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/queryresultscache/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/queryresultscache/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/registry/ServiceRegistry.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/registry/ServiceRegistry.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/registry/ServiceRegistry.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/registry/ServiceRegistry.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/registry/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/registry/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/registry/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/registry/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/repository/RepositoryService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/repository/RepositoryService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/repository/RepositoryService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/repository/RepositoryService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/repository/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/repository/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/repository/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/repository/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/routing/RoutingService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/routing/RoutingService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/routing/RoutingService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/routing/RoutingService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/routing/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/routing/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/routing/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/routing/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/scratchpad/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/scratchpad/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/session/SessionLoggingService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/session/SessionLoggingService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/session/SessionLoggingService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/session/SessionLoggingService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/session/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/session/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/session/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/session/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/sessmgmt/SessionManagementService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/sessmgmt/SessionManagementService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/sessmgmt/SessionManagementService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/sessmgmt/SessionManagementService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/sessmgmt/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/sessmgmt/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/sessmgmt/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/sessmgmt/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/sudo/SudoService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/sudo/SudoService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/sudo/SudoService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/sudo/SudoService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/sudo/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/sudo/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/sudo/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/sudo/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/swagger/SwaggerService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/swagger/SwaggerService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/swagger/SwaggerService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/swagger/SwaggerService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/swagger/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/swagger/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/swagger/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/swagger/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/tablecol/TableColumnOrderService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/tablecol/TableColumnOrderService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/tablecol/TableColumnOrderService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/tablecol/TableColumnOrderService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/title/TitleService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/title/TitleService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/title/TitleService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/title/TitleService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/title/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/title/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/title/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/title/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/urlencoding/UrlEncodingService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/urlencoding/UrlEncodingService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceWithCompression.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceWithCompression.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceWithCompression.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceWithCompression.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/urlencoding/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/urlencoding/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/user/UserService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/user/UserService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/user/UserService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/user/UserService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/user/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/user/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/user/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/user/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/userprof/UserProfileService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/userprof/UserProfileService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/userprof/UserProfileService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/userprof/UserProfileService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/userprof/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/userprof/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/userprof/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/userprof/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/EmailNotificationService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/userreg/EmailNotificationService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/EmailNotificationService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/userreg/EmailNotificationService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/UserDetails.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/userreg/UserDetails.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/UserDetails.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/userreg/UserDetails.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/UserRegistrationService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/userreg/UserRegistrationService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/UserRegistrationService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/userreg/UserRegistrationService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/events/EmailEventAbstract.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/userreg/events/EmailEventAbstract.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/events/EmailEventAbstract.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/userreg/events/EmailEventAbstract.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/events/EmailRegistrationEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/userreg/events/EmailRegistrationEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/events/EmailRegistrationEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/userreg/events/EmailRegistrationEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/events/PasswordResetEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/userreg/events/PasswordResetEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/events/PasswordResetEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/userreg/events/PasswordResetEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/userreg/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/userreg/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/userreg/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/AsyncWrap.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/AsyncWrap.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/AsyncWrap.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/AsyncWrap.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/DisabledException.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/DisabledException.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/DisabledException.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/DisabledException.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/HiddenException.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/HiddenException.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/HiddenException.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/HiddenException.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/InteractionException.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/InteractionException.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/InteractionException.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/InteractionException.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/InvalidException.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/InvalidException.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/InvalidException.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/InvalidException.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/WrapperFactory.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/WrapperFactory.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/WrapperFactory.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/WrapperFactory.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/WrappingObject.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/WrappingObject.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/WrappingObject.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/WrappingObject.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/AccessEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/AccessEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/AccessEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/AccessEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionArgumentEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ActionArgumentEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionArgumentEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ActionArgumentEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionInvocationEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ActionInvocationEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionInvocationEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ActionInvocationEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionUsabilityEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ActionUsabilityEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionUsabilityEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ActionUsabilityEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionVisibilityEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ActionVisibilityEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ActionVisibilityEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ActionVisibilityEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionAccessEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/CollectionAccessEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionAccessEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/CollectionAccessEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionAddToEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/CollectionAddToEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionAddToEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/CollectionAddToEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionMethodEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/CollectionMethodEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionMethodEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/CollectionMethodEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionRemoveFromEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/CollectionRemoveFromEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionRemoveFromEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/CollectionRemoveFromEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionUsabilityEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/CollectionUsabilityEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionUsabilityEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/CollectionUsabilityEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionVisibilityEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/CollectionVisibilityEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/CollectionVisibilityEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/CollectionVisibilityEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/InteractionEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/InteractionEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/InteractionEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/InteractionEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ObjectTitleEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ObjectTitleEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ObjectTitleEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ObjectTitleEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ObjectValidityEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ObjectValidityEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ObjectValidityEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ObjectValidityEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ObjectVisibilityEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ObjectVisibilityEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ObjectVisibilityEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ObjectVisibilityEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ParseValueEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ParseValueEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ParseValueEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ParseValueEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyAccessEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/PropertyAccessEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyAccessEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/PropertyAccessEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyModifyEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/PropertyModifyEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyModifyEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/PropertyModifyEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyUsabilityEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/PropertyUsabilityEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyUsabilityEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/PropertyUsabilityEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyVisibilityEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/PropertyVisibilityEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/PropertyVisibilityEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/PropertyVisibilityEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ProposedHolderEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ProposedHolderEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ProposedHolderEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ProposedHolderEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/UsabilityEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/UsabilityEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/UsabilityEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/UsabilityEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ValidityEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ValidityEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/ValidityEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/ValidityEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/VisibilityEvent.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/VisibilityEvent.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/VisibilityEvent.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/VisibilityEvent.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/events/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/events/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/listeners/InteractionAdapter.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/listeners/InteractionAdapter.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/listeners/InteractionAdapter.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/listeners/InteractionAdapter.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/listeners/InteractionListener.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/listeners/InteractionListener.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/listeners/InteractionListener.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/listeners/InteractionListener.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/wrapper/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/wrapper/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/Transaction.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/xactn/Transaction.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/Transaction.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/xactn/Transaction.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/TransactionId.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/xactn/TransactionId.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/TransactionId.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/xactn/TransactionId.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/TransactionService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/xactn/TransactionService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/TransactionService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/xactn/TransactionService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/TransactionState.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/xactn/TransactionState.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/TransactionState.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/xactn/TransactionState.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/xactn/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/xactn/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/xactn/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/xmlsnapshot/XmlSnapshotService.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/xmlsnapshot/XmlSnapshotService.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/xmlsnapshot/XmlSnapshotService.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/xmlsnapshot/XmlSnapshotService.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/xmlsnapshot/XmlSnapshotServiceAbstract.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/xmlsnapshot/XmlSnapshotServiceAbstract.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/xmlsnapshot/XmlSnapshotServiceAbstract.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/xmlsnapshot/XmlSnapshotServiceAbstract.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/xmlsnapshot/package-info.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/xmlsnapshot/package-info.java
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/examples/services/xmlsnapshot/package-info.java
rename to api/applib/src/main/adoc/modules/applib-svc/examples/services/xmlsnapshot/package-info.java
diff --git a/api/applib/src/main/doc/modules/applib-svc/images/reference-services-api/acceptheaderservice.png b/api/applib/src/main/adoc/modules/applib-svc/images/reference-services-api/acceptheaderservice.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/images/reference-services-api/acceptheaderservice.png
rename to api/applib/src/main/adoc/modules/applib-svc/images/reference-services-api/acceptheaderservice.png
diff --git a/api/applib/src/main/doc/modules/applib-svc/images/reference-services-api/acceptheaderservice.pptx b/api/applib/src/main/adoc/modules/applib-svc/images/reference-services-api/acceptheaderservice.pptx
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/images/reference-services-api/acceptheaderservice.pptx
rename to api/applib/src/main/adoc/modules/applib-svc/images/reference-services-api/acceptheaderservice.pptx
diff --git a/api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/ErrorReportingService/kitchensink-example.png b/api/applib/src/main/adoc/modules/applib-svc/images/reference-services-spi/ErrorReportingService/kitchensink-example.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/ErrorReportingService/kitchensink-example.png
rename to api/applib/src/main/adoc/modules/applib-svc/images/reference-services-spi/ErrorReportingService/kitchensink-example.png
diff --git a/api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png b/api/applib/src/main/adoc/modules/applib-svc/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png
rename to api/applib/src/main/adoc/modules/applib-svc/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png
diff --git a/api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png b/api/applib/src/main/adoc/modules/applib-svc/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png
rename to api/applib/src/main/adoc/modules/applib-svc/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png
diff --git a/api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png b/api/applib/src/main/adoc/modules/applib-svc/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png
rename to api/applib/src/main/adoc/modules/applib-svc/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png
diff --git a/api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/UserProfileService/todoapp.png b/api/applib/src/main/adoc/modules/applib-svc/images/reference-services-spi/UserProfileService/todoapp.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/UserProfileService/todoapp.png
rename to api/applib/src/main/adoc/modules/applib-svc/images/reference-services-spi/UserProfileService/todoapp.png
diff --git a/api/applib/src/main/doc/modules/applib-svc/images/reference-services/categories.png b/api/applib/src/main/adoc/modules/applib-svc/images/reference-services/categories.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/images/reference-services/categories.png
rename to api/applib/src/main/adoc/modules/applib-svc/images/reference-services/categories.png
diff --git a/api/applib/src/main/doc/modules/applib-svc/images/reference-services/categories.pptx b/api/applib/src/main/adoc/modules/applib-svc/images/reference-services/categories.pptx
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/images/reference-services/categories.pptx
rename to api/applib/src/main/adoc/modules/applib-svc/images/reference-services/categories.pptx
diff --git a/api/applib/src/main/doc/modules/applib-svc/images/reference-services/commands-and-events.png b/api/applib/src/main/adoc/modules/applib-svc/images/reference-services/commands-and-events.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/images/reference-services/commands-and-events.png
rename to api/applib/src/main/adoc/modules/applib-svc/images/reference-services/commands-and-events.png
diff --git a/api/applib/src/main/doc/modules/applib-svc/images/reference-services/commands-and-events.pptx b/api/applib/src/main/adoc/modules/applib-svc/images/reference-services/commands-and-events.pptx
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/images/reference-services/commands-and-events.pptx
rename to api/applib/src/main/adoc/modules/applib-svc/images/reference-services/commands-and-events.pptx
diff --git a/api/applib/src/main/doc/modules/applib-svc/nav.adoc b/api/applib/src/main/adoc/modules/applib-svc/nav.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/nav.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/nav.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/about.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/about.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/about.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/about.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/BackgroundService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/BackgroundService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService/BackgroundCommandExecution.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/BackgroundService/BackgroundCommandExecution.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService/BackgroundCommandExecution.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/BackgroundService/BackgroundCommandExecution.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService/Quartz.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/BackgroundService/Quartz.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService/Quartz.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/BackgroundService/Quartz.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/CommandContext.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/CommandContext.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/CommandContext.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/CommandContext.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/CommandExecutorService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/CommandExecutorService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/CommandExecutorService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/CommandExecutorService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/DtoMappingHelper.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/DtoMappingHelper.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/DtoMappingHelper.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/DtoMappingHelper.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/InteractionContext.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/InteractionContext.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/InteractionContext.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/InteractionContext.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/MessageService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/MessageService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/MessageService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/MessageService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/SessionManagementService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/SessionManagementService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/SessionManagementService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/SessionManagementService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/TitleService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/TitleService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/TitleService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/TitleService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/TransactionService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/TransactionService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/TransactionService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/TransactionService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/WrapperFactory.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/WrapperFactory.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/WrapperFactory.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-api/WrapperFactory.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-spi.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-spi.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/BackgroundCommandService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-spi/BackgroundCommandService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/BackgroundCommandService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-spi/BackgroundCommandService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/CommandService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-spi/CommandService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/CommandService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-spi/CommandService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/HealthCheckService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-spi/HealthCheckService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/HealthCheckService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-spi/HealthCheckService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/HomePageProviderService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-spi/HomePageProviderService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/HomePageProviderService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/application-layer-spi/HomePageProviderService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/bootstrapping-spi.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/bootstrapping-spi.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/bootstrapping-spi.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/bootstrapping-spi.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/bootstrapping-spi/ClassDiscoveryService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/bootstrapping-spi/ClassDiscoveryService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/bootstrapping-spi/ClassDiscoveryService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/bootstrapping-spi/ClassDiscoveryService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/core-domain-api.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/core-domain-api.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/ClockService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/core-domain-api/ClockService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/ClockService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/core-domain-api/ClockService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/ConfigurationService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/core-domain-api/ConfigurationService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/ConfigurationService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/core-domain-api/ConfigurationService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/FactoryService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/core-domain-api/FactoryService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/FactoryService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/core-domain-api/FactoryService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/Scratchpad.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/core-domain-api/Scratchpad.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/Scratchpad.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/core-domain-api/Scratchpad.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/UserService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/core-domain-api/UserService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/UserService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/core-domain-api/UserService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/integration-api.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/integration-api.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/integration-api.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/integration-api.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/integration-api/BookmarkService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/integration-api/BookmarkService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/integration-api/BookmarkService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/integration-api/BookmarkService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/integration-api/EmailService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/integration-api/EmailService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/integration-api/EmailService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/integration-api/EmailService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/integration-api/JaxbService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/integration-api/JaxbService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/integration-api/JaxbService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/integration-api/JaxbService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/integration-api/MementoService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/integration-api/MementoService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/integration-api/MementoService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/integration-api/MementoService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/integration-api/XmlSnapshotService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/integration-api/XmlSnapshotService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/integration-api/XmlSnapshotService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/integration-api/XmlSnapshotService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/metadata-api.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/metadata-api.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/metadata-api.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/metadata-api.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/ApplicationFeatureRepository.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/metadata-api/ApplicationFeatureRepository.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/ApplicationFeatureRepository.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/metadata-api/ApplicationFeatureRepository.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/LayoutService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/metadata-api/LayoutService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/LayoutService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/metadata-api/LayoutService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/MetamodelService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/metadata-api/MetamodelService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/MetamodelService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/metadata-api/MetamodelService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/ServiceRegistry.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/metadata-api/ServiceRegistry.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/ServiceRegistry.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/metadata-api/ServiceRegistry.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/SwaggerService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/metadata-api/SwaggerService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/metadata-api/SwaggerService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/metadata-api/SwaggerService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-api.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-api.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/H2ManagerMenu.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-api/H2ManagerMenu.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/H2ManagerMenu.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-api/H2ManagerMenu.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/HsqlDbManagerMenu.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-api/HsqlDbManagerMenu.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/HsqlDbManagerMenu.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-api/HsqlDbManagerMenu.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/IsisJdoSupport.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-api/IsisJdoSupport.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/IsisJdoSupport.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-api/IsisJdoSupport.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/MetricsService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-api/MetricsService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/MetricsService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-api/MetricsService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/QueryResultsCache.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-api/QueryResultsCache.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/QueryResultsCache.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-api/QueryResultsCache.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/RepositoryService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-api/RepositoryService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/RepositoryService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-api/RepositoryService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-spi.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-spi.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/AuditerService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-spi/AuditerService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/AuditerService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-spi/AuditerService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/PublisherService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-spi/PublisherService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/PublisherService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-spi/PublisherService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-api.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-api.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/AcceptHeaderService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-api/AcceptHeaderService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/AcceptHeaderService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-api/AcceptHeaderService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/BookmarkUiService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-api/BookmarkUiService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/BookmarkUiService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-api/BookmarkUiService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/ConfigurationViewService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-api/ConfigurationViewService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/ConfigurationViewService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-api/ConfigurationViewService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/DeepLinkService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-api/DeepLinkService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/DeepLinkService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-api/DeepLinkService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/GuiceBeanProvider.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-api/GuiceBeanProvider.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/GuiceBeanProvider.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-api/GuiceBeanProvider.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ContentMappingService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/ContentMappingService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ContentMappingService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/ContentMappingService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/EmailNotificationService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/EmailNotificationService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/EmailNotificationService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/EmailNotificationService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ErrorReportingService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/ErrorReportingService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ErrorReportingService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/ErrorReportingService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridLoaderService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/GridLoaderService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridLoaderService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/GridLoaderService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/GridService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/GridService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridSystemService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/GridSystemService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridSystemService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/GridSystemService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/HintStore.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/HintStore.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/HintStore.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/HintStore.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/LocaleProvider.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/LocaleProvider.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/LocaleProvider.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/LocaleProvider.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsLoaderService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsLoaderService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsLoaderService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsLoaderService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/RoutingService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/RoutingService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/RoutingService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/RoutingService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/SessionLoggingService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/SessionLoggingService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/SessionLoggingService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/SessionLoggingService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TableColumnOrderService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/TableColumnOrderService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TableColumnOrderService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/TableColumnOrderService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TranslationService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/TranslationService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TranslationService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/TranslationService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TranslationsResolver.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/TranslationsResolver.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TranslationsResolver.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/TranslationsResolver.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/UrlEncodingService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/UrlEncodingService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/UrlEncodingService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/UrlEncodingService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/UserProfileService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/UserProfileService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/UserProfileService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/presentation-layer-spi/UserProfileService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/testing.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/testing.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/testing.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/testing.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/testing/ExecutionParametersService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/testing/ExecutionParametersService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/testing/ExecutionParametersService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/testing/ExecutionParametersService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScripts.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/testing/FixtureScripts.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScripts.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/testing/FixtureScripts.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScriptsSpecificationProvider.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/testing/FixtureScriptsSpecificationProvider.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScriptsSpecificationProvider.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/testing/FixtureScriptsSpecificationProvider.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/testing/SudoService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/testing/SudoService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/testing/SudoService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/testing/SudoService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/pages/testing/SwitchUserService.adoc b/api/applib/src/main/adoc/modules/applib-svc/pages/testing/SwitchUserService.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/pages/testing/SwitchUserService.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/pages/testing/SwitchUserService.adoc
diff --git a/api/applib/src/main/doc/modules/applib-svc/partials/module-nav.adoc b/api/applib/src/main/adoc/modules/applib-svc/partials/module-nav.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-svc/partials/module-nav.adoc
rename to api/applib/src/main/adoc/modules/applib-svc/partials/module-nav.adoc
diff --git a/api/schema/src/main/doc/antora.yml b/api/schema/src/main/adoc/antora.yml
similarity index 100%
rename from api/schema/src/main/doc/antora.yml
rename to api/schema/src/main/adoc/antora.yml
diff --git a/api/applib/src/main/doc/modules/applib-cm/images/reference-classes/issue-in-more-detail.png b/api/schema/src/main/adoc/modules/schema/images/reference-classes/issue-in-more-detail.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/images/reference-classes/issue-in-more-detail.png
rename to api/schema/src/main/adoc/modules/schema/images/reference-classes/issue-in-more-detail.png
diff --git a/api/applib/src/main/doc/modules/applib-cm/images/reference-methods/prefixes/choices/dependent.png b/api/schema/src/main/adoc/modules/schema/images/reference-methods/prefixes/choices/dependent.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/images/reference-methods/prefixes/choices/dependent.png
rename to api/schema/src/main/adoc/modules/schema/images/reference-methods/prefixes/choices/dependent.png
diff --git a/api/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/cssClass/strikethrough.png b/api/schema/src/main/adoc/modules/schema/images/reference-methods/reserved/cssClass/strikethrough.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/cssClass/strikethrough.png
rename to api/schema/src/main/adoc/modules/schema/images/reference-methods/reserved/cssClass/strikethrough.png
diff --git a/api/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.pdn b/api/schema/src/main/adoc/modules/schema/images/reference-methods/reserved/iconName/differing.pdn
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.pdn
rename to api/schema/src/main/adoc/modules/schema/images/reference-methods/reserved/iconName/differing.pdn
diff --git a/api/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.png b/api/schema/src/main/adoc/modules/schema/images/reference-methods/reserved/iconName/differing.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/iconName/differing.png
rename to api/schema/src/main/adoc/modules/schema/images/reference-methods/reserved/iconName/differing.png
diff --git a/api/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/iconName/png-files.png b/api/schema/src/main/adoc/modules/schema/images/reference-methods/reserved/iconName/png-files.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/images/reference-methods/reserved/iconName/png-files.png
rename to api/schema/src/main/adoc/modules/schema/images/reference-methods/reserved/iconName/png-files.png
diff --git a/api/applib/src/main/doc/modules/applib-cm/images/value-types/markup.png b/api/schema/src/main/adoc/modules/schema/images/value-types/markup.png
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/images/value-types/markup.png
rename to api/schema/src/main/adoc/modules/schema/images/value-types/markup.png
diff --git a/api/applib/src/main/doc/modules/applib-cm/nav.adoc b/api/schema/src/main/adoc/modules/schema/nav.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-cm/nav.adoc
rename to api/schema/src/main/adoc/modules/schema/nav.adoc
diff --git a/api/schema/src/main/doc/modules/schema/pages/about.adoc b/api/schema/src/main/adoc/modules/schema/pages/about.adoc
similarity index 100%
rename from api/schema/src/main/doc/modules/schema/pages/about.adoc
rename to api/schema/src/main/adoc/modules/schema/pages/about.adoc
diff --git a/api/schema/src/main/doc/modules/schema/pages/aim.adoc b/api/schema/src/main/adoc/modules/schema/pages/aim.adoc
similarity index 100%
rename from api/schema/src/main/doc/modules/schema/pages/aim.adoc
rename to api/schema/src/main/adoc/modules/schema/pages/aim.adoc
diff --git a/api/schema/src/main/doc/modules/schema/pages/chg.adoc b/api/schema/src/main/adoc/modules/schema/pages/chg.adoc
similarity index 100%
rename from api/schema/src/main/doc/modules/schema/pages/chg.adoc
rename to api/schema/src/main/adoc/modules/schema/pages/chg.adoc
diff --git a/api/schema/src/main/doc/modules/schema/pages/cmd.adoc b/api/schema/src/main/adoc/modules/schema/pages/cmd.adoc
similarity index 100%
rename from api/schema/src/main/doc/modules/schema/pages/cmd.adoc
rename to api/schema/src/main/adoc/modules/schema/pages/cmd.adoc
diff --git a/api/schema/src/main/doc/modules/schema/pages/common.adoc b/api/schema/src/main/adoc/modules/schema/pages/common.adoc
similarity index 100%
rename from api/schema/src/main/doc/modules/schema/pages/common.adoc
rename to api/schema/src/main/adoc/modules/schema/pages/common.adoc
diff --git a/api/schema/src/main/doc/modules/schema/pages/ixn.adoc b/api/schema/src/main/adoc/modules/schema/pages/ixn.adoc
similarity index 100%
rename from api/schema/src/main/doc/modules/schema/pages/ixn.adoc
rename to api/schema/src/main/adoc/modules/schema/pages/ixn.adoc
diff --git a/api/schema/src/main/doc/modules/schema/pages/mml.adoc b/api/schema/src/main/adoc/modules/schema/pages/mml.adoc
similarity index 100%
rename from api/schema/src/main/doc/modules/schema/pages/mml.adoc
rename to api/schema/src/main/adoc/modules/schema/pages/mml.adoc
diff --git a/api/schema/src/main/doc/modules/schema/partials/module-nav.adoc b/api/schema/src/main/adoc/modules/schema/partials/module-nav.adoc
similarity index 100%
rename from api/schema/src/main/doc/modules/schema/partials/module-nav.adoc
rename to api/schema/src/main/adoc/modules/schema/partials/module-nav.adoc
diff --git a/examples/smoketests/src/main/doc/antora.yml b/core/codegen-bytebuddy/src/main/adoc/antora.yml
similarity index 100%
rename from examples/smoketests/src/main/doc/antora.yml
rename to core/codegen-bytebuddy/src/main/adoc/antora.yml
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/nav.adoc b/core/codegen-bytebuddy/src/main/adoc/modules/codegen-bytebuddy/nav.adoc
similarity index 100%
copy from core/runtimeservices/src/main/doc/modules/runtime-services/nav.adoc
copy to core/codegen-bytebuddy/src/main/adoc/modules/codegen-bytebuddy/nav.adoc
diff --git a/core/codegen-bytebuddy/src/main/doc/modules/codegen-bytebuddy/pages/about.adoc b/core/codegen-bytebuddy/src/main/adoc/modules/codegen-bytebuddy/pages/about.adoc
similarity index 100%
rename from core/codegen-bytebuddy/src/main/doc/modules/codegen-bytebuddy/pages/about.adoc
rename to core/codegen-bytebuddy/src/main/adoc/modules/codegen-bytebuddy/pages/about.adoc
diff --git a/core/codegen-bytebuddy/src/main/doc/modules/codegen-bytebuddy/partials/module-nav.adoc b/core/codegen-bytebuddy/src/main/adoc/modules/codegen-bytebuddy/partials/module-nav.adoc
similarity index 100%
rename from core/codegen-bytebuddy/src/main/doc/modules/codegen-bytebuddy/partials/module-nav.adoc
rename to core/codegen-bytebuddy/src/main/adoc/modules/codegen-bytebuddy/partials/module-nav.adoc
diff --git a/core/webapp/src/main/doc/antora.yml b/core/commons/src/main/adoc/antora.yml
similarity index 100%
rename from core/webapp/src/main/doc/antora.yml
rename to core/commons/src/main/adoc/antora.yml
diff --git a/core/commons/src/main/doc/modules/commons/examples/.gitignore b/core/commons/src/main/adoc/modules/commons/examples/.gitignore
similarity index 100%
rename from core/commons/src/main/doc/modules/commons/examples/.gitignore
rename to core/commons/src/main/adoc/modules/commons/examples/.gitignore
diff --git a/core/runtime/src/main/doc/modules/runtime/nav.adoc b/core/commons/src/main/adoc/modules/commons/nav.adoc
similarity index 100%
rename from core/runtime/src/main/doc/modules/runtime/nav.adoc
rename to core/commons/src/main/adoc/modules/commons/nav.adoc
diff --git a/core/commons/src/main/doc/modules/commons/pages/about.adoc b/core/commons/src/main/adoc/modules/commons/pages/about.adoc
similarity index 100%
rename from core/commons/src/main/doc/modules/commons/pages/about.adoc
rename to core/commons/src/main/adoc/modules/commons/pages/about.adoc
diff --git a/core/commons/src/main/doc/modules/commons/partials/module-nav.adoc b/core/commons/src/main/adoc/modules/commons/partials/module-nav.adoc
similarity index 100%
rename from core/commons/src/main/doc/modules/commons/partials/module-nav.adoc
rename to core/commons/src/main/adoc/modules/commons/partials/module-nav.adoc
diff --git a/api/applib/src/main/doc/antora.yml b/core/config/src/main/adoc/antora.yml
similarity index 100%
copy from api/applib/src/main/doc/antora.yml
copy to core/config/src/main/adoc/antora.yml
diff --git a/core/config/src/main/doc/modules/config/examples/generated/Other.adoc b/core/config/src/main/adoc/modules/config/examples/generated/Other.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/examples/generated/Other.adoc
rename to core/config/src/main/adoc/modules/config/examples/generated/Other.adoc
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.authentication.shiro.adoc b/core/config/src/main/adoc/modules/config/examples/generated/isis.authentication.shiro.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/examples/generated/isis.authentication.shiro.adoc
rename to core/config/src/main/adoc/modules/config/examples/generated/isis.authentication.shiro.adoc
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.persistor.adoc b/core/config/src/main/adoc/modules/config/examples/generated/isis.persistor.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/examples/generated/isis.persistor.adoc
rename to core/config/src/main/adoc/modules/config/examples/generated/isis.persistor.adoc
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.persistor.datanucleus.adoc b/core/config/src/main/adoc/modules/config/examples/generated/isis.persistor.datanucleus.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/examples/generated/isis.persistor.datanucleus.adoc
rename to core/config/src/main/adoc/modules/config/examples/generated/isis.persistor.datanucleus.adoc
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.persistor.datanucleus.impl.adoc b/core/config/src/main/adoc/modules/config/examples/generated/isis.persistor.datanucleus.impl.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/examples/generated/isis.persistor.datanucleus.impl.adoc
rename to core/config/src/main/adoc/modules/config/examples/generated/isis.persistor.datanucleus.impl.adoc
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.adoc b/core/config/src/main/adoc/modules/config/examples/generated/isis.reflector.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/examples/generated/isis.reflector.adoc
rename to core/config/src/main/adoc/modules/config/examples/generated/isis.reflector.adoc
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.facet.adoc b/core/config/src/main/adoc/modules/config/examples/generated/isis.reflector.facet.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/examples/generated/isis.reflector.facet.adoc
rename to core/config/src/main/adoc/modules/config/examples/generated/isis.reflector.facet.adoc
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.reflector.validator.adoc b/core/config/src/main/adoc/modules/config/examples/generated/isis.reflector.validator.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/examples/generated/isis.reflector.validator.adoc
rename to core/config/src/main/adoc/modules/config/examples/generated/isis.reflector.validator.adoc
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.service.email.adoc b/core/config/src/main/adoc/modules/config/examples/generated/isis.service.email.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/examples/generated/isis.service.email.adoc
rename to core/config/src/main/adoc/modules/config/examples/generated/isis.service.email.adoc
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.services.adoc b/core/config/src/main/adoc/modules/config/examples/generated/isis.services.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/examples/generated/isis.services.adoc
rename to core/config/src/main/adoc/modules/config/examples/generated/isis.services.adoc
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.viewer.restfulobjects.adoc b/core/config/src/main/adoc/modules/config/examples/generated/isis.viewer.restfulobjects.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/examples/generated/isis.viewer.restfulobjects.adoc
rename to core/config/src/main/adoc/modules/config/examples/generated/isis.viewer.restfulobjects.adoc
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.viewer.wicket.adoc b/core/config/src/main/adoc/modules/config/examples/generated/isis.viewer.wicket.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/examples/generated/isis.viewer.wicket.adoc
rename to core/config/src/main/adoc/modules/config/examples/generated/isis.viewer.wicket.adoc
diff --git a/core/config/src/main/doc/modules/config/examples/generated/isis.viewers.adoc b/core/config/src/main/adoc/modules/config/examples/generated/isis.viewers.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/examples/generated/isis.viewers.adoc
rename to core/config/src/main/adoc/modules/config/examples/generated/isis.viewers.adoc
diff --git a/core/config/src/main/doc/modules/config/examples/generated/resteasy.adoc b/core/config/src/main/adoc/modules/config/examples/generated/resteasy.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/examples/generated/resteasy.adoc
rename to core/config/src/main/adoc/modules/config/examples/generated/resteasy.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/nav.adoc b/core/config/src/main/adoc/modules/config/nav.adoc
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/nav.adoc
rename to core/config/src/main/adoc/modules/config/nav.adoc
diff --git a/core/config/src/main/doc/modules/config/pages/about.adoc b/core/config/src/main/adoc/modules/config/pages/about.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/pages/about.adoc
rename to core/config/src/main/adoc/modules/config/pages/about.adoc
diff --git a/core/config/src/main/doc/modules/config/pages/configuration-files.adoc b/core/config/src/main/adoc/modules/config/pages/configuration-files.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/pages/configuration-files.adoc
rename to core/config/src/main/adoc/modules/config/pages/configuration-files.adoc
diff --git a/core/config/src/main/doc/modules/config/pages/configuration-properties.adoc b/core/config/src/main/adoc/modules/config/pages/configuration-properties.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/pages/configuration-properties.adoc
rename to core/config/src/main/adoc/modules/config/pages/configuration-properties.adoc
diff --git a/core/config/src/main/doc/modules/config/pages/configuring-core.adoc b/core/config/src/main/adoc/modules/config/pages/configuring-core.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/pages/configuring-core.adoc
rename to core/config/src/main/adoc/modules/config/pages/configuring-core.adoc
diff --git a/core/config/src/main/doc/modules/config/pages/deployment-types.adoc b/core/config/src/main/adoc/modules/config/pages/deployment-types.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/pages/deployment-types.adoc
rename to core/config/src/main/adoc/modules/config/pages/deployment-types.adoc
diff --git a/core/config/src/main/doc/modules/config/pages/specifying-components.adoc b/core/config/src/main/adoc/modules/config/pages/specifying-components.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/pages/specifying-components.adoc
rename to core/config/src/main/adoc/modules/config/pages/specifying-components.adoc
diff --git a/core/config/src/main/doc/modules/config/partials/Other.adoc b/core/config/src/main/adoc/modules/config/partials/Other.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/partials/Other.adoc
rename to core/config/src/main/adoc/modules/config/partials/Other.adoc
diff --git a/core/config/src/main/doc/modules/config/partials/module-nav.adoc b/core/config/src/main/adoc/modules/config/partials/module-nav.adoc
similarity index 100%
rename from core/config/src/main/doc/modules/config/partials/module-nav.adoc
rename to core/config/src/main/adoc/modules/config/partials/module-nav.adoc
diff --git a/core/runtimeservices/src/main/doc/antora.yml b/core/detached-tests/src/main/adoc/antora.yml
similarity index 100%
rename from core/runtimeservices/src/main/doc/antora.yml
rename to core/detached-tests/src/main/adoc/antora.yml
diff --git a/core/metamodel/src/main/doc/modules/metamodel/nav.adoc b/core/detached-tests/src/main/adoc/modules/detached-tests/nav.adoc
similarity index 100%
rename from core/metamodel/src/main/doc/modules/metamodel/nav.adoc
rename to core/detached-tests/src/main/adoc/modules/detached-tests/nav.adoc
diff --git a/core/detached-tests/src/main/doc/modules/detached-tests/pages/about.adoc b/core/detached-tests/src/main/adoc/modules/detached-tests/pages/about.adoc
similarity index 100%
rename from core/detached-tests/src/main/doc/modules/detached-tests/pages/about.adoc
rename to core/detached-tests/src/main/adoc/modules/detached-tests/pages/about.adoc
diff --git a/core/detached-tests/src/main/doc/modules/detached-tests/partials/module-nav.adoc b/core/detached-tests/src/main/adoc/modules/detached-tests/partials/module-nav.adoc
similarity index 100%
rename from core/detached-tests/src/main/doc/modules/detached-tests/partials/module-nav.adoc
rename to core/detached-tests/src/main/adoc/modules/detached-tests/partials/module-nav.adoc
diff --git a/core/runtime/src/main/doc/antora.yml b/core/metamodel/src/main/adoc/antora.yml
similarity index 100%
rename from core/runtime/src/main/doc/antora.yml
rename to core/metamodel/src/main/adoc/antora.yml
diff --git a/core/detached-tests/src/main/doc/modules/detached-tests/nav.adoc b/core/metamodel/src/main/adoc/modules/metamodel/nav.adoc
similarity index 100%
rename from core/detached-tests/src/main/doc/modules/detached-tests/nav.adoc
rename to core/metamodel/src/main/adoc/modules/metamodel/nav.adoc
diff --git a/core/metamodel/src/main/doc/modules/metamodel/pages/about.adoc b/core/metamodel/src/main/adoc/modules/metamodel/pages/about.adoc
similarity index 100%
rename from core/metamodel/src/main/doc/modules/metamodel/pages/about.adoc
rename to core/metamodel/src/main/adoc/modules/metamodel/pages/about.adoc
diff --git a/core/metamodel/src/main/doc/modules/metamodel/partials/module-nav.adoc b/core/metamodel/src/main/adoc/modules/metamodel/partials/module-nav.adoc
similarity index 100%
rename from core/metamodel/src/main/doc/modules/metamodel/partials/module-nav.adoc
rename to core/metamodel/src/main/adoc/modules/metamodel/partials/module-nav.adoc
diff --git a/core/metamodel/src/main/doc/antora.yml b/core/runtime/src/main/adoc/antora.yml
similarity index 100%
rename from core/metamodel/src/main/doc/antora.yml
rename to core/runtime/src/main/adoc/antora.yml
diff --git a/core/commons/src/main/doc/modules/commons/nav.adoc b/core/runtime/src/main/adoc/modules/runtime/nav.adoc
similarity index 100%
rename from core/commons/src/main/doc/modules/commons/nav.adoc
rename to core/runtime/src/main/adoc/modules/runtime/nav.adoc
diff --git a/core/runtime/src/main/doc/modules/runtime/pages/about.adoc b/core/runtime/src/main/adoc/modules/runtime/pages/about.adoc
similarity index 100%
rename from core/runtime/src/main/doc/modules/runtime/pages/about.adoc
rename to core/runtime/src/main/adoc/modules/runtime/pages/about.adoc
diff --git a/core/runtime/src/main/doc/modules/runtime/partials/module-nav.adoc b/core/runtime/src/main/adoc/modules/runtime/partials/module-nav.adoc
similarity index 100%
rename from core/runtime/src/main/doc/modules/runtime/partials/module-nav.adoc
rename to core/runtime/src/main/adoc/modules/runtime/partials/module-nav.adoc
diff --git a/core/detached-tests/src/main/doc/antora.yml b/core/runtimeservices/src/main/adoc/antora.yml
similarity index 100%
rename from core/detached-tests/src/main/doc/antora.yml
rename to core/runtimeservices/src/main/adoc/antora.yml
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/images/ContentNegotiationService/accept-json.png b/core/runtimeservices/src/main/adoc/modules/runtime-services/images/ContentNegotiationService/accept-json.png
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/images/ContentNegotiationService/accept-json.png
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/images/ContentNegotiationService/accept-json.png
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/images/ContentNegotiationService/accept-xml.png b/core/runtimeservices/src/main/adoc/modules/runtime-services/images/ContentNegotiationService/accept-xml.png
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/images/ContentNegotiationService/accept-xml.png
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/images/ContentNegotiationService/accept-xml.png
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/images/ContentNegotiationService/facade-choices.png b/core/runtimeservices/src/main/adoc/modules/runtime-services/images/ContentNegotiationService/facade-choices.png
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/images/ContentNegotiationService/facade-choices.png
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/images/ContentNegotiationService/facade-choices.png
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/images/ContentNegotiationService/facade-choices.pptx b/core/runtimeservices/src/main/adoc/modules/runtime-services/images/ContentNegotiationService/facade-choices.pptx
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/images/ContentNegotiationService/facade-choices.pptx
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/images/ContentNegotiationService/facade-choices.pptx
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/images/rgfis/service-collaborations.png b/core/runtimeservices/src/main/adoc/modules/runtime-services/images/RepresentationService/service-collaborations.png
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/images/rgfis/service-collaborations.png
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/images/RepresentationService/service-collaborations.png
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/images/RepresentationService/service-collaborations.pptx b/core/runtimeservices/src/main/adoc/modules/runtime-services/images/RepresentationService/service-collaborations.pptx
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/images/RepresentationService/service-collaborations.pptx
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/images/RepresentationService/service-collaborations.pptx
diff --git a/core/codegen-bytebuddy/src/main/doc/modules/codegen-bytebuddy/nav.adoc b/core/runtimeservices/src/main/adoc/modules/runtime-services/nav.adoc
similarity index 100%
rename from core/codegen-bytebuddy/src/main/doc/modules/codegen-bytebuddy/nav.adoc
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/nav.adoc
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/pages/about.adoc b/core/runtimeservices/src/main/adoc/modules/runtime-services/pages/about.adoc
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/pages/about.adoc
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/pages/about.adoc
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/pages/application-layer.adoc b/core/runtimeservices/src/main/adoc/modules/runtime-services/pages/application-layer.adoc
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/pages/application-layer.adoc
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/pages/application-layer.adoc
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/pages/application-layer/AuthenticationSessionProvider.adoc b/core/runtimeservices/src/main/adoc/modules/runtime-services/pages/application-layer/AuthenticationSessionProvider.adoc
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/pages/application-layer/AuthenticationSessionProvider.adoc
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/pages/application-layer/AuthenticationSessionProvider.adoc
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/pages/application-layer/CommandDtoServiceInternal.adoc b/core/runtimeservices/src/main/adoc/modules/runtime-services/pages/application-layer/CommandDtoServiceInternal.adoc
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/pages/application-layer/CommandDtoServiceInternal.adoc
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/pages/application-layer/CommandDtoServiceInternal.adoc
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/pages/application-layer/InteractionDtoServiceInternal.adoc b/core/runtimeservices/src/main/adoc/modules/runtime-services/pages/application-layer/InteractionDtoServiceInternal.adoc
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/pages/application-layer/InteractionDtoServiceInternal.adoc
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/pages/application-layer/InteractionDtoServiceInternal.adoc
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer.adoc b/core/runtimeservices/src/main/adoc/modules/runtime-services/pages/persistence-layer.adoc
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer.adoc
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/pages/persistence-layer.adoc
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer/AuditingServiceInternal.adoc b/core/runtimeservices/src/main/adoc/modules/runtime-services/pages/persistence-layer/AuditingServiceInternal.adoc
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer/AuditingServiceInternal.adoc
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/pages/persistence-layer/AuditingServiceInternal.adoc
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer/ChangedObjectsServiceInternal.adoc b/core/runtimeservices/src/main/adoc/modules/runtime-services/pages/persistence-layer/ChangedObjectsServiceInternal.adoc
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer/ChangedObjectsServiceInternal.adoc
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/pages/persistence-layer/ChangedObjectsServiceInternal.adoc
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer/PersistenceSessionServiceInternal.adoc b/core/runtimeservices/src/main/adoc/modules/runtime-services/pages/persistence-layer/PersistenceSessionServiceInternal.adoc
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer/PersistenceSessionServiceInternal.adoc
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/pages/persistence-layer/PersistenceSessionServiceInternal.adoc
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer/PublishingServiceInternal.adoc b/core/runtimeservices/src/main/adoc/modules/runtime-services/pages/persistence-layer/PublishingServiceInternal.adoc
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer/PublishingServiceInternal.adoc
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/pages/persistence-layer/PublishingServiceInternal.adoc
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/pages/presentation-layer.adoc b/core/runtimeservices/src/main/adoc/modules/runtime-services/pages/presentation-layer.adoc
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/pages/presentation-layer.adoc
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/pages/presentation-layer.adoc
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/pages/presentation-layer/ContentNegotiationService.adoc b/core/runtimeservices/src/main/adoc/modules/runtime-services/pages/presentation-layer/ContentNegotiationService.adoc
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/pages/presentation-layer/ContentNegotiationService.adoc
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/pages/presentation-layer/ContentNegotiationService.adoc
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/pages/presentation-layer/RepresentationService.adoc b/core/runtimeservices/src/main/adoc/modules/runtime-services/pages/presentation-layer/RepresentationService.adoc
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/pages/presentation-layer/RepresentationService.adoc
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/pages/presentation-layer/RepresentationService.adoc
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/partials/module-nav.adoc b/core/runtimeservices/src/main/adoc/modules/runtime-services/partials/module-nav.adoc
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/partials/module-nav.adoc
rename to core/runtimeservices/src/main/adoc/modules/runtime-services/partials/module-nav.adoc
diff --git a/extensions/security/shiro-realm-ldap/src/main/doc/antora.yml b/core/security/src/main/adoc/antora.yml
similarity index 100%
rename from extensions/security/shiro-realm-ldap/src/main/doc/antora.yml
rename to core/security/src/main/adoc/antora.yml
diff --git a/core/security/src/main/doc/modules/core/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG b/core/security/src/main/adoc/modules/core/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
similarity index 100%
rename from core/security/src/main/doc/modules/core/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
rename to core/security/src/main/adoc/modules/core/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
diff --git a/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/nav.adoc b/core/security/src/main/adoc/modules/core/nav.adoc
similarity index 100%
rename from extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/nav.adoc
rename to core/security/src/main/adoc/modules/core/nav.adoc
diff --git a/core/security/src/main/doc/modules/core/pages/about.adoc b/core/security/src/main/adoc/modules/core/pages/about.adoc
similarity index 100%
rename from core/security/src/main/doc/modules/core/pages/about.adoc
rename to core/security/src/main/adoc/modules/core/pages/about.adoc
diff --git a/core/security/src/main/doc/modules/core/partials/module-nav.adoc b/core/security/src/main/adoc/modules/core/partials/module-nav.adoc
similarity index 100%
rename from core/security/src/main/doc/modules/core/partials/module-nav.adoc
rename to core/security/src/main/adoc/modules/core/partials/module-nav.adoc
diff --git a/testing/unittestsupport/src/main/doc/antora.yml b/core/unittestsupport/src/main/adoc/antora.yml
similarity index 100%
rename from testing/unittestsupport/src/main/doc/antora.yml
rename to core/unittestsupport/src/main/adoc/antora.yml
diff --git a/testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/nav.adoc b/core/unittestsupport/src/main/adoc/modules/unittestsupport/nav.adoc
similarity index 100%
rename from testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/nav.adoc
rename to core/unittestsupport/src/main/adoc/modules/unittestsupport/nav.adoc
diff --git a/core/unittestsupport/src/main/doc/modules/unittestsupport/pages/about.adoc b/core/unittestsupport/src/main/adoc/modules/unittestsupport/pages/about.adoc
similarity index 100%
rename from core/unittestsupport/src/main/doc/modules/unittestsupport/pages/about.adoc
rename to core/unittestsupport/src/main/adoc/modules/unittestsupport/pages/about.adoc
diff --git a/core/unittestsupport/src/main/doc/modules/unittestsupport/pages/contract-tests.adoc b/core/unittestsupport/src/main/adoc/modules/unittestsupport/pages/contract-tests.adoc
similarity index 100%
rename from core/unittestsupport/src/main/doc/modules/unittestsupport/pages/contract-tests.adoc
rename to core/unittestsupport/src/main/adoc/modules/unittestsupport/pages/contract-tests.adoc
diff --git a/core/unittestsupport/src/main/doc/modules/unittestsupport/pages/jmock-extensions.adoc b/core/unittestsupport/src/main/adoc/modules/unittestsupport/pages/jmock-extensions.adoc
similarity index 100%
rename from core/unittestsupport/src/main/doc/modules/unittestsupport/pages/jmock-extensions.adoc
rename to core/unittestsupport/src/main/adoc/modules/unittestsupport/pages/jmock-extensions.adoc
diff --git a/core/unittestsupport/src/main/doc/modules/unittestsupport/pages/maven-configuration.adoc b/core/unittestsupport/src/main/adoc/modules/unittestsupport/pages/maven-configuration.adoc
similarity index 100%
rename from core/unittestsupport/src/main/doc/modules/unittestsupport/pages/maven-configuration.adoc
rename to core/unittestsupport/src/main/adoc/modules/unittestsupport/pages/maven-configuration.adoc
diff --git a/core/unittestsupport/src/main/doc/modules/unittestsupport/pages/soap-fake-server-junit-rule.adoc b/core/unittestsupport/src/main/adoc/modules/unittestsupport/pages/soap-fake-server-junit-rule.adoc
similarity index 100%
rename from core/unittestsupport/src/main/doc/modules/unittestsupport/pages/soap-fake-server-junit-rule.adoc
rename to core/unittestsupport/src/main/adoc/modules/unittestsupport/pages/soap-fake-server-junit-rule.adoc
diff --git a/core/unittestsupport/src/main/doc/modules/unittestsupport/partials/module-nav.adoc b/core/unittestsupport/src/main/adoc/modules/unittestsupport/partials/module-nav.adoc
similarity index 100%
rename from core/unittestsupport/src/main/doc/modules/unittestsupport/partials/module-nav.adoc
rename to core/unittestsupport/src/main/adoc/modules/unittestsupport/partials/module-nav.adoc
diff --git a/core/commons/src/main/doc/antora.yml b/core/webapp/src/main/adoc/antora.yml
similarity index 100%
rename from core/commons/src/main/doc/antora.yml
rename to core/webapp/src/main/adoc/antora.yml
diff --git a/core/webapp/src/main/doc/modules/webapp/nav.adoc b/core/webapp/src/main/adoc/modules/webapp/nav.adoc
similarity index 100%
rename from core/webapp/src/main/doc/modules/webapp/nav.adoc
rename to core/webapp/src/main/adoc/modules/webapp/nav.adoc
diff --git a/core/webapp/src/main/doc/modules/webapp/pages/about.adoc b/core/webapp/src/main/adoc/modules/webapp/pages/about.adoc
similarity index 100%
rename from core/webapp/src/main/doc/modules/webapp/pages/about.adoc
rename to core/webapp/src/main/adoc/modules/webapp/pages/about.adoc
diff --git a/core/webapp/src/main/doc/modules/webapp/partials/module-nav.adoc b/core/webapp/src/main/adoc/modules/webapp/partials/module-nav.adoc
similarity index 100%
rename from core/webapp/src/main/doc/modules/webapp/partials/module-nav.adoc
rename to core/webapp/src/main/adoc/modules/webapp/partials/module-nav.adoc
diff --git a/extensions/vro/cors/src/main/doc/antora.yml b/core/webspringboot/src/main/adoc/antora.yml
similarity index 100%
copy from extensions/vro/cors/src/main/doc/antora.yml
copy to core/webspringboot/src/main/adoc/antora.yml
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/nav.adoc b/core/webspringboot/src/main/adoc/modules/webboot-springboot/nav.adoc
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/nav.adoc
rename to core/webspringboot/src/main/adoc/modules/webboot-springboot/nav.adoc
diff --git a/core/webspringboot/src/main/adoc/modules/webboot-springboot/pages/about.adoc b/core/webspringboot/src/main/adoc/modules/webboot-springboot/pages/about.adoc
new file mode 100644
index 0000000..666722c
--- /dev/null
+++ b/core/webspringboot/src/main/adoc/modules/webboot-springboot/pages/about.adoc
@@ -0,0 +1,3 @@
+= Runtime Spring
+
+
diff --git a/core/webspringboot/src/main/adoc/modules/webboot-springboot/partials/module-nav.adoc b/core/webspringboot/src/main/adoc/modules/webboot-springboot/partials/module-nav.adoc
new file mode 100644
index 0000000..614006d
--- /dev/null
+++ b/core/webspringboot/src/main/adoc/modules/webboot-springboot/partials/module-nav.adoc
@@ -0,0 +1 @@
+* xref:core:webboot-springboot:about.adoc[SpringBoot]
diff --git a/examples/demo/src/main/doc/antora.yml b/examples/demo/src/main/adoc/antora.yml
similarity index 100%
rename from examples/demo/src/main/doc/antora.yml
rename to examples/demo/src/main/adoc/antora.yml
diff --git a/examples/demo/src/main/doc/modules/ROOT/nav.adoc b/examples/demo/src/main/adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from examples/demo/src/main/doc/modules/ROOT/nav.adoc
rename to examples/demo/src/main/adoc/modules/ROOT/nav.adoc
diff --git a/examples/demo/src/main/doc/modules/ROOT/pages/about.adoc b/examples/demo/src/main/adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from examples/demo/src/main/doc/modules/ROOT/pages/about.adoc
rename to examples/demo/src/main/adoc/modules/ROOT/pages/about.adoc
diff --git a/core/codegen-bytebuddy/src/main/doc/antora.yml b/examples/smoketests/src/main/adoc/antora.yml
similarity index 100%
rename from core/codegen-bytebuddy/src/main/doc/antora.yml
rename to examples/smoketests/src/main/adoc/antora.yml
diff --git a/examples/smoketests/src/main/doc/modules/smoketests/nav.adoc b/examples/smoketests/src/main/adoc/modules/smoketests/nav.adoc
similarity index 100%
rename from examples/smoketests/src/main/doc/modules/smoketests/nav.adoc
rename to examples/smoketests/src/main/adoc/modules/smoketests/nav.adoc
diff --git a/examples/smoketests/src/main/doc/modules/smoketests/pages/about.adoc b/examples/smoketests/src/main/adoc/modules/smoketests/pages/about.adoc
similarity index 100%
rename from examples/smoketests/src/main/doc/modules/smoketests/pages/about.adoc
rename to examples/smoketests/src/main/adoc/modules/smoketests/pages/about.adoc
diff --git a/examples/smoketests/src/main/doc/modules/smoketests/partials/module-nav.adoc b/examples/smoketests/src/main/adoc/modules/smoketests/partials/module-nav.adoc
similarity index 100%
rename from examples/smoketests/src/main/doc/modules/smoketests/partials/module-nav.adoc
rename to examples/smoketests/src/main/adoc/modules/smoketests/partials/module-nav.adoc
diff --git a/extensions/persistence/jdo/flywayjdo/src/main/doc/antora.yml b/extensions/persistence/jdo/flywayjdo/src/main/adoc/antora.yml
similarity index 100%
rename from extensions/persistence/jdo/flywayjdo/src/main/doc/antora.yml
rename to extensions/persistence/jdo/flywayjdo/src/main/adoc/antora.yml
diff --git a/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/nav.adoc b/extensions/persistence/jdo/flywayjdo/src/main/adoc/modules/flywayjdo/nav.adoc
similarity index 100%
rename from extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/nav.adoc
rename to extensions/persistence/jdo/flywayjdo/src/main/adoc/modules/flywayjdo/nav.adoc
diff --git a/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/pages/about.adoc b/extensions/persistence/jdo/flywayjdo/src/main/adoc/modules/flywayjdo/pages/about.adoc
similarity index 100%
rename from extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/pages/about.adoc
rename to extensions/persistence/jdo/flywayjdo/src/main/adoc/modules/flywayjdo/pages/about.adoc
diff --git a/extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/partials/module-nav.adoc b/extensions/persistence/jdo/flywayjdo/src/main/adoc/modules/flywayjdo/partials/module-nav.adoc
similarity index 100%
rename from extensions/persistence/jdo/flywayjdo/src/main/doc/modules/flywayjdo/partials/module-nav.adoc
rename to extensions/persistence/jdo/flywayjdo/src/main/adoc/modules/flywayjdo/partials/module-nav.adoc
diff --git a/extensions/security/secman/src/main/doc/antora.yml b/extensions/security/secman/src/main/adoc/antora.yml
similarity index 100%
rename from extensions/security/secman/src/main/doc/antora.yml
rename to extensions/security/secman/src/main/adoc/antora.yml
diff --git a/extensions/security/secman/src/main/doc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG b/extensions/security/secman/src/main/adoc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
rename to extensions/security/secman/src/main/adoc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm-with-delegate-realm.PNG
diff --git a/extensions/security/secman/src/main/doc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG b/extensions/security/secman/src/main/adoc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG
rename to extensions/security/secman/src/main/adoc/modules/secman/images/shiro-realm/configure-shiro-to-use-isisaddons-security-module-realm.PNG
diff --git a/extensions/security/secman/src/main/doc/modules/secman/nav.adoc b/extensions/security/secman/src/main/adoc/modules/secman/nav.adoc
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/secman/nav.adoc
rename to extensions/security/secman/src/main/adoc/modules/secman/nav.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/secman/pages/about.adoc b/extensions/security/secman/src/main/adoc/modules/secman/pages/about.adoc
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/secman/pages/about.adoc
rename to extensions/security/secman/src/main/adoc/modules/secman/pages/about.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/secman/pages/api.adoc b/extensions/security/secman/src/main/adoc/modules/secman/pages/api.adoc
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/secman/pages/api.adoc
rename to extensions/security/secman/src/main/adoc/modules/secman/pages/api.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/secman/pages/jbcrypt-encryption.adoc b/extensions/security/secman/src/main/adoc/modules/secman/pages/jbcrypt-encryption.adoc
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/secman/pages/jbcrypt-encryption.adoc
rename to extensions/security/secman/src/main/adoc/modules/secman/pages/jbcrypt-encryption.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/secman/pages/jdo-persistence.adoc b/extensions/security/secman/src/main/adoc/modules/secman/pages/jdo-persistence.adoc
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/secman/pages/jdo-persistence.adoc
rename to extensions/security/secman/src/main/adoc/modules/secman/pages/jdo-persistence.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/secman/pages/model.adoc b/extensions/security/secman/src/main/adoc/modules/secman/pages/model.adoc
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/secman/pages/model.adoc
rename to extensions/security/secman/src/main/adoc/modules/secman/pages/model.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/secman/pages/shiro-realm.adoc b/extensions/security/secman/src/main/adoc/modules/secman/pages/shiro-realm.adoc
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/secman/pages/shiro-realm.adoc
rename to extensions/security/secman/src/main/adoc/modules/secman/pages/shiro-realm.adoc
diff --git a/extensions/security/secman/src/main/doc/modules/secman/partials/module-nav.adoc b/extensions/security/secman/src/main/adoc/modules/secman/partials/module-nav.adoc
similarity index 100%
rename from extensions/security/secman/src/main/doc/modules/secman/partials/module-nav.adoc
rename to extensions/security/secman/src/main/adoc/modules/secman/partials/module-nav.adoc
diff --git a/core/security/src/main/doc/antora.yml b/extensions/security/shiro-realm-ldap/src/main/adoc/antora.yml
similarity index 100%
rename from core/security/src/main/doc/antora.yml
rename to extensions/security/shiro-realm-ldap/src/main/adoc/antora.yml
diff --git a/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/examples/shiro.ini b/extensions/security/shiro-realm-ldap/src/main/adoc/modules/shiro-realm-ldap/examples/shiro.ini
similarity index 100%
rename from extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/examples/shiro.ini
rename to extensions/security/shiro-realm-ldap/src/main/adoc/modules/shiro-realm-ldap/examples/shiro.ini
diff --git a/core/security/src/main/doc/modules/core/nav.adoc b/extensions/security/shiro-realm-ldap/src/main/adoc/modules/shiro-realm-ldap/nav.adoc
similarity index 100%
rename from core/security/src/main/doc/modules/core/nav.adoc
rename to extensions/security/shiro-realm-ldap/src/main/adoc/modules/shiro-realm-ldap/nav.adoc
diff --git a/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/pages/about.adoc b/extensions/security/shiro-realm-ldap/src/main/adoc/modules/shiro-realm-ldap/pages/about.adoc
similarity index 100%
rename from extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/pages/about.adoc
rename to extensions/security/shiro-realm-ldap/src/main/adoc/modules/shiro-realm-ldap/pages/about.adoc
diff --git a/extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/partials/module-nav.adoc b/extensions/security/shiro-realm-ldap/src/main/adoc/modules/shiro-realm-ldap/partials/module-nav.adoc
similarity index 100%
rename from extensions/security/shiro-realm-ldap/src/main/doc/modules/shiro-realm-ldap/partials/module-nav.adoc
rename to extensions/security/shiro-realm-ldap/src/main/adoc/modules/shiro-realm-ldap/partials/module-nav.adoc
diff --git a/extensions/vro/cors/src/main/doc/antora.yml b/extensions/vro/cors/src/main/adoc/antora.yml
similarity index 100%
rename from extensions/vro/cors/src/main/doc/antora.yml
rename to extensions/vro/cors/src/main/adoc/antora.yml
diff --git a/extensions/vro/cors/src/main/doc/modules/cors/nav.adoc b/extensions/vro/cors/src/main/adoc/modules/cors/nav.adoc
similarity index 100%
rename from extensions/vro/cors/src/main/doc/modules/cors/nav.adoc
rename to extensions/vro/cors/src/main/adoc/modules/cors/nav.adoc
diff --git a/valuetypes/markdown/src/main/doc/modules/markdown/pages/about.adoc b/extensions/vro/cors/src/main/adoc/modules/cors/pages/about.adoc
similarity index 100%
rename from valuetypes/markdown/src/main/doc/modules/markdown/pages/about.adoc
rename to extensions/vro/cors/src/main/adoc/modules/cors/pages/about.adoc
diff --git a/extensions/vro/cors/src/main/doc/modules/cors/partials/module-nav.adoc b/extensions/vro/cors/src/main/adoc/modules/cors/partials/module-nav.adoc
similarity index 100%
rename from extensions/vro/cors/src/main/doc/modules/cors/partials/module-nav.adoc
rename to extensions/vro/cors/src/main/adoc/modules/cors/partials/module-nav.adoc
diff --git a/extensions/vw/pdfjs/src/main/doc/antora.yml b/extensions/vw/exceldownload/src/main/adoc/antora.yml
similarity index 100%
rename from extensions/vw/pdfjs/src/main/doc/antora.yml
rename to extensions/vw/exceldownload/src/main/adoc/antora.yml
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/nav.adoc b/extensions/vw/exceldownload/src/main/adoc/modules/exceldownload/nav.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/nav.adoc
rename to extensions/vw/exceldownload/src/main/adoc/modules/exceldownload/nav.adoc
diff --git a/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/pages/about.adoc b/extensions/vw/exceldownload/src/main/adoc/modules/exceldownload/pages/about.adoc
similarity index 100%
copy from extensions/vw/exceldownload/src/main/doc/modules/exceldownload/pages/about.adoc
copy to extensions/vw/exceldownload/src/main/adoc/modules/exceldownload/pages/about.adoc
diff --git a/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/partials/module-nav.adoc b/extensions/vw/exceldownload/src/main/adoc/modules/exceldownload/partials/module-nav.adoc
similarity index 100%
rename from extensions/vw/exceldownload/src/main/doc/modules/exceldownload/partials/module-nav.adoc
rename to extensions/vw/exceldownload/src/main/adoc/modules/exceldownload/partials/module-nav.adoc
diff --git a/extensions/vw/exceldownload/src/main/doc/antora.yml b/extensions/vw/pdfjs/src/main/adoc/antora.yml
similarity index 100%
rename from extensions/vw/exceldownload/src/main/doc/antora.yml
rename to extensions/vw/pdfjs/src/main/adoc/antora.yml
diff --git a/valuetypes/markdown/src/main/doc/modules/markdown/nav.adoc b/extensions/vw/pdfjs/src/main/adoc/modules/pdfjs/nav.adoc
similarity index 100%
rename from valuetypes/markdown/src/main/doc/modules/markdown/nav.adoc
rename to extensions/vw/pdfjs/src/main/adoc/modules/pdfjs/nav.adoc
diff --git a/extensions/vw/pdfjs/src/main/doc/modules/pdfjs/pages/about.adoc b/extensions/vw/pdfjs/src/main/adoc/modules/pdfjs/pages/about.adoc
similarity index 100%
rename from extensions/vw/pdfjs/src/main/doc/modules/pdfjs/pages/about.adoc
rename to extensions/vw/pdfjs/src/main/adoc/modules/pdfjs/pages/about.adoc
diff --git a/extensions/vw/pdfjs/src/main/doc/modules/pdfjs/partials/module-nav.adoc b/extensions/vw/pdfjs/src/main/adoc/modules/pdfjs/partials/module-nav.adoc
similarity index 100%
rename from extensions/vw/pdfjs/src/main/doc/modules/pdfjs/partials/module-nav.adoc
rename to extensions/vw/pdfjs/src/main/adoc/modules/pdfjs/partials/module-nav.adoc
diff --git a/api/applib/src/main/doc/antora.yml b/incubator/extensions/core/microprofile/src/main/adoc/antora.yml
similarity index 50%
copy from api/applib/src/main/doc/antora.yml
copy to incubator/extensions/core/microprofile/src/main/adoc/antora.yml
index 7ac2b7b..74244f9 100644
--- a/api/applib/src/main/doc/antora.yml
+++ b/incubator/extensions/core/microprofile/src/main/adoc/antora.yml
@@ -1,2 +1,2 @@
-name: refguide
+name: incubator
 version: master
diff --git a/incubator/extensions/core/microprofile/src/main/adoc/modules/microprofile/nav.adoc b/incubator/extensions/core/microprofile/src/main/adoc/modules/microprofile/nav.adoc
new file mode 100644
index 0000000..a946dfb
--- /dev/null
+++ b/incubator/extensions/core/microprofile/src/main/adoc/modules/microprofile/nav.adoc
@@ -0,0 +1 @@
+include::incubator:ROOT:partial$component-nav.adoc[]
diff --git a/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/pages/about.adoc b/incubator/extensions/core/microprofile/src/main/adoc/modules/microprofile/pages/about.adoc
similarity index 90%
copy from extensions/vw/exceldownload/src/main/doc/modules/exceldownload/pages/about.adoc
copy to incubator/extensions/core/microprofile/src/main/adoc/modules/microprofile/pages/about.adoc
index 5e9d086..3754da4 100644
--- a/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/pages/about.adoc
+++ b/incubator/extensions/core/microprofile/src/main/adoc/modules/microprofile/pages/about.adoc
@@ -1,6 +1,5 @@
-= About
+= MicroProfile
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-
-TODO: v2: placeholder for documentation about excel-download
+TODO: v2: placeholder for documentation about incubator/model
 
diff --git a/incubator/extensions/core/microprofile/src/main/adoc/modules/microprofile/partials/module-nav.adoc b/incubator/extensions/core/microprofile/src/main/adoc/modules/microprofile/partials/module-nav.adoc
new file mode 100644
index 0000000..82ebf0f
--- /dev/null
+++ b/incubator/extensions/core/microprofile/src/main/adoc/modules/microprofile/partials/module-nav.adoc
@@ -0,0 +1,4 @@
+* xref:incubator:microprofile:about.adoc[MicroProfile]
+
+
+
diff --git a/api/applib/src/main/doc/antora.yml b/incubator/extensions/core/model/src/main/adoc/antora.yml
similarity index 50%
rename from api/applib/src/main/doc/antora.yml
rename to incubator/extensions/core/model/src/main/adoc/antora.yml
index 7ac2b7b..74244f9 100644
--- a/api/applib/src/main/doc/antora.yml
+++ b/incubator/extensions/core/model/src/main/adoc/antora.yml
@@ -1,2 +1,2 @@
-name: refguide
+name: incubator
 version: master
diff --git a/incubator/extensions/core/model/src/main/adoc/modules/model/nav.adoc b/incubator/extensions/core/model/src/main/adoc/modules/model/nav.adoc
new file mode 100644
index 0000000..a946dfb
--- /dev/null
+++ b/incubator/extensions/core/model/src/main/adoc/modules/model/nav.adoc
@@ -0,0 +1 @@
+include::incubator:ROOT:partial$component-nav.adoc[]
diff --git a/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/pages/about.adoc b/incubator/extensions/core/model/src/main/adoc/modules/model/pages/about.adoc
similarity index 90%
rename from extensions/vw/exceldownload/src/main/doc/modules/exceldownload/pages/about.adoc
rename to incubator/extensions/core/model/src/main/adoc/modules/model/pages/about.adoc
index 5e9d086..b49c7ed 100644
--- a/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/pages/about.adoc
+++ b/incubator/extensions/core/model/src/main/adoc/modules/model/pages/about.adoc
@@ -1,6 +1,5 @@
-= About
+= @Model Support
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-
-TODO: v2: placeholder for documentation about excel-download
+TODO: v2: placeholder for documentation about incubator/model
 
diff --git a/incubator/extensions/core/model/src/main/adoc/modules/model/partials/module-nav.adoc b/incubator/extensions/core/model/src/main/adoc/modules/model/partials/module-nav.adoc
new file mode 100644
index 0000000..26d195f
--- /dev/null
+++ b/incubator/extensions/core/model/src/main/adoc/modules/model/partials/module-nav.adoc
@@ -0,0 +1,4 @@
+* xref:incubator:model:about.adoc[@Model]
+
+
+
diff --git a/legacy/subdomains/servletapi/impl/src/main/doc/antora.yml b/legacy/extensions/core/applib/src/main/adoc/antora.yml
similarity index 100%
rename from legacy/subdomains/servletapi/impl/src/main/doc/antora.yml
rename to legacy/extensions/core/applib/src/main/adoc/antora.yml
diff --git a/legacy/mappings/restclient/src/main/doc/modules/restclient/nav.adoc b/legacy/extensions/core/applib/src/main/adoc/modules/applib/nav.adoc
similarity index 100%
rename from legacy/mappings/restclient/src/main/doc/modules/restclient/nav.adoc
rename to legacy/extensions/core/applib/src/main/adoc/modules/applib/nav.adoc
diff --git a/legacy/extensions/core/applib/src/main/doc/modules/applib/pages/about.adoc b/legacy/extensions/core/applib/src/main/adoc/modules/applib/pages/about.adoc
similarity index 100%
rename from legacy/extensions/core/applib/src/main/doc/modules/applib/pages/about.adoc
rename to legacy/extensions/core/applib/src/main/adoc/modules/applib/pages/about.adoc
diff --git a/legacy/extensions/core/applib/src/main/doc/modules/applib/partials/module-nav.adoc b/legacy/extensions/core/applib/src/main/adoc/modules/applib/partials/module-nav.adoc
similarity index 100%
rename from legacy/extensions/core/applib/src/main/doc/modules/applib/partials/module-nav.adoc
rename to legacy/extensions/core/applib/src/main/adoc/modules/applib/partials/module-nav.adoc
diff --git a/legacy/mappings/restclient/src/main/doc/antora.yml b/legacy/extensions/core/commons/src/main/adoc/antora.yml
similarity index 100%
rename from legacy/mappings/restclient/src/main/doc/antora.yml
rename to legacy/extensions/core/commons/src/main/adoc/antora.yml
diff --git a/legacy/extensions/core/runtime/src/main/doc/modules/runtime/nav.adoc b/legacy/extensions/core/commons/src/main/adoc/modules/commons/nav.adoc
similarity index 100%
rename from legacy/extensions/core/runtime/src/main/doc/modules/runtime/nav.adoc
rename to legacy/extensions/core/commons/src/main/adoc/modules/commons/nav.adoc
diff --git a/legacy/extensions/core/commons/src/main/doc/modules/commons/pages/about.adoc b/legacy/extensions/core/commons/src/main/adoc/modules/commons/pages/about.adoc
similarity index 100%
rename from legacy/extensions/core/commons/src/main/doc/modules/commons/pages/about.adoc
rename to legacy/extensions/core/commons/src/main/adoc/modules/commons/pages/about.adoc
diff --git a/legacy/extensions/core/commons/src/main/doc/modules/commons/partials/module-nav.adoc b/legacy/extensions/core/commons/src/main/adoc/modules/commons/partials/module-nav.adoc
similarity index 100%
rename from legacy/extensions/core/commons/src/main/doc/modules/commons/partials/module-nav.adoc
rename to legacy/extensions/core/commons/src/main/adoc/modules/commons/partials/module-nav.adoc
diff --git a/legacy/extensions/core/runtime/src/main/doc/antora.yml b/legacy/extensions/core/runtime/src/main/adoc/antora.yml
similarity index 100%
rename from legacy/extensions/core/runtime/src/main/doc/antora.yml
rename to legacy/extensions/core/runtime/src/main/adoc/antora.yml
diff --git a/legacy/extensions/core/commons/src/main/doc/modules/commons/nav.adoc b/legacy/extensions/core/runtime/src/main/adoc/modules/runtime/nav.adoc
similarity index 100%
rename from legacy/extensions/core/commons/src/main/doc/modules/commons/nav.adoc
rename to legacy/extensions/core/runtime/src/main/adoc/modules/runtime/nav.adoc
diff --git a/legacy/extensions/core/runtime/src/main/doc/modules/runtime/pages/about.adoc b/legacy/extensions/core/runtime/src/main/adoc/modules/runtime/pages/about.adoc
similarity index 100%
rename from legacy/extensions/core/runtime/src/main/doc/modules/runtime/pages/about.adoc
rename to legacy/extensions/core/runtime/src/main/adoc/modules/runtime/pages/about.adoc
diff --git a/legacy/extensions/core/runtime/src/main/doc/modules/runtime/partials/module-nav.adoc b/legacy/extensions/core/runtime/src/main/adoc/modules/runtime/partials/module-nav.adoc
similarity index 100%
rename from legacy/extensions/core/runtime/src/main/doc/modules/runtime/partials/module-nav.adoc
rename to legacy/extensions/core/runtime/src/main/adoc/modules/runtime/partials/module-nav.adoc
diff --git a/legacy/extensions/core/commons/src/main/doc/antora.yml b/legacy/mappings/restclient/src/main/adoc/antora.yml
similarity index 100%
rename from legacy/extensions/core/commons/src/main/doc/antora.yml
rename to legacy/mappings/restclient/src/main/adoc/antora.yml
diff --git a/legacy/extensions/core/applib/src/main/doc/modules/applib/nav.adoc b/legacy/mappings/restclient/src/main/adoc/modules/restclient/nav.adoc
similarity index 100%
rename from legacy/extensions/core/applib/src/main/doc/modules/applib/nav.adoc
rename to legacy/mappings/restclient/src/main/adoc/modules/restclient/nav.adoc
diff --git a/legacy/mappings/restclient/src/main/doc/modules/restclient/pages/about.adoc b/legacy/mappings/restclient/src/main/adoc/modules/restclient/pages/about.adoc
similarity index 100%
rename from legacy/mappings/restclient/src/main/doc/modules/restclient/pages/about.adoc
rename to legacy/mappings/restclient/src/main/adoc/modules/restclient/pages/about.adoc
diff --git a/legacy/mappings/restclient/src/main/doc/modules/restclient/partials/module-nav.adoc b/legacy/mappings/restclient/src/main/adoc/modules/restclient/partials/module-nav.adoc
similarity index 100%
rename from legacy/mappings/restclient/src/main/doc/modules/restclient/partials/module-nav.adoc
rename to legacy/mappings/restclient/src/main/adoc/modules/restclient/partials/module-nav.adoc
diff --git a/legacy/extensions/core/applib/src/main/doc/antora.yml b/legacy/subdomains/servletapi/src/main/adoc/antora.yml
similarity index 100%
rename from legacy/extensions/core/applib/src/main/doc/antora.yml
rename to legacy/subdomains/servletapi/src/main/adoc/antora.yml
diff --git a/testing/h2console/src/main/doc/modules/h2console/nav.adoc b/legacy/subdomains/servletapi/src/main/adoc/modules/servletapi/nav.adoc
similarity index 100%
rename from testing/h2console/src/main/doc/modules/h2console/nav.adoc
rename to legacy/subdomains/servletapi/src/main/adoc/modules/servletapi/nav.adoc
diff --git a/legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/pages/about.adoc b/legacy/subdomains/servletapi/src/main/adoc/modules/servletapi/pages/about.adoc
similarity index 100%
rename from legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/pages/about.adoc
rename to legacy/subdomains/servletapi/src/main/adoc/modules/servletapi/pages/about.adoc
diff --git a/legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/partials/module-nav.adoc b/legacy/subdomains/servletapi/src/main/adoc/modules/servletapi/partials/module-nav.adoc
similarity index 100%
rename from legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/partials/module-nav.adoc
rename to legacy/subdomains/servletapi/src/main/adoc/modules/servletapi/partials/module-nav.adoc
diff --git a/mappings/slack/src/main/doc/antora.yml b/mappings/jaxrsclient/src/main/adoc/antora.yml
similarity index 100%
rename from mappings/slack/src/main/doc/antora.yml
rename to mappings/jaxrsclient/src/main/adoc/antora.yml
diff --git a/mappings/slack/src/main/doc/modules/slack/nav.adoc b/mappings/jaxrsclient/src/main/adoc/modules/jaxrsclient/nav.adoc
similarity index 100%
rename from mappings/slack/src/main/doc/modules/slack/nav.adoc
rename to mappings/jaxrsclient/src/main/adoc/modules/jaxrsclient/nav.adoc
diff --git a/mappings/jaxrsclient/src/main/doc/modules/jaxrsclient/pages/about.adoc b/mappings/jaxrsclient/src/main/adoc/modules/jaxrsclient/pages/about.adoc
similarity index 100%
rename from mappings/jaxrsclient/src/main/doc/modules/jaxrsclient/pages/about.adoc
rename to mappings/jaxrsclient/src/main/adoc/modules/jaxrsclient/pages/about.adoc
diff --git a/mappings/jaxrsclient/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc b/mappings/jaxrsclient/src/main/adoc/modules/jaxrsclient/partials/module-nav.adoc
similarity index 100%
rename from mappings/jaxrsclient/src/main/doc/modules/jaxrsclient/partials/module-nav.adoc
rename to mappings/jaxrsclient/src/main/adoc/modules/jaxrsclient/partials/module-nav.adoc
diff --git a/mappings/restclient/src/main/doc/antora.yml b/mappings/minio/src/main/adoc/antora.yml
similarity index 100%
rename from mappings/restclient/src/main/doc/antora.yml
rename to mappings/minio/src/main/adoc/antora.yml
diff --git a/mappings/minio/src/main/doc/modules/minio/nav.adoc b/mappings/minio/src/main/adoc/modules/minio/nav.adoc
similarity index 100%
rename from mappings/minio/src/main/doc/modules/minio/nav.adoc
rename to mappings/minio/src/main/adoc/modules/minio/nav.adoc
diff --git a/mappings/minio/src/main/doc/modules/minio/pages/about.adoc b/mappings/minio/src/main/adoc/modules/minio/pages/about.adoc
similarity index 100%
rename from mappings/minio/src/main/doc/modules/minio/pages/about.adoc
rename to mappings/minio/src/main/adoc/modules/minio/pages/about.adoc
diff --git a/mappings/minio/src/main/doc/modules/minio/partials/module-nav.adoc b/mappings/minio/src/main/adoc/modules/minio/partials/module-nav.adoc
similarity index 100%
rename from mappings/minio/src/main/doc/modules/minio/partials/module-nav.adoc
rename to mappings/minio/src/main/adoc/modules/minio/partials/module-nav.adoc
diff --git a/mappings/minio/src/main/doc/antora.yml b/mappings/restclient/src/main/adoc/antora.yml
similarity index 100%
rename from mappings/minio/src/main/doc/antora.yml
rename to mappings/restclient/src/main/adoc/antora.yml
diff --git a/mappings/restclient/src/main/doc/modules/restclient/nav.adoc b/mappings/restclient/src/main/adoc/modules/restclient/nav.adoc
similarity index 100%
rename from mappings/restclient/src/main/doc/modules/restclient/nav.adoc
rename to mappings/restclient/src/main/adoc/modules/restclient/nav.adoc
diff --git a/mappings/restclient/src/main/doc/modules/restclient/pages/about.adoc b/mappings/restclient/src/main/adoc/modules/restclient/pages/about.adoc
similarity index 100%
rename from mappings/restclient/src/main/doc/modules/restclient/pages/about.adoc
rename to mappings/restclient/src/main/adoc/modules/restclient/pages/about.adoc
diff --git a/mappings/restclient/src/main/doc/modules/restclient/partials/module-nav.adoc b/mappings/restclient/src/main/adoc/modules/restclient/partials/module-nav.adoc
similarity index 100%
rename from mappings/restclient/src/main/doc/modules/restclient/partials/module-nav.adoc
rename to mappings/restclient/src/main/adoc/modules/restclient/partials/module-nav.adoc
diff --git a/mappings/jaxrsclient/src/main/doc/antora.yml b/mappings/slack/src/main/adoc/antora.yml
similarity index 100%
rename from mappings/jaxrsclient/src/main/doc/antora.yml
rename to mappings/slack/src/main/adoc/antora.yml
diff --git a/mappings/jaxrsclient/src/main/doc/modules/jaxrsclient/nav.adoc b/mappings/slack/src/main/adoc/modules/slack/nav.adoc
similarity index 100%
rename from mappings/jaxrsclient/src/main/doc/modules/jaxrsclient/nav.adoc
rename to mappings/slack/src/main/adoc/modules/slack/nav.adoc
diff --git a/mappings/slack/src/main/doc/modules/slack/pages/about.adoc b/mappings/slack/src/main/adoc/modules/slack/pages/about.adoc
similarity index 100%
rename from mappings/slack/src/main/doc/modules/slack/pages/about.adoc
rename to mappings/slack/src/main/adoc/modules/slack/pages/about.adoc
diff --git a/mappings/slack/src/main/doc/modules/slack/partials/module-nav.adoc b/mappings/slack/src/main/adoc/modules/slack/partials/module-nav.adoc
similarity index 100%
rename from mappings/slack/src/main/doc/modules/slack/partials/module-nav.adoc
rename to mappings/slack/src/main/adoc/modules/slack/partials/module-nav.adoc
diff --git a/mavendeps/src/main/doc/antora.yml b/mavendeps/src/main/adoc/antora.yml
similarity index 100%
rename from mavendeps/src/main/doc/antora.yml
rename to mavendeps/src/main/adoc/antora.yml
diff --git a/mavendeps/src/main/doc/modules/mavendeps/nav.adoc b/mavendeps/src/main/adoc/modules/mavendeps/nav.adoc
similarity index 100%
rename from mavendeps/src/main/doc/modules/mavendeps/nav.adoc
rename to mavendeps/src/main/adoc/modules/mavendeps/nav.adoc
diff --git a/mavendeps/src/main/doc/modules/mavendeps/pages/about.adoc b/mavendeps/src/main/adoc/modules/mavendeps/pages/about.adoc
similarity index 100%
rename from mavendeps/src/main/doc/modules/mavendeps/pages/about.adoc
rename to mavendeps/src/main/adoc/modules/mavendeps/pages/about.adoc
diff --git a/persistence/jdo/src/main/doc/antora.yml b/persistence/jdo/src/main/adoc/antora.yml
similarity index 100%
rename from persistence/jdo/src/main/doc/antora.yml
rename to persistence/jdo/src/main/adoc/antora.yml
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/images/hints-n-tips/diagnosing-n-plus-1.png b/persistence/jdo/src/main/adoc/modules/ROOT/images/hints-n-tips/diagnosing-n-plus-1.png
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/images/hints-n-tips/diagnosing-n-plus-1.png
rename to persistence/jdo/src/main/adoc/modules/ROOT/images/hints-n-tips/diagnosing-n-plus-1.png
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png b/persistence/jdo/src/main/adoc/modules/ROOT/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png
rename to persistence/jdo/src/main/adoc/modules/ROOT/images/runtime/configuring-datanucleus/disabling-persistence-by-reachability/party-agreementrole-agreement.png
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/nav.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/nav.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/nav.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/about.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/about.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/about.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/configuring.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/configuring.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/configuring.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/bulk-load.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/configuring/bulk-load.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/bulk-load.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/configuring/bulk-load.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/persistence-xml.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/configuring/persistence-xml.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/persistence-xml.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/configuring/persistence-xml.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/properties.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/configuring/properties.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/properties.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/configuring/properties.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/using-jndi-data-source.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/configuring/using-jndi-data-source.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/configuring/using-jndi-data-source.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/configuring/using-jndi-data-source.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/db-schemas.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/db-schemas.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/db-schemas.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/db-schemas.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/hints-and-tips.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/hints-and-tips.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/java8.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/hints-and-tips/java8.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/java8.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/hints-and-tips/java8.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/subtype-entity-not-fully-populated.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/hints-and-tips/subtype-entity-not-fully-populated.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/subtype-entity-not-fully-populated.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/hints-and-tips/subtype-entity-not-fully-populated.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/jdo-mappings.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/jdo-mappings.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mandatory-properties-in-subtypes.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/jdo-mappings/mandatory-properties-in-subtypes.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mandatory-properties-in-subtypes.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/jdo-mappings/mandatory-properties-in-subtypes.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/one-to-m-bidirectional-relationships.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/pages/jdo-mappings/one-to-m-bidirectional-relationships.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/one-to-m-bidirectional-relationships.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/pages/jdo-mappings/one-to-m-bidirectional-relationships.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/partials/component-nav.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/partials/component-nav.adoc
diff --git a/persistence/jdo/src/main/doc/modules/ROOT/partials/module-nav.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from persistence/jdo/src/main/doc/modules/ROOT/partials/module-nav.adoc
rename to persistence/jdo/src/main/adoc/modules/ROOT/partials/module-nav.adoc
diff --git a/starters/src/main/doc/antora.yml b/starters/src/main/adoc/antora.yml
similarity index 100%
rename from starters/src/main/doc/antora.yml
rename to starters/src/main/adoc/antora.yml
diff --git a/starters/src/main/doc/modules/helloworld/nav.adoc b/starters/src/main/adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/nav.adoc
rename to starters/src/main/adoc/modules/ROOT/nav.adoc
diff --git a/starters/src/main/doc/modules/ROOT/pages/about.adoc b/starters/src/main/adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from starters/src/main/doc/modules/ROOT/pages/about.adoc
rename to starters/src/main/adoc/modules/ROOT/pages/about.adoc
diff --git a/api/applib/src/main/doc/modules/applib-ant/images/.gitkeep b/starters/src/main/adoc/modules/helloworld/images/.gitkeep
similarity index 100%
rename from api/applib/src/main/doc/modules/applib-ant/images/.gitkeep
rename to starters/src/main/adoc/modules/helloworld/images/.gitkeep
diff --git a/starters/src/main/doc/modules/helloworld/images/helloworld-before-launch.png b/starters/src/main/adoc/modules/helloworld/images/helloworld-before-launch.png
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/helloworld-before-launch.png
rename to starters/src/main/adoc/modules/helloworld/images/helloworld-before-launch.png
diff --git a/starters/src/main/doc/modules/helloworld/images/helloworld.png b/starters/src/main/adoc/modules/helloworld/images/helloworld.png
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/helloworld.png
rename to starters/src/main/adoc/modules/helloworld/images/helloworld.png
diff --git a/starters/src/main/doc/modules/helloworld/images/using-hello-world/010-root-page.png b/starters/src/main/adoc/modules/helloworld/images/using-hello-world/010-root-page.png
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/using-hello-world/010-root-page.png
rename to starters/src/main/adoc/modules/helloworld/images/using-hello-world/010-root-page.png
diff --git a/starters/src/main/doc/modules/helloworld/images/using-hello-world/020-login-to-wicket-viewer.png b/starters/src/main/adoc/modules/helloworld/images/using-hello-world/020-login-to-wicket-viewer.png
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/using-hello-world/020-login-to-wicket-viewer.png
rename to starters/src/main/adoc/modules/helloworld/images/using-hello-world/020-login-to-wicket-viewer.png
diff --git a/starters/src/main/doc/modules/helloworld/images/using-hello-world/030-home-page.png b/starters/src/main/adoc/modules/helloworld/images/using-hello-world/030-home-page.png
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/using-hello-world/030-home-page.png
rename to starters/src/main/adoc/modules/helloworld/images/using-hello-world/030-home-page.png
diff --git a/starters/src/main/doc/modules/helloworld/images/using-hello-world/040-create-object-from-menu.png b/starters/src/main/adoc/modules/helloworld/images/using-hello-world/040-create-object-from-menu.png
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/using-hello-world/040-create-object-from-menu.png
rename to starters/src/main/adoc/modules/helloworld/images/using-hello-world/040-create-object-from-menu.png
diff --git a/starters/src/main/doc/modules/helloworld/images/using-hello-world/050-create-object-from-menu-prompt.png b/starters/src/main/adoc/modules/helloworld/images/using-hello-world/050-create-object-from-menu-prompt.png
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/using-hello-world/050-create-object-from-menu-prompt.png
rename to starters/src/main/adoc/modules/helloworld/images/using-hello-world/050-create-object-from-menu-prompt.png
diff --git a/starters/src/main/doc/modules/helloworld/images/using-hello-world/060-created-object.png b/starters/src/main/adoc/modules/helloworld/images/using-hello-world/060-created-object.png
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/using-hello-world/060-created-object.png
rename to starters/src/main/adoc/modules/helloworld/images/using-hello-world/060-created-object.png
diff --git a/starters/src/main/doc/modules/helloworld/images/using-hello-world/070-update-name.png b/starters/src/main/adoc/modules/helloworld/images/using-hello-world/070-update-name.png
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/using-hello-world/070-update-name.png
rename to starters/src/main/adoc/modules/helloworld/images/using-hello-world/070-update-name.png
diff --git a/starters/src/main/doc/modules/helloworld/images/using-hello-world/080-edit-notes.png b/starters/src/main/adoc/modules/helloworld/images/using-hello-world/080-edit-notes.png
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/using-hello-world/080-edit-notes.png
rename to starters/src/main/adoc/modules/helloworld/images/using-hello-world/080-edit-notes.png
diff --git a/starters/src/main/doc/modules/helloworld/images/using-hello-world/090-delete-object.png b/starters/src/main/adoc/modules/helloworld/images/using-hello-world/090-delete-object.png
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/using-hello-world/090-delete-object.png
rename to starters/src/main/adoc/modules/helloworld/images/using-hello-world/090-delete-object.png
diff --git a/starters/src/main/doc/modules/helloworld/images/using-hello-world/100-object-deleted.png b/starters/src/main/adoc/modules/helloworld/images/using-hello-world/100-object-deleted.png
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/using-hello-world/100-object-deleted.png
rename to starters/src/main/adoc/modules/helloworld/images/using-hello-world/100-object-deleted.png
diff --git a/starters/src/main/doc/modules/helloworld/images/using-hello-world/200-swagger-ui-before-reload.png b/starters/src/main/adoc/modules/helloworld/images/using-hello-world/200-swagger-ui-before-reload.png
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/using-hello-world/200-swagger-ui-before-reload.png
rename to starters/src/main/adoc/modules/helloworld/images/using-hello-world/200-swagger-ui-before-reload.png
diff --git a/starters/src/main/doc/modules/helloworld/images/using-hello-world/210-helloworld-resources.png b/starters/src/main/adoc/modules/helloworld/images/using-hello-world/210-helloworld-resources.png
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/using-hello-world/210-helloworld-resources.png
rename to starters/src/main/adoc/modules/helloworld/images/using-hello-world/210-helloworld-resources.png
diff --git a/starters/src/main/doc/modules/helloworld/images/using-hello-world/220-create-object-thru-rest-api.png b/starters/src/main/adoc/modules/helloworld/images/using-hello-world/220-create-object-thru-rest-api.png
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/using-hello-world/220-create-object-thru-rest-api.png
rename to starters/src/main/adoc/modules/helloworld/images/using-hello-world/220-create-object-thru-rest-api.png
diff --git a/starters/src/main/doc/modules/helloworld/images/using-hello-world/230-create-object-thru-rest-api-response.png b/starters/src/main/adoc/modules/helloworld/images/using-hello-world/230-create-object-thru-rest-api-response.png
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/using-hello-world/230-create-object-thru-rest-api-response.png
rename to starters/src/main/adoc/modules/helloworld/images/using-hello-world/230-create-object-thru-rest-api-response.png
diff --git a/starters/src/main/doc/modules/helloworld/images/using-hello-world/240-retrieve-object-using-rest-api.png b/starters/src/main/adoc/modules/helloworld/images/using-hello-world/240-retrieve-object-using-rest-api.png
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/using-hello-world/240-retrieve-object-using-rest-api.png
rename to starters/src/main/adoc/modules/helloworld/images/using-hello-world/240-retrieve-object-using-rest-api.png
diff --git a/starters/src/main/doc/modules/helloworld/images/using-hello-world/250-retrieve-object-using-rest-api-response.png b/starters/src/main/adoc/modules/helloworld/images/using-hello-world/250-retrieve-object-using-rest-api-response.png
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/images/using-hello-world/250-retrieve-object-using-rest-api-response.png
rename to starters/src/main/adoc/modules/helloworld/images/using-hello-world/250-retrieve-object-using-rest-api-response.png
diff --git a/starters/src/main/doc/modules/ROOT/nav.adoc b/starters/src/main/adoc/modules/helloworld/nav.adoc
similarity index 100%
rename from starters/src/main/doc/modules/ROOT/nav.adoc
rename to starters/src/main/adoc/modules/helloworld/nav.adoc
diff --git a/starters/src/main/doc/modules/helloworld/pages/about.adoc b/starters/src/main/adoc/modules/helloworld/pages/about.adoc
similarity index 100%
rename from starters/src/main/doc/modules/helloworld/pages/about.adoc
rename to starters/src/main/adoc/modules/helloworld/pages/about.adoc
diff --git a/starters/src/main/doc/modules/simpleapp/images/dockerhub-tags.png b/starters/src/main/adoc/modules/simpleapp/images/dockerhub-tags.png
similarity index 100%
rename from starters/src/main/doc/modules/simpleapp/images/dockerhub-tags.png
rename to starters/src/main/adoc/modules/simpleapp/images/dockerhub-tags.png
diff --git a/starters/src/main/doc/modules/simpleapp/images/simpleapp-webapp-before-launch.png b/starters/src/main/adoc/modules/simpleapp/images/simpleapp-webapp-before-launch.png
similarity index 100%
rename from starters/src/main/doc/modules/simpleapp/images/simpleapp-webapp-before-launch.png
rename to starters/src/main/adoc/modules/simpleapp/images/simpleapp-webapp-before-launch.png
diff --git a/starters/src/main/doc/modules/simpleapp/images/simpleapp-webapp-with-fixtures.png b/starters/src/main/adoc/modules/simpleapp/images/simpleapp-webapp-with-fixtures.png
similarity index 100%
rename from starters/src/main/doc/modules/simpleapp/images/simpleapp-webapp-with-fixtures.png
rename to starters/src/main/adoc/modules/simpleapp/images/simpleapp-webapp-with-fixtures.png
diff --git a/starters/src/main/doc/modules/simpleapp/images/simpleapp-webapp.png b/starters/src/main/adoc/modules/simpleapp/images/simpleapp-webapp.png
similarity index 100%
rename from starters/src/main/doc/modules/simpleapp/images/simpleapp-webapp.png
rename to starters/src/main/adoc/modules/simpleapp/images/simpleapp-webapp.png
diff --git a/starters/src/main/doc/modules/simpleapp/images/using-simple-app/030-home-page.png b/starters/src/main/adoc/modules/simpleapp/images/using-simple-app/030-home-page.png
similarity index 100%
rename from starters/src/main/doc/modules/simpleapp/images/using-simple-app/030-home-page.png
rename to starters/src/main/adoc/modules/simpleapp/images/using-simple-app/030-home-page.png
diff --git a/starters/src/main/doc/modules/simpleapp/images/using-simple-app/040-run-fixture-script-menu.png b/starters/src/main/adoc/modules/simpleapp/images/using-simple-app/040-run-fixture-script-menu.png
similarity index 100%
rename from starters/src/main/doc/modules/simpleapp/images/using-simple-app/040-run-fixture-script-menu.png
rename to starters/src/main/adoc/modules/simpleapp/images/using-simple-app/040-run-fixture-script-menu.png
diff --git a/starters/src/main/doc/modules/simpleapp/images/using-simple-app/050-run-fixture-script-prompt.png b/starters/src/main/adoc/modules/simpleapp/images/using-simple-app/050-run-fixture-script-prompt.png
similarity index 100%
rename from starters/src/main/doc/modules/simpleapp/images/using-simple-app/050-run-fixture-script-prompt.png
rename to starters/src/main/adoc/modules/simpleapp/images/using-simple-app/050-run-fixture-script-prompt.png
diff --git a/starters/src/main/doc/modules/simpleapp/images/using-simple-app/060-run-fixture-script-result.png b/starters/src/main/adoc/modules/simpleapp/images/using-simple-app/060-run-fixture-script-result.png
similarity index 100%
rename from starters/src/main/doc/modules/simpleapp/images/using-simple-app/060-run-fixture-script-result.png
rename to starters/src/main/adoc/modules/simpleapp/images/using-simple-app/060-run-fixture-script-result.png
diff --git a/starters/src/main/doc/modules/simpleapp/images/using-simple-app/070-home-page.png b/starters/src/main/adoc/modules/simpleapp/images/using-simple-app/070-home-page.png
similarity index 100%
rename from starters/src/main/doc/modules/simpleapp/images/using-simple-app/070-home-page.png
rename to starters/src/main/adoc/modules/simpleapp/images/using-simple-app/070-home-page.png
diff --git a/starters/src/main/doc/modules/simpleapp/images/using-simple-app/structure/structure.pptx b/starters/src/main/adoc/modules/simpleapp/images/using-simple-app/structure/structure.pptx
similarity index 100%
rename from starters/src/main/doc/modules/simpleapp/images/using-simple-app/structure/structure.pptx
rename to starters/src/main/adoc/modules/simpleapp/images/using-simple-app/structure/structure.pptx
diff --git a/starters/src/main/doc/modules/simpleapp/images/using-simple-app/structure/structure/Slide1.PNG b/starters/src/main/adoc/modules/simpleapp/images/using-simple-app/structure/structure/Slide1.PNG
similarity index 100%
rename from starters/src/main/doc/modules/simpleapp/images/using-simple-app/structure/structure/Slide1.PNG
rename to starters/src/main/adoc/modules/simpleapp/images/using-simple-app/structure/structure/Slide1.PNG
diff --git a/starters/src/main/doc/modules/simpleapp/images/using-simple-app/structure/structure/Slide2.PNG b/starters/src/main/adoc/modules/simpleapp/images/using-simple-app/structure/structure/Slide2.PNG
similarity index 100%
rename from starters/src/main/doc/modules/simpleapp/images/using-simple-app/structure/structure/Slide2.PNG
rename to starters/src/main/adoc/modules/simpleapp/images/using-simple-app/structure/structure/Slide2.PNG
diff --git a/starters/src/main/doc/modules/simpleapp/nav.adoc b/starters/src/main/adoc/modules/simpleapp/nav.adoc
similarity index 100%
rename from starters/src/main/doc/modules/simpleapp/nav.adoc
rename to starters/src/main/adoc/modules/simpleapp/nav.adoc
diff --git a/starters/src/main/doc/modules/simpleapp/pages/about.adoc b/starters/src/main/adoc/modules/simpleapp/pages/about.adoc
similarity index 100%
rename from starters/src/main/doc/modules/simpleapp/pages/about.adoc
rename to starters/src/main/adoc/modules/simpleapp/pages/about.adoc
diff --git a/testing/specsupport/src/main/doc/antora.yml b/testing/fakedata/src/main/adoc/antora.yml
similarity index 100%
rename from testing/specsupport/src/main/doc/antora.yml
rename to testing/fakedata/src/main/adoc/antora.yml
diff --git a/testing/specsupport/src/main/doc/modules/specsupport/nav.adoc b/testing/fakedata/src/main/adoc/modules/fakedata/nav.adoc
similarity index 100%
rename from testing/specsupport/src/main/doc/modules/specsupport/nav.adoc
rename to testing/fakedata/src/main/adoc/modules/fakedata/nav.adoc
diff --git a/testing/fakedata/src/main/doc/modules/fakedata/pages/about.adoc b/testing/fakedata/src/main/adoc/modules/fakedata/pages/about.adoc
similarity index 100%
rename from testing/fakedata/src/main/doc/modules/fakedata/pages/about.adoc
rename to testing/fakedata/src/main/adoc/modules/fakedata/pages/about.adoc
diff --git a/testing/fakedata/src/main/doc/modules/fakedata/partials/module-nav.adoc b/testing/fakedata/src/main/adoc/modules/fakedata/partials/module-nav.adoc
similarity index 100%
rename from testing/fakedata/src/main/doc/modules/fakedata/partials/module-nav.adoc
rename to testing/fakedata/src/main/adoc/modules/fakedata/partials/module-nav.adoc
diff --git a/testing/integtestsupport/src/main/doc/antora.yml b/testing/fixtures/src/main/adoc/antora.yml
similarity index 100%
rename from testing/integtestsupport/src/main/doc/antora.yml
rename to testing/fixtures/src/main/adoc/antora.yml
diff --git a/testing/fixtures/src/main/doc/modules/fixtures/images/composite.png b/testing/fixtures/src/main/adoc/modules/fixtures/images/composite.png
similarity index 100%
rename from testing/fixtures/src/main/doc/modules/fixtures/images/composite.png
rename to testing/fixtures/src/main/adoc/modules/fixtures/images/composite.png
diff --git a/testing/fixtures/src/main/doc/modules/fixtures/images/flat-1.png b/testing/fixtures/src/main/adoc/modules/fixtures/images/flat-1.png
similarity index 100%
rename from testing/fixtures/src/main/doc/modules/fixtures/images/flat-1.png
rename to testing/fixtures/src/main/adoc/modules/fixtures/images/flat-1.png
diff --git a/testing/fixtures/src/main/doc/modules/fixtures/images/flat-2.png b/testing/fixtures/src/main/adoc/modules/fixtures/images/flat-2.png
similarity index 100%
rename from testing/fixtures/src/main/doc/modules/fixtures/images/flat-2.png
rename to testing/fixtures/src/main/adoc/modules/fixtures/images/flat-2.png
diff --git a/testing/fixtures/src/main/doc/modules/fixtures/images/organizing-fixture-scripts.pptx b/testing/fixtures/src/main/adoc/modules/fixtures/images/organizing-fixture-scripts.pptx
similarity index 100%
rename from testing/fixtures/src/main/doc/modules/fixtures/images/organizing-fixture-scripts.pptx
rename to testing/fixtures/src/main/adoc/modules/fixtures/images/organizing-fixture-scripts.pptx
diff --git a/testing/fixtures/src/main/doc/modules/fixtures/images/prompt-specifying-number.png b/testing/fixtures/src/main/adoc/modules/fixtures/images/prompt-specifying-number.png
similarity index 100%
rename from testing/fixtures/src/main/doc/modules/fixtures/images/prompt-specifying-number.png
rename to testing/fixtures/src/main/adoc/modules/fixtures/images/prompt-specifying-number.png
diff --git a/testing/fixtures/src/main/doc/modules/fixtures/images/prompt.png b/testing/fixtures/src/main/adoc/modules/fixtures/images/prompt.png
similarity index 100%
rename from testing/fixtures/src/main/doc/modules/fixtures/images/prompt.png
rename to testing/fixtures/src/main/adoc/modules/fixtures/images/prompt.png
diff --git a/testing/fixtures/src/main/doc/modules/fixtures/images/prototyping-menu.png b/testing/fixtures/src/main/adoc/modules/fixtures/images/prototyping-menu.png
similarity index 100%
rename from testing/fixtures/src/main/doc/modules/fixtures/images/prototyping-menu.png
rename to testing/fixtures/src/main/adoc/modules/fixtures/images/prototyping-menu.png
diff --git a/testing/fixtures/src/main/doc/modules/fixtures/images/result-list.png b/testing/fixtures/src/main/adoc/modules/fixtures/images/result-list.png
similarity index 100%
rename from testing/fixtures/src/main/doc/modules/fixtures/images/result-list.png
rename to testing/fixtures/src/main/adoc/modules/fixtures/images/result-list.png
diff --git a/testing/integtestsupport/src/main/doc/modules/integtestsupport/nav.adoc b/testing/fixtures/src/main/adoc/modules/fixtures/nav.adoc
similarity index 100%
rename from testing/integtestsupport/src/main/doc/modules/integtestsupport/nav.adoc
rename to testing/fixtures/src/main/adoc/modules/fixtures/nav.adoc
diff --git a/testing/fixtures/src/main/doc/modules/fixtures/pages/about.adoc b/testing/fixtures/src/main/adoc/modules/fixtures/pages/about.adoc
similarity index 100%
rename from testing/fixtures/src/main/doc/modules/fixtures/pages/about.adoc
rename to testing/fixtures/src/main/adoc/modules/fixtures/pages/about.adoc
diff --git a/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc b/testing/fixtures/src/main/adoc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc
similarity index 100%
rename from testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc
rename to testing/fixtures/src/main/adoc/modules/fixtures/pages/fixture-scripts/api-and-usage.adoc
diff --git a/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/sudo-service.adoc b/testing/fixtures/src/main/adoc/modules/fixtures/pages/fixture-scripts/sudo-service.adoc
similarity index 100%
rename from testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/sudo-service.adoc
rename to testing/fixtures/src/main/adoc/modules/fixtures/pages/fixture-scripts/sudo-service.adoc
diff --git a/testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc b/testing/fixtures/src/main/adoc/modules/fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc
similarity index 100%
rename from testing/fixtures/src/main/doc/modules/fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc
rename to testing/fixtures/src/main/adoc/modules/fixtures/pages/fixture-scripts/ticking-clock-fixture.adoc
diff --git a/testing/fixtures/src/main/doc/modules/fixtures/partials/module-nav.adoc b/testing/fixtures/src/main/adoc/modules/fixtures/partials/module-nav.adoc
similarity index 100%
rename from testing/fixtures/src/main/doc/modules/fixtures/partials/module-nav.adoc
rename to testing/fixtures/src/main/adoc/modules/fixtures/partials/module-nav.adoc
diff --git a/testing/hsqldbmgr/src/main/doc/antora.yml b/testing/h2console/src/main/adoc/antora.yml
similarity index 100%
rename from testing/hsqldbmgr/src/main/doc/antora.yml
rename to testing/h2console/src/main/adoc/antora.yml
diff --git a/legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/nav.adoc b/testing/h2console/src/main/adoc/modules/h2console/nav.adoc
similarity index 100%
rename from legacy/subdomains/servletapi/impl/src/main/doc/modules/servletapi/nav.adoc
rename to testing/h2console/src/main/adoc/modules/h2console/nav.adoc
diff --git a/testing/h2console/src/main/doc/modules/h2console/pages/about.adoc b/testing/h2console/src/main/adoc/modules/h2console/pages/about.adoc
similarity index 100%
rename from testing/h2console/src/main/doc/modules/h2console/pages/about.adoc
rename to testing/h2console/src/main/adoc/modules/h2console/pages/about.adoc
diff --git a/testing/h2console/src/main/doc/modules/h2console/partials/module-nav.adoc b/testing/h2console/src/main/adoc/modules/h2console/partials/module-nav.adoc
similarity index 100%
rename from testing/h2console/src/main/doc/modules/h2console/partials/module-nav.adoc
rename to testing/h2console/src/main/adoc/modules/h2console/partials/module-nav.adoc
diff --git a/testing/h2console/src/main/doc/antora.yml b/testing/hsqldbmgr/src/main/adoc/antora.yml
similarity index 100%
rename from testing/h2console/src/main/doc/antora.yml
rename to testing/hsqldbmgr/src/main/adoc/antora.yml
diff --git a/testing/hsqldbmgr/src/main/doc/modules/hsqldbmgr/nav.adoc b/testing/hsqldbmgr/src/main/adoc/modules/hsqldbmgr/nav.adoc
similarity index 100%
rename from testing/hsqldbmgr/src/main/doc/modules/hsqldbmgr/nav.adoc
rename to testing/hsqldbmgr/src/main/adoc/modules/hsqldbmgr/nav.adoc
diff --git a/testing/hsqldbmgr/src/main/doc/modules/hsqldbmgr/pages/about.adoc b/testing/hsqldbmgr/src/main/adoc/modules/hsqldbmgr/pages/about.adoc
similarity index 100%
rename from testing/hsqldbmgr/src/main/doc/modules/hsqldbmgr/pages/about.adoc
rename to testing/hsqldbmgr/src/main/adoc/modules/hsqldbmgr/pages/about.adoc
diff --git a/testing/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/module-nav.adoc b/testing/hsqldbmgr/src/main/adoc/modules/hsqldbmgr/partials/module-nav.adoc
similarity index 100%
rename from testing/hsqldbmgr/src/main/doc/modules/hsqldbmgr/partials/module-nav.adoc
rename to testing/hsqldbmgr/src/main/adoc/modules/hsqldbmgr/partials/module-nav.adoc
diff --git a/testing/fixtures/src/main/doc/antora.yml b/testing/integtestsupport/src/main/adoc/antora.yml
similarity index 100%
rename from testing/fixtures/src/main/doc/antora.yml
rename to testing/integtestsupport/src/main/adoc/antora.yml
diff --git a/testing/integtestsupport/src/main/doc/modules/integtestsupport/images/integ-tests.png b/testing/integtestsupport/src/main/adoc/modules/integtestsupport/images/integ-tests.png
similarity index 100%
rename from testing/integtestsupport/src/main/doc/modules/integtestsupport/images/integ-tests.png
rename to testing/integtestsupport/src/main/adoc/modules/integtestsupport/images/integ-tests.png
diff --git a/testing/integtestsupport/src/main/doc/modules/integtestsupport/images/integ-tests.pptx b/testing/integtestsupport/src/main/adoc/modules/integtestsupport/images/integ-tests.pptx
similarity index 100%
rename from testing/integtestsupport/src/main/doc/modules/integtestsupport/images/integ-tests.pptx
rename to testing/integtestsupport/src/main/adoc/modules/integtestsupport/images/integ-tests.pptx
diff --git a/testing/integtestsupport/src/main/doc/modules/integtestsupport/images/wrapper-factory.png b/testing/integtestsupport/src/main/adoc/modules/integtestsupport/images/wrapper-factory.png
similarity index 100%
rename from testing/integtestsupport/src/main/doc/modules/integtestsupport/images/wrapper-factory.png
rename to testing/integtestsupport/src/main/adoc/modules/integtestsupport/images/wrapper-factory.png
diff --git a/testing/fixtures/src/main/doc/modules/fixtures/nav.adoc b/testing/integtestsupport/src/main/adoc/modules/integtestsupport/nav.adoc
similarity index 100%
rename from testing/fixtures/src/main/doc/modules/fixtures/nav.adoc
rename to testing/integtestsupport/src/main/adoc/modules/integtestsupport/nav.adoc
diff --git a/testing/integtestsupport/src/main/doc/modules/integtestsupport/pages/about.adoc b/testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/about.adoc
similarity index 100%
rename from testing/integtestsupport/src/main/doc/modules/integtestsupport/pages/about.adoc
rename to testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/about.adoc
diff --git a/testing/integtestsupport/src/main/doc/modules/integtestsupport/pages/abstract-class.adoc b/testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/abstract-class.adoc
similarity index 100%
rename from testing/integtestsupport/src/main/doc/modules/integtestsupport/pages/abstract-class.adoc
rename to testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/abstract-class.adoc
diff --git a/testing/integtestsupport/src/main/doc/modules/integtestsupport/pages/bootstrapping.adoc b/testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/bootstrapping.adoc
similarity index 100%
rename from testing/integtestsupport/src/main/doc/modules/integtestsupport/pages/bootstrapping.adoc
rename to testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/bootstrapping.adoc
diff --git a/testing/integtestsupport/src/main/doc/modules/integtestsupport/pages/configuration-properties.adoc b/testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/configuration-properties.adoc
similarity index 100%
rename from testing/integtestsupport/src/main/doc/modules/integtestsupport/pages/configuration-properties.adoc
rename to testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/configuration-properties.adoc
diff --git a/testing/integtestsupport/src/main/doc/modules/integtestsupport/pages/maven-configuration.adoc b/testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/maven-configuration.adoc
similarity index 100%
rename from testing/integtestsupport/src/main/doc/modules/integtestsupport/pages/maven-configuration.adoc
rename to testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/maven-configuration.adoc
diff --git a/testing/integtestsupport/src/main/doc/modules/integtestsupport/pages/typical-usage.adoc b/testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/typical-usage.adoc
similarity index 100%
rename from testing/integtestsupport/src/main/doc/modules/integtestsupport/pages/typical-usage.adoc
rename to testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/typical-usage.adoc
diff --git a/testing/integtestsupport/src/main/doc/modules/integtestsupport/pages/wrapper-factory.adoc b/testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/wrapper-factory.adoc
similarity index 100%
rename from testing/integtestsupport/src/main/doc/modules/integtestsupport/pages/wrapper-factory.adoc
rename to testing/integtestsupport/src/main/adoc/modules/integtestsupport/pages/wrapper-factory.adoc
diff --git a/testing/integtestsupport/src/main/doc/modules/integtestsupport/partials/module-nav.adoc b/testing/integtestsupport/src/main/adoc/modules/integtestsupport/partials/module-nav.adoc
similarity index 100%
rename from testing/integtestsupport/src/main/doc/modules/integtestsupport/partials/module-nav.adoc
rename to testing/integtestsupport/src/main/adoc/modules/integtestsupport/partials/module-nav.adoc
diff --git a/testing/fakedata/src/main/doc/antora.yml b/testing/specsupport/src/main/adoc/antora.yml
similarity index 100%
rename from testing/fakedata/src/main/doc/antora.yml
rename to testing/specsupport/src/main/adoc/antora.yml
diff --git a/testing/fakedata/src/main/doc/modules/fakedata/nav.adoc b/testing/specsupport/src/main/adoc/modules/specsupport/nav.adoc
similarity index 100%
rename from testing/fakedata/src/main/doc/modules/fakedata/nav.adoc
rename to testing/specsupport/src/main/adoc/modules/specsupport/nav.adoc
diff --git a/testing/specsupport/src/main/doc/modules/specsupport/pages/about.adoc b/testing/specsupport/src/main/adoc/modules/specsupport/pages/about.adoc
similarity index 100%
rename from testing/specsupport/src/main/doc/modules/specsupport/pages/about.adoc
rename to testing/specsupport/src/main/adoc/modules/specsupport/pages/about.adoc
diff --git a/testing/specsupport/src/main/doc/modules/specsupport/pages/how-it-works.adoc b/testing/specsupport/src/main/adoc/modules/specsupport/pages/how-it-works.adoc
similarity index 100%
rename from testing/specsupport/src/main/doc/modules/specsupport/pages/how-it-works.adoc
rename to testing/specsupport/src/main/adoc/modules/specsupport/pages/how-it-works.adoc
diff --git a/testing/specsupport/src/main/doc/modules/specsupport/pages/maven-configuration.adoc b/testing/specsupport/src/main/adoc/modules/specsupport/pages/maven-configuration.adoc
similarity index 100%
rename from testing/specsupport/src/main/doc/modules/specsupport/pages/maven-configuration.adoc
rename to testing/specsupport/src/main/adoc/modules/specsupport/pages/maven-configuration.adoc
diff --git a/testing/specsupport/src/main/doc/modules/specsupport/pages/writing-a-bdd-spec.adoc b/testing/specsupport/src/main/adoc/modules/specsupport/pages/writing-a-bdd-spec.adoc
similarity index 100%
rename from testing/specsupport/src/main/doc/modules/specsupport/pages/writing-a-bdd-spec.adoc
rename to testing/specsupport/src/main/adoc/modules/specsupport/pages/writing-a-bdd-spec.adoc
diff --git a/testing/specsupport/src/main/doc/modules/specsupport/partials/module-nav.adoc b/testing/specsupport/src/main/adoc/modules/specsupport/partials/module-nav.adoc
similarity index 100%
rename from testing/specsupport/src/main/doc/modules/specsupport/partials/module-nav.adoc
rename to testing/specsupport/src/main/adoc/modules/specsupport/partials/module-nav.adoc
diff --git a/core/unittestsupport/src/main/doc/antora.yml b/testing/unittestsupport/src/main/adoc/antora.yml
similarity index 100%
rename from core/unittestsupport/src/main/doc/antora.yml
rename to testing/unittestsupport/src/main/adoc/antora.yml
diff --git a/core/unittestsupport/src/main/doc/modules/unittestsupport/nav.adoc b/testing/unittestsupport/src/main/adoc/modules/unit-test-support-ext/nav.adoc
similarity index 100%
rename from core/unittestsupport/src/main/doc/modules/unittestsupport/nav.adoc
rename to testing/unittestsupport/src/main/adoc/modules/unit-test-support-ext/nav.adoc
diff --git a/testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/pages/about.adoc b/testing/unittestsupport/src/main/adoc/modules/unit-test-support-ext/pages/about.adoc
similarity index 100%
rename from testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/pages/about.adoc
rename to testing/unittestsupport/src/main/adoc/modules/unit-test-support-ext/pages/about.adoc
diff --git a/testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc b/testing/unittestsupport/src/main/adoc/modules/unit-test-support-ext/partials/module-nav.adoc
similarity index 100%
rename from testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc
rename to testing/unittestsupport/src/main/adoc/modules/unit-test-support-ext/partials/module-nav.adoc
diff --git a/valuetypes/sse/src/main/doc/antora.yml b/valuetypes/asciidoc/src/main/adoc/antora.yml
similarity index 100%
rename from valuetypes/sse/src/main/doc/antora.yml
rename to valuetypes/asciidoc/src/main/adoc/antora.yml
diff --git a/valuetypes/asciidoc/src/main/doc/modules/asciidoc/nav.adoc b/valuetypes/asciidoc/src/main/adoc/modules/asciidoc/nav.adoc
similarity index 100%
rename from valuetypes/asciidoc/src/main/doc/modules/asciidoc/nav.adoc
rename to valuetypes/asciidoc/src/main/adoc/modules/asciidoc/nav.adoc
diff --git a/valuetypes/asciidoc/src/main/doc/modules/asciidoc/pages/about.adoc b/valuetypes/asciidoc/src/main/adoc/modules/asciidoc/pages/about.adoc
similarity index 100%
rename from valuetypes/asciidoc/src/main/doc/modules/asciidoc/pages/about.adoc
rename to valuetypes/asciidoc/src/main/adoc/modules/asciidoc/pages/about.adoc
diff --git a/valuetypes/asciidoc/src/main/doc/modules/asciidoc/partials/module-nav.adoc b/valuetypes/asciidoc/src/main/adoc/modules/asciidoc/partials/module-nav.adoc
similarity index 100%
rename from valuetypes/asciidoc/src/main/doc/modules/asciidoc/partials/module-nav.adoc
rename to valuetypes/asciidoc/src/main/adoc/modules/asciidoc/partials/module-nav.adoc
diff --git a/valuetypes/markdown/src/main/doc/antora.yml b/valuetypes/markdown/src/main/adoc/antora.yml
similarity index 100%
rename from valuetypes/markdown/src/main/doc/antora.yml
rename to valuetypes/markdown/src/main/adoc/antora.yml
diff --git a/extensions/vw/pdfjs/src/main/doc/modules/pdfjs/nav.adoc b/valuetypes/markdown/src/main/adoc/modules/markdown/nav.adoc
similarity index 100%
rename from extensions/vw/pdfjs/src/main/doc/modules/pdfjs/nav.adoc
rename to valuetypes/markdown/src/main/adoc/modules/markdown/nav.adoc
diff --git a/extensions/vro/cors/src/main/doc/modules/cors/pages/about.adoc b/valuetypes/markdown/src/main/adoc/modules/markdown/pages/about.adoc
similarity index 100%
rename from extensions/vro/cors/src/main/doc/modules/cors/pages/about.adoc
rename to valuetypes/markdown/src/main/adoc/modules/markdown/pages/about.adoc
diff --git a/valuetypes/markdown/src/main/doc/modules/markdown/partials/module-nav.adoc b/valuetypes/markdown/src/main/adoc/modules/markdown/partials/module-nav.adoc
similarity index 100%
rename from valuetypes/markdown/src/main/doc/modules/markdown/partials/module-nav.adoc
rename to valuetypes/markdown/src/main/adoc/modules/markdown/partials/module-nav.adoc
diff --git a/valuetypes/asciidoc/src/main/doc/antora.yml b/valuetypes/sse/src/main/adoc/antora.yml
similarity index 100%
rename from valuetypes/asciidoc/src/main/doc/antora.yml
rename to valuetypes/sse/src/main/adoc/antora.yml
diff --git a/valuetypes/sse/src/main/doc/modules/sse/nav.adoc b/valuetypes/sse/src/main/adoc/modules/sse/nav.adoc
similarity index 100%
rename from valuetypes/sse/src/main/doc/modules/sse/nav.adoc
rename to valuetypes/sse/src/main/adoc/modules/sse/nav.adoc
diff --git a/valuetypes/sse/src/main/doc/modules/sse/pages/about.adoc b/valuetypes/sse/src/main/adoc/modules/sse/pages/about.adoc
similarity index 100%
rename from valuetypes/sse/src/main/doc/modules/sse/pages/about.adoc
rename to valuetypes/sse/src/main/adoc/modules/sse/pages/about.adoc
diff --git a/valuetypes/sse/src/main/doc/modules/sse/partials/module-nav.adoc b/valuetypes/sse/src/main/adoc/modules/sse/partials/module-nav.adoc
similarity index 100%
rename from valuetypes/sse/src/main/doc/modules/sse/partials/module-nav.adoc
rename to valuetypes/sse/src/main/adoc/modules/sse/partials/module-nav.adoc
diff --git a/viewers/restfulobjects/src/main/doc/antora.yml b/viewers/restfulobjects/src/main/adoc/antora.yml
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/antora.yml
rename to viewers/restfulobjects/src/main/adoc/antora.yml
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/images/restfulobjects/ro-spec-resources-and-representations.png b/viewers/restfulobjects/src/main/adoc/modules/ROOT/images/restfulobjects/ro-spec-resources-and-representations.png
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/images/restfulobjects/ro-spec-resources-and-representations.png
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/images/restfulobjects/ro-spec-resources-and-representations.png
diff --git a/core/runtimeservices/src/main/doc/modules/runtime-services/images/RepresentationService/service-collaborations.png b/viewers/restfulobjects/src/main/adoc/modules/ROOT/images/rgfis/service-collaborations.png
similarity index 100%
rename from core/runtimeservices/src/main/doc/modules/runtime-services/images/RepresentationService/service-collaborations.png
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/images/rgfis/service-collaborations.png
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/nav.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/nav.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/nav.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/about.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/about.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/about.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/architecture.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/architecture.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/architecture.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/architecture.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/configuration-properties.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/configuration-properties.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/configuration-properties.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/configuration-properties.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/health-check.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/health-check.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/health-check.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/health-check.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/angular-tips.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/angular-tips.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/angular-tips.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/angular-tips.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/pretty-printing.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/pretty-printing.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/pretty-printing.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/pretty-printing.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/restful-image-property.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/restful-image-property.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/restful-image-property.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/restful-image-property.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/using-chrome-devtools.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/using-chrome-devtools.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/using-chrome-devtools.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/using-chrome-devtools.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/layout-resources.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/layout-resources.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/layout-resources.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/layout-resources.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/ro-spec.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/ro-spec.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/ro-spec.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/ro-spec.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/security.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/security.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/security.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/security.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/action-invocation.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/action-invocation.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/apache-isis-profile.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/apache-isis-profile.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/apache-isis-profile.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/apache-isis-profile.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/configuration-properties.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/configuration-properties.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/configuration-properties.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/configuration-properties.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/domain-object.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/domain-object.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/domain-object.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/domain-object.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/object-collection.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/object-collection.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/object-collection.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/object-collection.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/other-representations.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/other-representations.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/pages/simplified-representations/other-representations.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/pages/simplified-representations/other-representations.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/component-nav.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/partials/component-nav.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/partials/component-nav.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/module-nav.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/partials/module-nav.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/partials/module-nav.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/security/user-registration.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/partials/security/user-registration.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/partials/security/user-registration.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/partials/security/user-registration.adoc
diff --git a/viewers/restfulobjects/src/main/doc/modules/ROOT/partials/security/web-xml.adoc b/viewers/restfulobjects/src/main/adoc/modules/ROOT/partials/security/web-xml.adoc
similarity index 100%
rename from viewers/restfulobjects/src/main/doc/modules/ROOT/partials/security/web-xml.adoc
rename to viewers/restfulobjects/src/main/adoc/modules/ROOT/partials/security/web-xml.adoc
diff --git a/viewers/wicket/src/main/doc/antora.yml b/viewers/wicket/src/main/adoc/antora.yml
similarity index 100%
rename from viewers/wicket/src/main/doc/antora.yml
rename to viewers/wicket/src/main/adoc/antora.yml
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/about-page/about-page.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/about-page/about-page.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/about-page/about-page.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/about-page/about-page.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/dividers.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/application-menu/dividers.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/dividers.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/application-menu/dividers.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/layout-menus.pdn b/viewers/wicket/src/main/adoc/modules/ROOT/images/application-menu/layout-menus.pdn
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/layout-menus.pdn
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/application-menu/layout-menus.pdn
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/layout-menus.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/application-menu/layout-menus.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/layout-menus.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/application-menu/layout-menus.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/tertiary.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/application-menu/tertiary.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/application-menu/tertiary.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/application-menu/tertiary.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/010-attachment-field-940.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/010-attachment-field-940.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/010-attachment-field-940.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/010-attachment-field-940.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/010-attachment-field.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/010-attachment-field.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/010-attachment-field.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/010-attachment-field.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/020-edit-choose-file-940.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file-940.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/020-edit-choose-file-940.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file-940.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/020-edit-choose-file.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/020-edit-choose-file.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/020-edit-choose-file.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser-520.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser-520.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser-520.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser-520.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/030-choose-file-using-browser.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated-940.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated-940.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated-940.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated-940.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/040-edit-chosen-file-indicated.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered-940.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered-940.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered-940.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered-940.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/050-ok-if-image-then-rendered.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/060-download-940.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/060-download-940.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/060-download-940.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/060-download-940.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/060-download.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/060-download.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/060-download.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/060-download.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/070-edit-clear-940.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/070-edit-clear-940.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/070-edit-clear-940.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/070-edit-clear-940.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/070-edit-clear.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/070-edit-clear.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/blob-attachments/070-edit-clear.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/blob-attachments/070-edit-clear.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel-940.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/bookmarked-pages/panel-940.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel-940.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/bookmarked-pages/panel-940.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel-estatio-940.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/bookmarked-pages/panel-estatio-940.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel-estatio-940.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/bookmarked-pages/panel-estatio-940.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel-estatio.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/bookmarked-pages/panel-estatio.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel-estatio.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/bookmarked-pages/panel-estatio.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/bookmarked-pages/panel.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/bookmarked-pages/panel.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/bookmarked-pages/panel.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/brand-logo/brand-logo-signin.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/brand-logo/brand-logo-signin.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/brand-logo/brand-logo-signin.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/brand-logo/brand-logo-signin.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/brand-logo/brand-logo.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/brand-logo/brand-logo.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/brand-logo/brand-logo.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/brand-logo/brand-logo.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/010-copy-link-button-940.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/010-copy-link-button-940.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/010-copy-link-button-940.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/010-copy-link-button-940.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/010-copy-link-button.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/010-copy-link-button.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/010-copy-link-button.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/010-copy-link-button.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/020-copy-link-dialog-940.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/020-copy-link-dialog-940.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/020-copy-link-dialog-940.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/020-copy-link-dialog-940.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/020-copy-link-dialog.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/020-copy-link-dialog.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/020-copy-link-dialog.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/020-copy-link-dialog.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/030-hints-940.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/030-hints-940.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/030-hints-940.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/030-hints-940.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/030-hints.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/030-hints.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/030-hints.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/030-hints.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/040-copy-link-with-hints-940.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints-940.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/040-copy-link-with-hints-940.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints-940.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/040-copy-link-with-hints.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/040-copy-link-with-hints.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/040-copy-link-with-hints.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/050-title-url-940.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/050-title-url-940.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/050-title-url-940.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/050-title-url-940.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/050-title-url.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/050-title-url.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/copy-link/050-title-url.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/copy-link/050-title-url.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/dialog-mode/modal.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/dialog-mode/modal.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/dialog-mode/modal.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/dialog-mode/modal.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/dialog-mode/sidebar.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/dialog-mode/sidebar.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/dialog-mode/sidebar.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/dialog-mode/sidebar.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/no-footer.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/embedded-view/no-footer.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/no-footer.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/embedded-view/no-footer.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/no-header-no-footer.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/embedded-view/no-header-no-footer.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/no-header-no-footer.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/embedded-view/no-header-no-footer.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/no-header.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/embedded-view/no-header.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/no-header.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/embedded-view/no-header.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/regular.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/embedded-view/regular.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/embedded-view/regular.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/embedded-view/regular.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/features/recent-pages/recent-pages.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/features/recent-pages/recent-pages.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/features/recent-pages/recent-pages.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/features/recent-pages/recent-pages.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/how-tos/ui-hints/object-titles-and-icons/cust-order-product.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/layout-dynamic-xml/ToDoAppDashboard.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/layout-dynamic-xml/ToDoAppDashboard.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/layout-dynamic-xml/ToDoAppDashboard.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/layout-dynamic-xml/ToDoAppDashboard.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/layout-dynamic-xml/ToDoItem.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/layout-dynamic-xml/ToDoItem.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/layout-dynamic-xml/ToDoItem.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/layout-dynamic-xml/ToDoItem.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/customer-order.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/customer-order.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/layouts/customer-order.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/customer-order.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/estatio-Invoice.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/estatio-Invoice.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/layouts/estatio-Invoice.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/estatio-Invoice.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/estatio-Lease.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/estatio-Lease.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/layouts/estatio-Lease.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/estatio-Lease.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/estatio-LeaseItem.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/estatio-LeaseItem.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/layouts/estatio-LeaseItem.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/estatio-LeaseItem.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/layouts/todoapp-ToDoItem.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/todoapp-ToDoItem.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/layouts/todoapp-ToDoItem.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/layouts/todoapp-ToDoItem.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/menubars/010-download.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/menubars/010-download.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/menubars/010-download.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/menubars/010-download.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/menubars/020-download.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/menubars/020-download.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/menubars/020-download.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/menubars/020-download.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/4-0-8-0.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/4-0-8-0.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/4-0-8-0.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/4-0-8-0.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/4-4-4-12.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/4-4-4-12.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/4-4-4-12.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/4-4-4-12.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/6-6-0-12.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/6-6-0-12.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/6-6-0-12.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/6-6-0-12.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/isis-layout-show-facets.css b/viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/isis-layout-show-facets.css
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/isis-layout-show-facets.css
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/isis-layout-show-facets.css
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/isis-layout.css b/viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/isis-layout.css
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/isis-layout.css
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/isis-layout.css
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/layout-4-0-8-0.html b/viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/layout-4-0-8-0.html
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/layout-4-0-8-0.html
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/layout-4-0-8-0.html
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/layout-4-4-4-12.html b/viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/layout-4-4-4-12.html
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/layout-4-4-4-12.html
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/layout-4-4-4-12.html
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/layout-6-6-0-12.html b/viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/layout-6-6-0-12.html
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/reference-layout/layout-6-6-0-12.html
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/reference-layout/layout-6-6-0-12.html
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/login-page-default.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-password-reset/login-page-default.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/login-page-default.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-password-reset/login-page-default.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-password-reset/login-page-suppress-password-reset.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-password-reset/login-page-suppress-password-reset.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/suppress-password-reset/login-page-suppress-password-reset.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-password-reset/login-page-suppress-password-reset.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-sign-up/login-page-default.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-remember-me/login-page-default.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/suppress-sign-up/login-page-default.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-remember-me/login-page-default.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-remember-me/login-page-suppress-remember-me.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-remember-me/login-page-suppress-remember-me.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/suppress-remember-me/login-page-suppress-remember-me.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-remember-me/login-page-suppress-remember-me.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-remember-me/login-page-default.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-sign-up/login-page-default.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/suppress-remember-me/login-page-default.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-sign-up/login-page-default.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-sign-up/login-page-suppress-sign-up.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-sign-up/login-page-suppress-sign-up.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/suppress-sign-up/login-page-suppress-sign-up.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/suppress-sign-up/login-page-suppress-sign-up.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/theme-chooser/example-1.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/theme-chooser/example-1.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/theme-chooser/example-1.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/theme-chooser/example-1.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/theme-chooser/example-2.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/theme-chooser/example-2.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/theme-chooser/example-2.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/theme-chooser/example-2.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/suppress-password-reset/login-page-default.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/login-page-default.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/suppress-password-reset/login-page-default.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/login-page-default.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-after-registration.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-after-registration.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-after-registration.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-after-registration.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-email-with-verification-link.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-email-with-verification-link.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-email-with-verification-link.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-email-with-verification-link.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-login-page-after-sign-up.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-login-page-after-sign-up.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-login-page-after-sign-up.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-login-page-after-sign-up.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-page.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-page.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-page.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-page.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-registration-page.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-registration-page.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/user-registration/sign-up-registration-page.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/user-registration/sign-up-registration-page.png
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/images/where-am-i/hello_grey_bg.png b/viewers/wicket/src/main/adoc/modules/ROOT/images/where-am-i/hello_grey_bg.png
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/images/where-am-i/hello_grey_bg.png
rename to viewers/wicket/src/main/adoc/modules/ROOT/images/where-am-i/hello_grey_bg.png
diff --git a/extensions/vw/exceldownload/src/main/doc/modules/exceldownload/nav.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/nav.adoc
similarity index 100%
rename from extensions/vw/exceldownload/src/main/doc/modules/exceldownload/nav.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/nav.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/about.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/about.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/about.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/configuration-properties.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/configuration-properties.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/configuration-properties.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/configuration-properties.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/customisation.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/about-page.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/about-page.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/about-page.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/about-page.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/auto-refresh.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/auto-refresh.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/auto-refresh.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/auto-refresh.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/brand-logo.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/brand-logo.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/brand-logo.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/brand-logo.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/cheap-n-cheerful-theme.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/custom-javascript.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/custom-javascript.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/custom-javascript.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/custom-javascript.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/request-parameters.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/request-parameters.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/request-parameters.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/request-parameters.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/top-level-index-page.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/top-level-index-page.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/top-level-index-page.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/top-level-index-page.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/tweaking-css-classes.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/using-different-css-file.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/using-different-css-file.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/using-different-css-file.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/using-different-css-file.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/welcome-page.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/welcome-page.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/customisation/welcome-page.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/customisation/welcome-page.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/extending.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/extending.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/extending.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/extending.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/extending/custom-bootstrap-theme.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/extending/custom-pages.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/extending/custom-pages.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/extending/custom-pages.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/extending/custom-pages.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/extending/login-via-query-args-prototyping.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/extending/replacing-page-elements.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/extending/replacing-page-elements.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/features.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/features.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/features.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/features.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/features/blob-attachments.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/features/blob-attachments.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/features/blob-attachments.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/features/blob-attachments.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/features/bookmarked-pages.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/features/bookmarked-pages.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/features/bookmarked-pages.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/features/bookmarked-pages.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/features/hints-and-copy-url.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/features/hints-and-copy-url.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/features/hints-and-copy-url.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/features/hints-and-copy-url.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/features/recent-pages.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/features/recent-pages.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/features/recent-pages.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/features/recent-pages.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/features/sidebar-vs-modal-dialogs.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/features/titles-in-tables.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/features/titles-in-tables.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/features/titles-in-tables.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/features/titles-in-tables.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/features/user-registration.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/features/user-registration.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/features/user-registration.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/features/user-registration.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/features/where-am-i.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/features/where-am-i.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/features/where-am-i.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/features/where-am-i.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips/highlight-current-row.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips/i18n-label-in-wicket-viewer.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips/per-user-themes.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/svg-support.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips/svg-support.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/hints-and-tips/svg-support.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/hints-and-tips/svg-support.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/incode-platform.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/incode-platform.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/incode-platform.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/incode-platform.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/layout.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/layout.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/layout.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/layout.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/layout/annotation-based.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/layout/annotation-based.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/layout/annotation-based.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/layout/annotation-based.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/layout/file-based.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/layout/file-based.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/layout/file-based.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/layout/file-based.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/layout/table-columns.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/layout/table-columns.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/layout/table-columns.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/layout/table-columns.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/menubars-layout.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/menubars-layout.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/menubars-layout.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/menubars-layout.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/menubars-layout/annotation-based.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/menubars-layout/annotation-based.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/menubars-layout/annotation-based.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/menubars-layout/annotation-based.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/menubars-layout/file-based.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/menubars-layout/file-based.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/menubars-layout/file-based.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/menubars-layout/file-based.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/pages/security.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/pages/security.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/pages/security.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/pages/security.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/partials/component-nav.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/partials/component-nav.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/partials/component-nav.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/partials/component-nav.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/partials/module-nav.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/partials/module-nav.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/partials/module-nav.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/partials/module-nav.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/partials/security/pages.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/partials/security/pages.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/partials/security/pages.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/partials/security/pages.adoc
diff --git a/viewers/wicket/src/main/doc/modules/ROOT/partials/security/user-registration.adoc b/viewers/wicket/src/main/adoc/modules/ROOT/partials/security/user-registration.adoc
similarity index 100%
rename from viewers/wicket/src/main/doc/modules/ROOT/partials/security/user-registration.adoc
rename to viewers/wicket/src/main/adoc/modules/ROOT/partials/security/user-registration.adoc